From 2983ed9c5015b3bda27e2dafff947c8532093164 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@php.net>
Date: Fri, 5 Oct 2012 20:22:15 +0000
Subject: [PATCH] Use reverse chronological order for Mongo changelogs

https://jira.mongodb.org/browse/PHP-499


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@327889 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/mongo/construct.xml           | 73 ++++++++---------
 reference/mongo/mongo/getpoolsize.xml         |  9 +-
 reference/mongo/mongo/getslave.xml            |  5 +-
 reference/mongo/mongo/getslaveokay.xml        |  4 +-
 reference/mongo/mongo/pooldebug.xml           |  4 +-
 reference/mongo/mongo/setslaveokay.xml        |  4 +-
 reference/mongo/mongo/switchslave.xml         |  4 +-
 reference/mongo/mongobindata/construct.xml    |  6 +-
 .../mongo/mongocollection/batchinsert.xml     | 21 ++---
 reference/mongo/mongocollection/count.xml     |  3 +-
 .../mongo/mongocollection/ensureindex.xml     | 55 ++++++-------
 .../mongo/mongocollection/getslaveokay.xml    |  4 +-
 reference/mongo/mongocollection/group.xml     |  3 +-
 reference/mongo/mongocollection/insert.xml    | 59 ++++++-------
 reference/mongo/mongocollection/remove.xml    | 73 +++++++++--------
 reference/mongo/mongocollection/save.xml      | 29 +++----
 .../mongo/mongocollection/setslaveokay.xml    |  4 +-
 reference/mongo/mongocollection/update.xml    | 82 +++++++++----------
 reference/mongo/mongocursor/doquery.xml       |  4 +-
 reference/mongo/mongocursor/info.xml          | 14 ++--
 reference/mongo/mongodb/authenticate.xml      |  4 +-
 reference/mongo/mongodb/command.xml           |  2 +-
 reference/mongo/mongodb/forceerror.xml        |  4 +-
 reference/mongo/mongodb/getslaveokay.xml      |  4 +-
 reference/mongo/mongodb/preverror.xml         |  4 +-
 reference/mongo/mongodb/reseterror.xml        |  4 +-
 reference/mongo/mongodb/setslaveokay.xml      |  4 +-
 reference/mongo/mongogridfs/storeupload.xml   |  2 +-
 reference/mongo/mongopool/getsize.xml         |  4 +-
 reference/mongo/mongopool/info.xml            |  4 +-
 reference/mongo/mongopool/setsize.xml         |  4 +-
 31 files changed, 234 insertions(+), 266 deletions(-)

diff --git a/reference/mongo/mongo/construct.xml b/reference/mongo/mongo/construct.xml
index 6cd1a69490..e9cbee5a9c 100644
--- a/reference/mongo/mongo/construct.xml
+++ b/reference/mongo/mongo/construct.xml
@@ -181,39 +181,49 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
        <entry>1.2.0</entry>
        <entry>
         <para>
-         Removed the persist option, as all connections are now persistent. It
-         can still be used, but it doesn't affect anything.
-         <variablelist>
-          <varlistentry>
-           <term>
-            <parameter>"persist"</parameter>
-           </term>
-           <listitem>
-            <para>
-             If the connection should be persistent.  If set, the connection will
-             be persistent.  The string representation of the value is used as an
-             id for the connection, so two instances of
-             <classname>Mongo</classname> that are initialized with
-             <literal>array("persist" => "foobar")</literal> will share the same
-             database connection, whereas an instance initialized with
-             <literal>array("persist" => "barbaz")</literal> will use a different
-             database connection.
-            </para>
-           </listitem>
-          </varlistentry>
-         </variablelist>
+         Added the <literal>"username"</literal> and
+         <literal>"password"</literal> options.
         </para>
         <para>
