DOCSP-35923: csot page

source/connection/connection-pools.txt

@@ -93,8 +93,7 @@ see the corresponding syntax:
 
         - Maximum number of connections opened in the pool. When the 
           connection pool reaches the maximum number of connections, new 
-          connections wait up until to the value of 
-          ``waitQueueTimeoutMS``.
+          connections wait for up to the amount of time set by ``timeoutMS``.
 
           *Default:* ``100`` 
 
@@ -106,11 +105,12 @@ see the corresponding syntax:
 
           *Default*: ``0``
 
-      * - ``waitQueueTimeoutMS``
+      * - ``waitQueueTimeoutMS`` *(deprecated)*
 
         - Maximum wait time in milliseconds that an operation can wait for 
           a connection to become available. A value of ``0`` means there
-          is no limit. 
+          is no limit. Set the :ref:`client-level timeout <java-csot>` to
+          replace the functionality of this deprecated option.
 
           *Default*: ``120000`` (120 seconds)
 

source/connection/specify-connection-options.txt

@@ -9,6 +9,7 @@ Specify Connection Options
    MongoClient Settings </connection/specify-connection-options/mongoclientsettings>
    Connection URI Options </connection/specify-connection-options/connection-options.txt>
    Stable API </connection/specify-connection-options/stable-api>
+   Timeout Setting </connection/specify-connection-options/csot>
    Network Compression </connection/specify-connection-options/network-compression>
    JNDI Datasource </connection/specify-connection-options/jndi>
    AWS Lambda <https://www.mongodb.com/docs/atlas/manage-connections-aws-lambda/>
@@ -25,7 +26,8 @@ Specify Connection Options
 - :ref:`MongoClient Settings <mongoclientsettings>`
 - :ref:`Connection URI Options <connection-options>`
 - :ref:`Stable API <stable-api-java>`
+- :ref:`Limit Server Execution Time <java-csot>`
 - :ref:`Network Compression <network-compression>`
 - :ref:`JNDI Datasource <jndi>`
 - `AWS Lambda <https://www.mongodb.com/docs/atlas/manage-connections-aws-lambda/>`__
-- :ref:`Connection Security Options <security-connection-settings>`
+- :ref:`Connection Security Options <security-connection-settings>`

source/connection/specify-connection-options/connection-options.txt

@@ -31,10 +31,12 @@ parameters of the connection URI to specify the behavior of the client.
 
        | **Default**: ``100``
 
-   * - **waitQueueTimeoutMS**
+   * - **waitQueueTimeoutMS** *(deprecated)*
      - integer
      - Specifies the maximum amount of time, in milliseconds that a
-       thread can wait for a connection to become available.
+       thread can wait for a connection to become available. Set the
+       :ref:`client-level timeout <java-csot>` to replace the
+       functionality of this deprecated option.
 
        | **Default**: ``120000`` (120 seconds)
 
@@ -103,6 +105,21 @@ parameters of the connection URI to specify the behavior of the client.
 
        | **Default**: ``false``
 
+   * - **timeoutMS**
+     - integer
+     - | Specifies the time limit, in milliseconds, for the full execution
+         of an operation. This option sets a client-level operations
+         timeout that replaces the functionality of the following
+         deprecated options:
+
+       - ``waitQueueTimeoutMS``
+       - ``socketTimeoutMS``
+       - ``wTimeoutMS``
+       - ``maxTimeMS``
+       - ``maxCommitTimeMS``
+
+       | To learn more, see the :ref:`java-csot` guide.
+
    * - **connectTimeoutMS**
      - integer
      - Specifies the maximum amount of time, in milliseconds, the Java
@@ -112,12 +129,13 @@ parameters of the connection URI to specify the behavior of the client.
 
        | **Default**: ``10000`` (10 seconds)
 
-   * - **socketTimeoutMS**
+   * - **socketTimeoutMS** *(deprecated)*
      - integer
      - Specifies the maximum amount of time, in milliseconds, the Java
        driver will wait to send or receive a request before timing out.
        A value of ``0`` instructs the driver to never time out while waiting
-       to send or receive a request.
+       to send or receive a request. Set the :ref:`client-level timeout
+       <java-csot>` to replace the functionality of this deprecated option.
 
        | **Default**: ``0``
 
@@ -154,12 +172,14 @@ parameters of the connection URI to specify the behavior of the client.
 
        | **Default**: ``1``
 
-   * - **wtimeoutMS**
+   * - **wtimeoutMS** *(deprecated)*
      - integer
      - Specifies a time limit, in milliseconds, for the write concern. For
        more information, see the server documentation for the
        :manual:`wtimeoutMS option </reference/connection-string/#write-concern-options>`.
-       A value of ``0`` instructs the driver to never time out write operations.
+       A value of ``0`` instructs the driver to never time out write operations. Set the
+       :ref:`client-level timeout <java-csot>` to replace the
+       functionality of this deprecated option.
 
        | **Default**: ``0``