From e294c93ceeb1a0ddcaa16e7add88818c7d6d3eb0 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@php.net>
Date: Fri, 18 Apr 2014 22:32:43 +0000
Subject: [PATCH] Add missing MongoClient constructor changelog entries

Includes various other small grammar and language changes.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333377 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/mongoclient/construct.xml | 37 +++++++++++++++--------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/reference/mongo/mongoclient/construct.xml b/reference/mongo/mongoclient/construct.xml
index b70ff3242b..951654d79b 100644
--- a/reference/mongo/mongoclient/construct.xml
+++ b/reference/mongo/mongoclient/construct.xml
@@ -87,7 +87,7 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
      </term>
      <listitem>
       <para>
-       An array of options for the connection.  Currently available options
+       An array of options for the connection. Currently available options
        include:
        <itemizedlist>
         <listitem>
@@ -306,12 +306,21 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
       <para>
        The following options are deprecated and should no longer be used:
        <itemizedlist>
+        <listitem>
+         <para>
+          <literal>"slaveOkay"</literal>
+         </para>
+         <para>
+          Deprecated. Please use the <link linkend="mongo.readpreferences">read
+          preference</link> options.
+         </para>
+        </listitem>
         <listitem>
          <para>
           <literal>"timeout"</literal>
          </para>
          <para>
-          Deprecated alias for "connectTimeoutMS".
+          Deprecated alias for <literal>"connectTimeoutMS"</literal>.
          </para>
         </listitem>
         <listitem>
@@ -319,7 +328,7 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
           <literal>"wTimeout"</literal>
          </para>
          <para>
-          Deprecated alias for "wTimeoutMS".
+          Deprecated alias for <literal>"wTimeoutMS"</literal>.
          </para>
         </listitem>
        </itemizedlist>
@@ -599,8 +608,12 @@ $m = new MongoClient(
        <entry>1.4.0</entry>
        <entry>
         <para>
-         Added the <literal>"wTimeoutMS"</literal> option has replacement
-         for <literal>"wTimeout"</literal>.
+         Added <literal>"wTimeoutMS"</literal> option, which replaces
+         <literal>"wTimeout"</literal>.
+        </para>
+        <para>
+         Emits <constant>E_DEPRECATED</constant> when
+         <literal>"slaveOkay"</literal> or <literal>"timeout"</literal> is used.
         </para>
        </entry>
       </row>
@@ -608,7 +621,7 @@ $m = new MongoClient(
        <entry>1.3.4</entry>
        <entry>
         <para>
-         Added the <literal>"connectTimeoutMS"</literal> and
+         Added <literal>"connectTimeoutMS"</literal> and
          <literal>"socketTimeoutMS"</literal> options.
         </para>
        </entry>
@@ -617,8 +630,8 @@ $m = new MongoClient(
        <entry>1.3.0</entry>
        <entry>
         <para>
-         Added the <literal>"readPreference"</literal>,
-         <literal>"readPreferenceTags"</literal>, <literal>"w"</literal> and
+         Added <literal>"readPreference"</literal>,
+         <literal>"readPreferenceTags"</literal>, <literal>"w"</literal>, and
          <literal>"wTimeout"</literal> options.
         </para>
        </entry>
@@ -627,11 +640,11 @@ $m = new MongoClient(
        <entry>1.2.0</entry>
        <entry>
         <para>
-         Added the <literal>"username"</literal> and
-         <literal>"password"</literal> options.
+         Added <literal>"username"</literal> and <literal>"password"</literal>
+         options.
         </para>
         <para>
-         Removed the <literal>"persist"</literal> option, as all connections are
+         Removed <literal>"persist"</literal> option, as all connections are
          now persistent. It can still be used, but it doesn't affect anything.
         </para>
         <variablelist>
@@ -661,7 +674,7 @@ $m = new MongoClient(
       </row>
       <row>
        <entry>1.0.9</entry>
-       <entry>Added the <literal>"replicaSet"</literal> option.</entry>
+       <entry>Added <literal>"replicaSet"</literal> option.</entry>
       </row>
       <row>
        <entry>1.0.2</entry>