-         The "replicaSet" parameter now takes a string, not a boolean (although
-         boolean is still accepted).
+         Removed the <literal>"persist"</literal> option, as all connections are
+         now persistent. It can still be used, but it doesn't affect anything.
+        </para>
+        <variablelist>
+         <varlistentry>
+          <term>
+           <parameter>"persist"</parameter>
+          </term>
+          <listitem>
+           <para>
+            If the connection should be persistent. If set, the connection will
+            be persistent. The string representation of the value is used as an
+            ID for the connection, so two instances of
+            <classname>Mongo</classname> that are initialized with
+            <literal>array("persist" => "foobar")</literal> will share the same
+            database connection, whereas an instance initialized with
+            <literal>array("persist" => "barbaz")</literal> will use a different
+            database connection.
+           </para>
+          </listitem>
+         </varlistentry>
+        </variablelist>
+        <para>
+         The <literal>"replicaSet"</literal> option now takes a string, not a
+         boolean (although boolean is still accepted).
         </para>
        </entry>
       </row>
+      <row>
+       <entry>1.0.9</entry>
+       <entry>Added the <literal>"replicaSet"</literal> option.</entry>
+      </row>
       <row>
        <entry>1.0.2</entry>
        <entry>
-        Changed constructor to take an array of options.  Pre-1.0.2, the
-        constructor took the following parameters:
+        <para>
+         Changed constructor to take an array of options. Pre-1.0.2, the
+         constructor took the following parameters:
+        </para>
         <variablelist>
          <varlistentry>
           <term>
@@ -259,19 +269,6 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
         </variablelist>
        </entry>
       </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added the <literal>replicaSet</literal> option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.2.0</entry>
-       <entry>
-        Added the <literal>username</literal> and <literal>password</literal>
-        options.
-       </entry>
-      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mongo/mongo/getpoolsize.xml b/reference/mongo/mongo/getpoolsize.xml
index c17b2ca2a4..c237b1a9ce 100644
--- a/reference/mongo/mongo/getpoolsize.xml
+++ b/reference/mongo/mongo/getpoolsize.xml
@@ -34,6 +34,7 @@
    Returns the current pool size.
   </para>
  </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -48,9 +49,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
@@ -95,7 +94,7 @@ var_dump(Mongo::poolDebug());
   </example>
  </refsect1>
 
- <refsect1 role="seealso"><!-- {{{ -->
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
@@ -104,7 +103,7 @@ var_dump(Mongo::poolDebug());
     <member>The <link linkend="mongo.connecting">connection</link> documentation.</member>
    </simplelist>
   </para>
- </refsect1><!-- }}} -->
+ </refsect1>
 
 </refentry>
 <!-- Keep this comment at the end of the file
diff --git a/reference/mongo/mongo/getslave.xml b/reference/mongo/mongo/getslave.xml
index 4e973ed88f..bbddbd51da 100644
--- a/reference/mongo/mongo/getslave.xml
+++ b/reference/mongo/mongo/getslave.xml
@@ -65,9 +65,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
@@ -75,7 +73,6 @@
   </para>
  </refsect1>
 
