[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] =?utf-8?q?svn:_/phpdoc/en/trunk/reference/mongo/mongoclient/_construct.xml?=
From:       Derick_Rethans <derick () php ! net>
Date:       2013-05-20 23:09:32
Message-ID: svn-derick-1369091372-330322-139500985 () svn ! php ! net
[Download RAW message or body]

derick                                   Mon, 20 May 2013 23:09:32 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=330322

Log:
Document wtimeout and wTimeoutMS properly.

Changed paths:
    U   phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml

Modified: phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml	2013-05-20 21:36:43 UTC (rev 330321)
+++ phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml	2013-05-20 23:09:32 UTC (rev 330322)
@@ -211,23 +211,15 @@
           How long a send or receive on a socket can take before timing out.
           <note>
            <simpara>
-            This is a client side timeout. If a <literal>insert</literal> hits
-            the socketTimeoutMS there is no way to know if the server actually
-            received the write or not.
+            This is a client side timeout. If an <literal>insert</literal> hits
+            the <literal>"socketTimeoutMS"</literal> value there is no way to
+            know if the server actually received the write or not.
            </simpara>
           </note>
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>"timeout"</literal>
-         </para>
-         <para>
-          Deprecated alias for "connectTimeoutMS"
-         </para>
-        </listitem>
-        <listitem>
-         <para>
           <literal>"username"</literal>
          </para>
          <para>
@@ -265,7 +257,7 @@
         </listitem>
         <listitem>
          <para>
-          <literal>"wTimeout"</literal>
+          <literal>"wTimeoutMS"</literal>
          </para>
          <para>
           This option is used in combination with the <literal>"w"</literal>
@@ -277,6 +269,27 @@
         </listitem>
        </itemizedlist>
       </para>
+      <para>
+       The following options are deprecated and should no longer be used:
+       <itemizedlist>
+        <listitem>
+         <para>
+          <literal>"timeout"</literal>
+         </para>
+         <para>
+          Deprecated alias for "connectTimeoutMS".
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <literal>"wTimeout"</literal>
+         </para>
+         <para>
+          Deprecated alias for "wTimeoutMS".
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -314,6 +327,15 @@
      </thead>
      <tbody>
       <row>
+       <entry>1.4.0</entry>
+       <entry>
+        <para>
+         Added the <literal>"wTimeoutMS"</literal> option has replacement
+         for <literal>"wTimeout"</literal>.
+        </para>
+       </entry>
+      </row>
+      <row>
        <entry>1.3.4</entry>
        <entry>
         <para>



-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]