diff --git a/reference/memcached/memcached.xml b/reference/memcached/memcached.xml
index 7b5ebedb122f..e87dca5ea516 100644
--- a/reference/memcached/memcached.xml
+++ b/reference/memcached/memcached.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <phpdoc:classref xml:id="class.memcached" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>The Memcached class</title>
@@ -22,20 +21,21 @@
 
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>Memcached</classname></ooclass>
+    <ooclass>
+     <classname>Memcached</classname>
+    </ooclass>
 
-<!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
       <classname>Memcached</classname>
      </ooclass>
     </classsynopsisinfo>
-<!-- }}} -->
 
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])">
+    <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:fallback/>
     </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])">
+    <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'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
@@ -48,7 +48,6 @@
  &reference.memcached.entities.memcached;
 
 </phpdoc:classref>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/add.xml b/reference/memcached/memcached/add.xml
index f0988273bc8a..e78dba2484b2 100644
--- a/reference/memcached/memcached/add.xml
+++ b/reference/memcached/memcached/add.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::add</function> is similar to
@@ -75,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/addbykey.xml b/reference/memcached/memcached/addbykey.xml
index 38cb4fb1981b..d4a98f1d1995 100644
--- a/reference/memcached/memcached/addbykey.xml
+++ b/reference/memcached/memcached/addbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::addByKey</function> is functionally equivalent to
@@ -86,7 +85,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/addserver.xml b/reference/memcached/memcached/addserver.xml
index b74acb8d6d08..c6c5df84a057 100644
--- a/reference/memcached/memcached/addserver.xml
+++ b/reference/memcached/memcached/addserver.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -117,7 +116,6 @@ $m->addServer('mem2.domain.com', 11211, 67);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/addservers.xml b/reference/memcached/memcached/addservers.xml
index 1f3417e6fef5..4bb99510a413 100644
--- a/reference/memcached/memcached/addservers.xml
+++ b/reference/memcached/memcached/addservers.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::addServers</methodname>
    <methodparam><type>array</type><parameter>servers</parameter></methodparam>
   </methodsynopsis>
@@ -84,7 +83,6 @@ $m->addServers($servers);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/append.xml b/reference/memcached/memcached/append.xml
index 82db5f6d6152..9a402ed7f29b 100644
--- a/reference/memcached/memcached/append.xml
+++ b/reference/memcached/memcached/append.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::append</methodname>
+  <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>
@@ -58,8 +57,15 @@
   &reftitle.returnvalues;
   <para>
    &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
+   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>
 
@@ -102,7 +108,6 @@ string(6) "abcdef"
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/appendbykey.xml b/reference/memcached/memcached/appendbykey.xml
index 27f1af6610ce..756b4bdcc39a 100644
--- a/reference/memcached/memcached/appendbykey.xml
+++ b/reference/memcached/memcached/appendbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::appendByKey</methodname>
+  <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>
@@ -59,8 +58,15 @@
   &reftitle.returnvalues;
   <para>
    &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
+   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>
 