-
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mongo/mongo/getslaveokay.xml b/reference/mongo/mongo/getslaveokay.xml
index 359ca49f76..c1c4d2da20 100644
--- a/reference/mongo/mongo/getslaveokay.xml
+++ b/reference/mongo/mongo/getslaveokay.xml
@@ -46,9 +46,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongo/pooldebug.xml b/reference/mongo/mongo/pooldebug.xml
index 6cc0c403dd..a78fedc90c 100644
--- a/reference/mongo/mongo/pooldebug.xml
+++ b/reference/mongo/mongo/pooldebug.xml
@@ -111,9 +111,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongo/setslaveokay.xml b/reference/mongo/mongo/setslaveokay.xml
index 542325ee6e..a7de3fa42a 100644
--- a/reference/mongo/mongo/setslaveokay.xml
+++ b/reference/mongo/mongo/setslaveokay.xml
@@ -60,9 +60,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongo/switchslave.xml b/reference/mongo/mongo/switchslave.xml
index da2c1bdefd..cc4c3b9e9a 100644
--- a/reference/mongo/mongo/switchslave.xml
+++ b/reference/mongo/mongo/switchslave.xml
@@ -73,9 +73,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongobindata/construct.xml b/reference/mongo/mongobindata/construct.xml
index 0e81e3e5cc..b88886b857 100644
--- a/reference/mongo/mongobindata/construct.xml
+++ b/reference/mongo/mongobindata/construct.xml
@@ -78,9 +78,9 @@
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when the 2nd argument is not
-       used. The default value for <parameter>type</parameter> may change in
-       the near future.
+        Emits <constant>E_DEPRECATED</constant> when the second argument is not
+        used. The default value for <parameter>type</parameter> may change in
+        the near future.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/batchinsert.xml b/reference/mongo/mongocollection/batchinsert.xml
index 38008240ad..6b378f69a9 100644
--- a/reference/mongo/mongocollection/batchinsert.xml
+++ b/reference/mongo/mongocollection/batchinsert.xml
@@ -123,23 +123,24 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.5</entry>
-       <entry>
-        Added "options" parameter.
-       </entry>
+       <entry>1.2.7</entry>
+       <entry>Added <literal>"continueOnError"</literal> option.</entry>
       </row>
       <row>
        <entry>1.0.9</entry>
        <entry>
-        Added ability to pass integers to "safe" options (only accepted booleans
-        before) and added "fsync" option.
+        <para>
+         Added ability to pass integers to the <literal>"safe"</literal> option,
+         which previously only accepted booleans.
+        </para>
+        <para>
+         Added <literal>"fsync"</literal> option.
+        </para>
        </entry>
       </row>
       <row>
-       <entry>1.2.7</entry>
-       <entry>
-        The <literal>continueOnError</literal> flag has been added.
-       </entry>
+       <entry>1.0.5</entry>
+       <entry>Added <parameter>options</parameter> parameter.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongocollection/count.xml b/reference/mongo/mongocollection/count.xml
index 5802b640a7..6764164754 100644
--- a/reference/mongo/mongocollection/count.xml
+++ b/reference/mongo/mongocollection/count.xml
@@ -77,7 +77,8 @@
       <row>
        <entry>1.0.7</entry>
        <entry>
-        Added <literal>limit</literal> and <literal>skip</literal> parameters.
+        Added <parameter>limit</parameter> and <parameter>skip</parameter>
+        parameters.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/ensureindex.xml b/reference/mongo/mongocollection/ensureindex.xml
index dba8d549b6..b907a71e1c 100644
--- a/reference/mongo/mongocollection/ensureindex.xml
+++ b/reference/mongo/mongocollection/ensureindex.xml
@@ -195,44 +195,43 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.2</entry>
+       <entry>1.3.0</entry>
        <entry>
-        Changed "options" parameter from boolean to array.  Pre-1.0.2, the
-        second parameter was an optional boolean value specifying a unique 
-        index.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.11</entry>
-       <entry>
-        "safe" will trigger master failover, if necessary.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.11</entry>
-       <entry>
-        <classname>MongoException</classname> will be thrown if index name
-        (either generated or set) is longer than 128 bytes.
-       </entry>
-      </row>
-      <row>
-       <entry>1.2.0</entry>
-       <entry>
-        Added timeout option.
+        The <parameter>options</parameter> parameter no longer accepts a boolean
+        to signify a unique index. Instead, this now has to be done with
+        <literal>array('unique' => true)</literal>.
        </entry>
       </row>
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when <parameter>options</parameter> is <type>scalar</type>.
+        Emits <constant>E_DEPRECATED</constant> when
+        <parameter>options</parameter> is <type>scalar</type>.
        </entry>
       </row>
       <row>
-       <entry>1.3.0</entry>
+       <entry>1.2.0</entry>
+       <entry>Added <literal>"timeout"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.11</entry>
        <entry>
-        The <parameter>options</parameter> parameter does no longer accept
-        just a boolean to signify a unique index. Instead, this now has to be done
-        with <literal>array('unique' => true)</literal>.
+        <para>
+         The <literal>"safe"</literal> option will trigger a master failover, if
+         necessary.
+        </para>
+        <para>
+         <classname>MongoException</classname> will be thrown if the index name
+         (either generated or set) is longer than 128 bytes.
+        </para>
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.2</entry>
+       <entry>
+        Changed <parameter>options</parameter> parameter from boolean to array.
+        Pre-1.0.2, the second parameter was an optional boolean value specifying
+        a unique index.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/getslaveokay.xml b/reference/mongo/mongocollection/getslaveokay.xml
index b7eddd1399..149098dd5f 100644
--- a/reference/mongo/mongocollection/getslaveokay.xml
+++ b/reference/mongo/mongocollection/getslaveokay.xml
@@ -46,9 +46,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongocollection/group.xml b/reference/mongo/mongocollection/group.xml
index 06d90d004b..b73c4bb01e 100644
--- a/reference/mongo/mongocollection/group.xml
+++ b/reference/mongo/mongocollection/group.xml
@@ -114,7 +114,8 @@
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when <parameter>options</parameter> is <type>scalar</type>.
+        Emits <constant>E_DEPRECATED</constant> when
+        <parameter>options</parameter> is <type>scalar</type>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/insert.xml b/reference/mongo/mongocollection/insert.xml
index 88efa8bd3b..fb5f94083d 100644
--- a/reference/mongo/mongocollection/insert.xml
+++ b/reference/mongo/mongocollection/insert.xml
@@ -258,45 +258,46 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.5</entry>
+       <entry>1.3.0</entry>
        <entry>
-        Changed second parameter to an array of options.  Pre-1.0.5, the
-        second parameter was a boolean indicating the "safe" option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added ability to pass integers to "safe" options (only accepted booleans
-        before) and added "fsync" option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        The return type was changed to be an array containing error
-        information if the "safe" option is used, otherwise it is a boolean as
-        before.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if "safe" is set.
+        The <parameter>options</parameter> parameter no longer accepts a boolean
+        to signify a safe insert. Instead, this now has to be done with
+        <literal>array('safe' => true)</literal>.
        </entry>
       </row>
       <row>
        <entry>1.2.0</entry>
+       <entry>Added <literal>"timeout"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.11</entry>
        <entry>
-        Added timeout option.
+        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
        </entry>
       </row>
       <row>
-       <entry>1.3.0</entry>
+       <entry>1.0.9</entry>
        <entry>
-        The <parameter>options</parameter> parameter does no longer accept
-        just a boolean to signify a safe insert. Instead, this now has to be done
-        with <literal>array('safe' => true)</literal>.
+        <para>
+         Added ability to pass integers to the <literal>"safe"</literal> option,
+         which previously only accepted booleans.
+        </para>
+        <para>
+         Added <literal>"fsync"</literal> option.
+        </para>
+        <para>
+         The return type was changed to be an array containing error information
+         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
+         is returned as before.
+        </para>
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.5</entry>
+       <entry>
+        Changed second parameter to be an array of options. Pre-1.0.5, the
+        second parameter was a boolean indicating the <literal>"safe"</literal>
+        option.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/remove.xml b/reference/mongo/mongocollection/remove.xml
index 209258a911..81024bd922 100644
--- a/reference/mongo/mongocollection/remove.xml
+++ b/reference/mongo/mongocollection/remove.xml
@@ -144,52 +144,53 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.5</entry>
+       <entry>1.3.0</entry>
        <entry>
-        Changed second parameter to an array of options.  Pre-1.0.5, the
-        second parameter was a boolean indicating the "justOne" option and
-        there was no safe option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added ability to pass integers to "safe" options (only accepted booleans
-        before) and added "fsync" option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        The return type was changed to be an array containing error
-        information if the "safe" option is used, otherwise it is a boolean as
-        before.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if "safe" is set.
-       </entry>
-      </row>
-      <row>
-       <entry>1.2.0</entry>
-       <entry>
-        Added timeout option.
+        The <parameter>options</parameter> parameter no longer accepts a boolean
+        to signify <literal>"justOne"</literal>. Instead, this now has to be
+        done with <literal>array('justOne' => true)</literal>.
        </entry>
       </row>
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when <parameter>options</parameter> is <type>scalar</type>.
+        Emits <constant>E_DEPRECATED</constant> when
+        <parameter>options</parameter> is <type>scalar</type>.
        </entry>
       </row>
       <row>
-       <entry>1.3.0</entry>
+       <entry>1.2.0</entry>
+       <entry>Added <literal>"timeout"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.11</entry>
        <entry>
-        The <parameter>options</parameter> parameter does no longer accept
-        just a boolean to signify "justOne". Instead, this now has to be done
-        with <literal>array('justOne' => true)</literal>.
+        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.9</entry>
+       <entry>
+        <para>
+         Added ability to pass integers to the <literal>"safe"</literal> option,
+         which previously only accepted booleans.
+        </para>
+        <para>
+         Added <literal>"fsync"</literal> option.
+        </para>
+        <para>
+         The return type was changed to be an array containing error information
+         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
+         is returned as before.
+        </para>
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.5</entry>
+       <entry>
+        Changed second parameter to be an array of options. Pre-1.0.5, the
+        second parameter was a boolean indicating the <literal>"safe"</literal>
+        option.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocollection/save.xml b/reference/mongo/mongocollection/save.xml
index 842e718471..2f2433f391 100644
--- a/reference/mongo/mongocollection/save.xml
+++ b/reference/mongo/mongocollection/save.xml
@@ -138,29 +138,30 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.5</entry>
+       <entry>1.2.0</entry>
+       <entry>Added <literal>"timeout"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.11</entry>
        <entry>
-        Added "options" parameter.
+        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
        </entry>
       </row>
       <row>
        <entry>1.0.9</entry>
        <entry>
-        Added ability to pass integers to "safe" options (only accepted booleans
-        before) and added "fsync" option.
+        <para>
+         Added ability to pass integers to the <literal>"safe"</literal> option,
+         which previously only accepted booleans.
+        </para>
+        <para>
+         Added <literal>"fsync"</literal> option.
+        </para>
        </entry>
       </row>
       <row>
-       <entry>1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if "safe" is set.
-       </entry>
-      </row>
-      <row>
-       <entry>1.2.0</entry>
-       <entry>
-        Added timeout option.
-       </entry>
+       <entry>1.0.5</entry>
+       <entry>Added <parameter>options</parameter> parameter.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongocollection/setslaveokay.xml b/reference/mongo/mongocollection/setslaveokay.xml
index 8e0ad784f2..2bea6c5142 100644
--- a/reference/mongo/mongocollection/setslaveokay.xml
+++ b/reference/mongo/mongocollection/setslaveokay.xml
@@ -61,9 +61,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongocollection/update.xml b/reference/mongo/mongocollection/update.xml
index c5ec4d6b1a..01fc958f53 100644
--- a/reference/mongo/mongocollection/update.xml
+++ b/reference/mongo/mongocollection/update.xml
@@ -173,57 +173,57 @@
      </thead>
      <tbody>
       <row>
-       <entry>1.0.1</entry>
+       <entry>1.3.0</entry>
        <entry>
-        Changed "options" parameter from boolean to array.  Pre-1.0.1, the
-        second parameter was an optional boolean value specifying an upsert. 
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.5</entry>
-       <entry>
-        Added "safe" option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        Added ability to pass integers to "safe" options (only accepted booleans
-        before) and added "fsync" option.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.9</entry>
-       <entry>
-        The return type was changed to be an array containing error
-        information if the "safe" option is used, otherwise it is a boolean as
-        before.
-       </entry>
-      </row>
-      <row>
-       <entry>1.0.11</entry>
-       <entry>
-        Disconnects on "not master" errors if "safe" is set.
-       </entry>
-      </row>
-      <row>
-       <entry>1.2.0</entry>
-       <entry>
-        Added timeout option.
+        The <parameter>options</parameter> parameter no longer accepts a boolean
+        to signify an upsert. Instead, this now has to be done with
+        <literal>array('upsert' => true)</literal>.
        </entry>
       </row>
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when <parameter>options</parameter> is <type>scalar</type>.
+        Emits <constant>E_DEPRECATED</constant> when
+        <parameter>options</parameter> is <type>scalar</type>.
        </entry>
       </row>
       <row>
-       <entry>1.3.0</entry>
+       <entry>1.2.0</entry>
+       <entry>Added <literal>"timeout"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.11</entry>
        <entry>
-        The <parameter>options</parameter> parameter does no longer accept
-        just a boolean to signify an upsert. Instead, this now has to be done
-        with <literal>array('upsert' => true)</literal>.
+        Disconnects on "not master" errors if <literal>"safe"</literal> is set.
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.9</entry>
+       <entry>
+        <para>
+         Added ability to pass integers to the <literal>"safe"</literal> option,
+         which previously only accepted booleans.
+        </para>
+        <para>
+         Added <literal>"fsync"</literal> option.
+        </para>
+        <para>
+         The return type was changed to be an array containing error information
+         if the <literal>"safe"</literal> option is used. Otherwise, a boolean
+         is returned as before.
+        </para>
+       </entry>
+      </row>
+      <row>
+       <entry>1.0.5</entry>
+       <entry>Added <literal>"safe"</literal> option.</entry>
+      </row>
+      <row>
+       <entry>1.0.1</entry>
+       <entry>
+        Changed <parameter>options</parameter> parameter from boolean to array.
+        Pre-1.0.1, the second parameter was an optional boolean value specifying
+        an upsert.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongocursor/doquery.xml b/reference/mongo/mongocursor/doquery.xml
index 7fed9467c9..c92f92be27 100644
--- a/reference/mongo/mongocursor/doquery.xml
+++ b/reference/mongo/mongocursor/doquery.xml
@@ -60,9 +60,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongocursor/info.xml b/reference/mongo/mongocursor/info.xml
index a65c62a771..6c6c02727e 100644
--- a/reference/mongo/mongocursor/info.xml
+++ b/reference/mongo/mongocursor/info.xml
@@ -42,13 +42,6 @@
       </row>
      </thead>
      <tbody>
-      <row>
-       <entry>1.0.10</entry>
-       <entry>
-        Added <literal>started_iterating</literal> field, a boolean indicating 
-        if cursor is pre- or post-query.
-       </entry>
-      </row>
       <row>
        <entry>1.1.0</entry>
        <entry>
@@ -61,6 +54,13 @@
         <function>MongoCursor::slaveOkay</function>).
        </entry>
       </row>
+      <row>
+       <entry>1.0.10</entry>
+       <entry>
+        Added <literal>started_iterating</literal> field, a boolean indicating
+        if cursor is pre- or post-query.
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mongo/mongodb/authenticate.xml b/reference/mongo/mongodb/authenticate.xml
index e9ab3a8b90..591e4f1d10 100644
--- a/reference/mongo/mongodb/authenticate.xml
+++ b/reference/mongo/mongodb/authenticate.xml
@@ -136,8 +136,8 @@ array("ok" => 0, "errmsg" => "auth fails");
       <row>
        <entry>1.2.11</entry>
        <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       Please pass in the authentication details to the constructor.
+        Emits <constant>E_DEPRECATED</constant> when used. Please pass in the
+        authentication details to the constructor.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongodb/command.xml b/reference/mongo/mongodb/command.xml
index f7dc761ca3..b62f44b9d0 100644
--- a/reference/mongo/mongodb/command.xml
+++ b/reference/mongo/mongodb/command.xml
@@ -93,7 +93,7 @@ public function command($data) {
        <entry>1.2.0</entry>
        <entry>
         Added <literal>options</literal> parameter with a single option: 
-        <literal>timeout</literal>.
+        <literal>"timeout"</literal>.
        </entry>
       </row>
      </tbody>
diff --git a/reference/mongo/mongodb/forceerror.xml b/reference/mongo/mongodb/forceerror.xml
index a355f06322..5e4910607e 100644
--- a/reference/mongo/mongodb/forceerror.xml
+++ b/reference/mongo/mongodb/forceerror.xml
@@ -60,9 +60,7 @@ public function forceError() {
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongodb/getslaveokay.xml b/reference/mongo/mongodb/getslaveokay.xml
index b5d16f4a89..9d6be6833f 100644
--- a/reference/mongo/mongodb/getslaveokay.xml
+++ b/reference/mongo/mongodb/getslaveokay.xml
@@ -46,9 +46,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-        Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongodb/preverror.xml b/reference/mongo/mongodb/preverror.xml
index e07cc32274..a4bea8af38 100644
--- a/reference/mongo/mongodb/preverror.xml
+++ b/reference/mongo/mongodb/preverror.xml
@@ -46,9 +46,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongodb/reseterror.xml b/reference/mongo/mongodb/reseterror.xml
index 86fed37785..05acd23852 100644
--- a/reference/mongo/mongodb/reseterror.xml
+++ b/reference/mongo/mongodb/reseterror.xml
@@ -60,9 +60,7 @@ public function resetError() {
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongodb/setslaveokay.xml b/reference/mongo/mongodb/setslaveokay.xml
index b123f0768a..b854b4ff78 100644
--- a/reference/mongo/mongodb/setslaveokay.xml
+++ b/reference/mongo/mongodb/setslaveokay.xml
@@ -60,9 +60,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongogridfs/storeupload.xml b/reference/mongo/mongogridfs/storeupload.xml
index a432411d90..9fed82f2c7 100644
--- a/reference/mongo/mongogridfs/storeupload.xml
+++ b/reference/mongo/mongogridfs/storeupload.xml
@@ -93,7 +93,7 @@ $grid->storeUpload("pic", array("username" => "joe"));
       <row>
        <entry>1.2.5</entry>
        <entry>
-        Changed second parameter to an array of metadata.  Pre-1.2.5, the
+        Changed second parameter to an array of metadata. Pre-1.2.5, the
         second parameter was an optional string overriding the filename.
        </entry>
       </row>
diff --git a/reference/mongo/mongopool/getsize.xml b/reference/mongo/mongopool/getsize.xml
index ddccc5f44a..e10f2b1859 100644
--- a/reference/mongo/mongopool/getsize.xml
+++ b/reference/mongo/mongopool/getsize.xml
@@ -40,9 +40,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongopool/info.xml b/reference/mongo/mongopool/info.xml
index 3b87730e5d..64672be52b 100644
--- a/reference/mongo/mongopool/info.xml
+++ b/reference/mongo/mongopool/info.xml
@@ -129,9 +129,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/reference/mongo/mongopool/setsize.xml b/reference/mongo/mongopool/setsize.xml
index 39648cc654..d2b11ebee0 100644
--- a/reference/mongo/mongopool/setsize.xml
+++ b/reference/mongo/mongopool/setsize.xml
@@ -60,9 +60,7 @@
      <tbody>
       <row>
        <entry>1.2.11</entry>
-       <entry>
-       Emits <constant>E_DEPRECATED</constant> when used.
-       </entry>
+       <entry>Emits <constant>E_DEPRECATED</constant> when used.</entry>
       </row>
      </tbody>
     </tgroup>