@@ -75,7 +81,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/cas.xml b/reference/memcached/memcached/cas.xml
index 0ffcb629ea72..40d6e2c5aa19 100644
--- a/reference/memcached/memcached/cas.xml
+++ b/reference/memcached/memcached/cas.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::cas</methodname>
-   <methodparam><type>float</type><parameter>cas_token</parameter></methodparam>
+   <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></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,
@@ -122,7 +121,6 @@ do {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/casbykey.xml b/reference/memcached/memcached/casbykey.xml
index f149dcf5422a..1b192d27a090 100644
--- a/reference/memcached/memcached/casbykey.xml
+++ b/reference/memcached/memcached/casbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,13 +8,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::casByKey</methodname>
-   <methodparam><type>float</type><parameter>cas_token</parameter></methodparam>
+   <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::casByKey</function> is functionally equivalent to
@@ -94,7 +93,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/construct.xml b/reference/memcached/memcached/construct.xml
index 1b81eb7d11b6..70fc3e2a913f 100644
--- a/reference/memcached/memcached/construct.xml
+++ b/reference/memcached/memcached/construct.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,14 +8,17 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <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>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">
@@ -35,6 +37,22 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>callback</parameter></term>
+     <listitem>
+      <para>
+       <!-- TODO Document constructor params -->
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><parameter>connection_str</parameter></term>
+     <listitem>
+      <para>
+       <!-- TODO Document constructor params -->
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
@@ -64,7 +82,6 @@ $m3 = new Memcached('story_pool');
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/decrement.xml b/reference/memcached/memcached/decrement.xml
index b688caa37c3a..8f0e0ab038c8 100644
--- a/reference/memcached/memcached/decrement.xml
+++ b/reference/memcached/memcached/decrement.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -125,7 +124,6 @@ bool(false)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/decrementbykey.xml b/reference/memcached/memcached/decrementbykey.xml
index 7659f932129a..b4de2b90b064 100644
--- a/reference/memcached/memcached/decrementbykey.xml
+++ b/reference/memcached/memcached/decrementbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -94,7 +93,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/delete.xml b/reference/memcached/memcached/delete.xml
index 3b7d0aab2626..c2b0baa8e83e 100644
--- a/reference/memcached/memcached/delete.xml
+++ b/reference/memcached/memcached/delete.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -83,7 +82,6 @@ $m->delete('key1');
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/deletebykey.xml b/reference/memcached/memcached/deletebykey.xml
index 52da08e7433b..c987e525b3d2 100644
--- a/reference/memcached/memcached/deletebykey.xml
+++ b/reference/memcached/memcached/deletebykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -77,7 +76,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/deletemulti.xml b/reference/memcached/memcached/deletemulti.xml
index 6d286b6f4530..ef8b8bbe4626 100644
--- a/reference/memcached/memcached/deletemulti.xml
+++ b/reference/memcached/memcached/deletemulti.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -61,7 +60,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/deletemultibykey.xml b/reference/memcached/memcached/deletemultibykey.xml
index 924e7667f589..9b489cf852ef 100644
--- a/reference/memcached/memcached/deletemultibykey.xml
+++ b/reference/memcached/memcached/deletemultibykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::deleteMultiByKey</methodname>
+  <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>
@@ -74,7 +73,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/fetch.xml b/reference/memcached/memcached/fetch.xml
index d8505a70af5b..e0b2ac88f6cc 100644
--- a/reference/memcached/memcached/fetch.xml
+++ b/reference/memcached/memcached/fetch.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::fetch</methodname>
-   <void />
+  <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
@@ -96,7 +95,6 @@ array(3) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/fetchall.xml b/reference/memcached/memcached/fetchall.xml
index 9db7fb6165af..c579694cd249 100644
--- a/reference/memcached/memcached/fetchall.xml
+++ b/reference/memcached/memcached/fetchall.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::fetchAll</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::fetchAll</function> retrieves all the remaining
@@ -97,7 +96,6 @@ array(2) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/flush.xml b/reference/memcached/memcached/flush.xml
index 896d9456147f..85afd18b5418 100644
--- a/reference/memcached/memcached/flush.xml
+++ b/reference/memcached/memcached/flush.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -69,7 +68,6 @@ $m->flush(10);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/get.xml b/reference/memcached/memcached/get.xml
index 5960aac7d6b8..493bfb549142 100644
--- a/reference/memcached/memcached/get.xml
+++ b/reference/memcached/memcached/get.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,19 +8,19 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>callable</type><parameter>cache_cb</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</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>flags</parameter> is given <constant>Memcached::GET_EXTENDED</constant>,
+   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
+   <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>
@@ -49,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>flags</parameter></term>
+     <term><parameter>get_flags</parameter></term>
      <listitem>
       <para>
        Flags to control the returned result. When <constant>Memcached::GET_EXTENDED</constant>
@@ -65,7 +64,7 @@
   &reftitle.returnvalues;
   <para>
    Returns the value stored in the cache or &false; otherwise.
-   If the <parameter>flags</parameter> is set to <constant>Memcached::GET_EXTENDED</constant>,
+   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.
@@ -87,7 +86,7 @@
       <entry>PECL memcached 3.0.0</entry>
       <entry>
        The <parameter role="reference">cas_token</parameter> parameter was removed.
-       Instead <parameter>flags</parameter> was added and when it is given the value of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be fetched.
+       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>
@@ -154,7 +153,6 @@ if (!($ip = $m->get('ip_block'))) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getallkeys.xml b/reference/memcached/memcached/getallkeys.xml
index 89881c144e12..c69666ff3e73 100644
--- a/reference/memcached/memcached/getallkeys.xml
+++ b/reference/memcached/memcached/getallkeys.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getAllKeys</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::getAllKeys</function> queries each memcache server
@@ -40,7 +39,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getbykey.xml b/reference/memcached/memcached/getbykey.xml
index 833730310228..3138e8f39611 100644
--- a/reference/memcached/memcached/getbykey.xml
+++ b/reference/memcached/memcached/getbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>callable</type><parameter>cache_cb</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</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
@@ -53,7 +52,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>flags</parameter></term>
+     <term><parameter>get_flags</parameter></term>
      <listitem>
       <para>
        Flags to control the returned result. When value of <constant>Memcached::GET_EXTENDED</constant>
@@ -89,7 +88,7 @@
       <entry>PECL memcached 3.0.0</entry>
       <entry>
        The <parameter role="reference">cas_token</parameter> parameter was removed.
-       Instead <parameter>flags</parameter> was added and when it is given the value of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be fetched.
+       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>
@@ -109,7 +108,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getdelayed.xml b/reference/memcached/memcached/getdelayed.xml
index dfc101dc8dc4..2c0ef5889c50 100644
--- a/reference/memcached/memcached/getdelayed.xml
+++ b/reference/memcached/memcached/getdelayed.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>value_cb</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
@@ -25,8 +24,7 @@
    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
+   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>
@@ -137,7 +135,6 @@ array(2) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getdelayedbykey.xml b/reference/memcached/memcached/getdelayedbykey.xml
index f8eb630b0e47..92f4c76a709b 100644
--- a/reference/memcached/memcached/getdelayedbykey.xml
+++ b/reference/memcached/memcached/getdelayedbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>value_cb</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
@@ -84,7 +83,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getmulti.xml b/reference/memcached/memcached/getmulti.xml
index 803d4c285d16..169c59447ab8 100644
--- a/reference/memcached/memcached/getmulti.xml
+++ b/reference/memcached/memcached/getmulti.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,10 +8,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Memcached::getMulti</methodname>
+  <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>flags</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
@@ -25,12 +24,12 @@
      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>flags</parameter>.
+     that needs is to be used as the value for <parameter>get_flags</parameter>.
     </para>
    </note>
   </para>
   <para>
-   The <parameter>flags</parameter> parameter can be used to specify
+   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.
@@ -52,7 +51,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>flags</parameter></term>
+     <term><parameter>get_flags</parameter></term>
      <listitem>
       <para>
        The flags for the get operation.
@@ -278,7 +277,6 @@ zoo
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getmultibykey.xml b/reference/memcached/memcached/getmultibykey.xml
index d77181d68f0a..5196d24dd9cf 100644
--- a/reference/memcached/memcached/getmultibykey.xml
+++ b/reference/memcached/memcached/getmultibykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>flags</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
@@ -44,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>flags</parameter></term>
+     <term><parameter>get_flags</parameter></term>
      <listitem>
       <para>
        The flags for the get operation.
@@ -98,7 +97,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getoption.xml b/reference/memcached/memcached/getoption.xml
index bf5d4fc4b000..a2b146faad6a 100644
--- a/reference/memcached/memcached/getoption.xml
+++ b/reference/memcached/memcached/getoption.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>mixed</type><methodname>Memcached::getOption</methodname>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
@@ -82,7 +81,6 @@ int(1000)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getresultcode.xml b/reference/memcached/memcached/getresultcode.xml
index 1fc0f9441039..4ccd5726dcaf 100644
--- a/reference/memcached/memcached/getresultcode.xml
+++ b/reference/memcached/memcached/getresultcode.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>int</type><methodname>Memcached::getResultCode</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::getResultCode</function> returns one of the
@@ -55,7 +54,6 @@ if ($m->getResultCode() == Memcached::RES_NOTSTORED) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getresultmessage.xml b/reference/memcached/memcached/getresultmessage.xml
index db03cab4d6ef..4d8c5dd6c612 100644
--- a/reference/memcached/memcached/getresultmessage.xml
+++ b/reference/memcached/memcached/getresultmessage.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>string</type><methodname>Memcached::getResultMessage</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::getResultMessage</function> returns a string that
@@ -59,7 +58,6 @@ NOT STORED
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getserverbykey.xml b/reference/memcached/memcached/getserverbykey.xml
index 0d2c6937593e..b1f784a8fdb9 100644
--- a/reference/memcached/memcached/getserverbykey.xml
+++ b/reference/memcached/memcached/getserverbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::getServerByKey</methodname>
+  <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>
@@ -40,8 +39,7 @@
   &reftitle.returnvalues;
   <para>
    Returns an array containing three keys of <literal>host</literal>,
-   <literal>port</literal>, and <literal>weight</literal> on success or &false;
-   on failure.
+   <literal>port</literal>, and <literal>weight</literal> on success&return.falseforfailure;.
    &memcached.result.getresultcode;
   </para>
  </refsect1>
@@ -103,7 +101,6 @@ array(3) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getserverlist.xml b/reference/memcached/memcached/getserverlist.xml
index acd42b808df7..ca7e053a1af0 100644
--- a/reference/memcached/memcached/getserverlist.xml
+++ b/reference/memcached/memcached/getserverlist.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>array</type><methodname>Memcached::getServerList</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::getServerList</function> returns the list of all
@@ -78,7 +77,6 @@ array(2) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getstats.xml b/reference/memcached/memcached/getstats.xml
index cd79b2a46758..d05e431ddc2c 100644
--- a/reference/memcached/memcached/getstats.xml
+++ b/reference/memcached/memcached/getstats.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,15 +8,15 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getStats</methodname>
-   <void />
+   <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.
+   state of all available memcache servers. See
+   <link xlink:href="&url.memcache.protocol;">memcache protocol</link>
+   specification for details on these statistics.
   </para>
  </refsect1>
 
@@ -89,7 +88,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/getversion.xml b/reference/memcached/memcached/getversion.xml
index b343907b3240..eb0e79fbeb83 100644
--- a/reference/memcached/memcached/getversion.xml
+++ b/reference/memcached/memcached/getversion.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::getVersion</methodname>
-   <void />
+  <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
@@ -60,7 +59,6 @@ Array
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/increment.xml b/reference/memcached/memcached/increment.xml
index 54aad5fe8bac..5625689521b5 100644
--- a/reference/memcached/memcached/increment.xml
+++ b/reference/memcached/memcached/increment.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -118,7 +117,6 @@ bool(false)
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/incrementbykey.xml b/reference/memcached/memcached/incrementbykey.xml
index 5acf54477890..1e8cc8d7517c 100644
--- a/reference/memcached/memcached/incrementbykey.xml
+++ b/reference/memcached/memcached/incrementbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -93,7 +92,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/ispersistent.xml b/reference/memcached/memcached/ispersistent.xml
index 040fbbfb4489..7aad817340b9 100644
--- a/reference/memcached/memcached/ispersistent.xml
+++ b/reference/memcached/memcached/ispersistent.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::isPersistent</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::isPersistent</function> checks if the connections to
@@ -42,7 +41,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/ispristine.xml b/reference/memcached/memcached/ispristine.xml
index 35c4b44842fd..8915918346d1 100644
--- a/reference/memcached/memcached/ispristine.xml
+++ b/reference/memcached/memcached/ispristine.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::isPristine</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::isPristine</function> checks if the Memcache instance
@@ -41,7 +40,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/prepend.xml b/reference/memcached/memcached/prepend.xml
index d19e5c8da0d9..25a204bd4252 100644
--- a/reference/memcached/memcached/prepend.xml
+++ b/reference/memcached/memcached/prepend.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::prepend</methodname>
+  <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>
@@ -58,8 +57,15 @@
   &reftitle.returnvalues;
   <para>
    &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
+   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>
 
@@ -102,7 +108,6 @@ string(6) "defabc"
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/prependbykey.xml b/reference/memcached/memcached/prependbykey.xml
index 586eef661b78..c89f14a79b6d 100644
--- a/reference/memcached/memcached/prependbykey.xml
+++ b/reference/memcached/memcached/prependbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::prependByKey</methodname>
+  <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>
@@ -59,8 +58,15 @@
   &reftitle.returnvalues;
   <para>
    &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
+   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>
 
@@ -75,7 +81,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/quit.xml b/reference/memcached/memcached/quit.xml
index b7f798a92d81..ad3c3e51526c 100644
--- a/reference/memcached/memcached/quit.xml
+++ b/reference/memcached/memcached/quit.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::quit</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::quit</function> closes any open connections to the
@@ -33,7 +32,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/replace.xml b/reference/memcached/memcached/replace.xml
index 4e367d801925..fdae37c0189f 100644
--- a/reference/memcached/memcached/replace.xml
+++ b/reference/memcached/memcached/replace.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::replace</function> is similar to
@@ -75,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/replacebykey.xml b/reference/memcached/memcached/replacebykey.xml
index e6eddbe93a90..589410783657 100644
--- a/reference/memcached/memcached/replacebykey.xml
+++ b/reference/memcached/memcached/replacebykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::replaceByKey</function> is functionally equivalent to
@@ -86,7 +85,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/resetserverlist.xml b/reference/memcached/memcached/resetserverlist.xml
index 2e925f2a34c2..4c6a55a58647 100644
--- a/reference/memcached/memcached/resetserverlist.xml
+++ b/reference/memcached/memcached/resetserverlist.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::resetServerList</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    <function>Memcached::resetserverlist</function> removes all memcache
@@ -42,7 +41,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/set.xml b/reference/memcached/memcached/set.xml
index 545f1cbe524e..4e335ceb3e4e 100644
--- a/reference/memcached/memcached/set.xml
+++ b/reference/memcached/memcached/set.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></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>
@@ -125,7 +124,6 @@ object(stdClass)#1 (0) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setbykey.xml b/reference/memcached/memcached/setbykey.xml
index 7f589c81274e..815f71bdd17f 100644
--- a/reference/memcached/memcached/setbykey.xml
+++ b/reference/memcached/memcached/setbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,12 +8,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::setByKey</function> is functionally equivalent to
@@ -104,7 +103,6 @@ $m->setByKey('api-cache', 'block-ip:169.127.127.202', 1);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setmulti.xml b/reference/memcached/memcached/setmulti.xml
index a96bdd016255..144afe825846 100644
--- a/reference/memcached/memcached/setmulti.xml
+++ b/reference/memcached/memcached/setmulti.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,10 +8,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::setMulti</function> is similar to
@@ -90,7 +89,6 @@ $m->setMulti($items, time() + 300);
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setmultibykey.xml b/reference/memcached/memcached/setmultibykey.xml
index 9a15f45b33b6..1709bb50ada6 100644
--- a/reference/memcached/memcached/setmultibykey.xml
+++ b/reference/memcached/memcached/setmultibykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>Memcached::setMultiByKey</function> is functionally equivalent to
@@ -75,7 +74,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setoption.xml b/reference/memcached/memcached/setoption.xml
index 40f4592fc7f4..f1ca808aa22f 100644
--- a/reference/memcached/memcached/setoption.xml
+++ b/reference/memcached/memcached/setoption.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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>
@@ -101,7 +100,6 @@ Prefix key is now: widgets
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setoptions.xml b/reference/memcached/memcached/setoptions.xml
index ebd2da2e745a..f5debf114e4e 100644
--- a/reference/memcached/memcached/setoptions.xml
+++ b/reference/memcached/memcached/setoptions.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::setOptions</methodname>
    <methodparam><type>array</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
@@ -84,7 +83,6 @@ Prefix key is now: widgets
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/setsaslauthdata.xml b/reference/memcached/memcached/setsaslauthdata.xml
index 4eb9ef33a14f..63cfd1c04de6 100644
--- a/reference/memcached/memcached/setsaslauthdata.xml
+++ b/reference/memcached/memcached/setsaslauthdata.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Memcached::setSaslAuthData</methodname>
+  <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>
@@ -21,8 +20,8 @@
   </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.
+    built with SASL support.</emphasis> Please refer to
+   <link linkend="memcached.setup">Memcached setup</link> for how to do this.
   </para>
  </refsect1>
 
@@ -53,12 +52,11 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.void;
+   &return.success;
   </para>
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/touch.xml b/reference/memcached/memcached/touch.xml
index 40320de4d95e..cb50f310d701 100644
--- a/reference/memcached/memcached/touch.xml
+++ b/reference/memcached/memcached/touch.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,10 +8,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="Memcached">
    <modifier>public</modifier> <type>bool</type><methodname>Memcached::touch</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>expiration</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.
@@ -61,7 +60,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/memcached/memcached/touchbykey.xml b/reference/memcached/memcached/touchbykey.xml
index fd7cad6c853d..5c77f6127b4e 100644
--- a/reference/memcached/memcached/touchbykey.xml
+++ b/reference/memcached/memcached/touchbykey.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <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><type>int</type><parameter>expiration</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
@@ -73,7 +72,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml