DOCSP-18071: fix connection guide (#499)

* DOCSP-18071: fix node connection guide

* first pass fixes

* MW & CC PR fixes 1

Author: rustagir

source/code-snippets/connection/srv.js renamed to source/code-snippets/connection/connect.js

@@ -1,8 +1,7 @@
 const { MongoClient } = require("mongodb");
 
 // Connection URI
-const uri =
-  "mongodb+srv://sample-hostname:27017/?maxPoolSize=20&w=majority";
+const uri = "<connection string uri>";
 
 // Create a new MongoClient
 const client = new MongoClient(uri);

source/fundamentals/connection/connect.txt

@@ -4,6 +4,12 @@
 Connection Guide
 ================
 
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 2
+   :class: singlecol
+
 This guide shows you how to connect to a MongoDB instance or replica set
 using the Node.js driver.
 
@@ -18,19 +24,20 @@ example shows each part of the connection URI:
 .. figure:: /includes/figures/connection-string-parts.png
    :alt: Each part of the connection string
 
-In this example, for the protocol, we use ``mongodb+srv`` which specifies the
-:manual:`DNS Seedlist Connection Format
-</reference/connection-string/#dns-seedlist-connection-format>`. This indicates
-that the hostname following it corresponds to the DNS SRV record of your
-MongoDB instance or deployment. If your instance or deployment does not have a
-DNS SRV record, use ``mongodb`` to specify the :manual:`Standard Connection
-Format </reference/connection-string/#standard-connection-string-format>`.
+In this example, we use ``mongodb`` for the protocol, which specifies
+the :manual:`Standard Connection String Format </reference/connection-string/#std-label-connections-standard-connection-string-format>`.
+
+If your instance or deployment has a DNS SRV record, you can use the
+:manual:`DNS Seed List Connection Format
+</reference/connection-string/#dns-seed-list-connection-format>` for
+your connection string. This format offers more flexibility of
+deployment and the ability to change the servers in rotation without
+reconfiguring clients.
 
 .. note::
 
-   If your deployment is on MongoDB Atlas, follow the
-   :atlas:`Atlas driver connection guide </driver-connection?tck=docs_driver_nodejs>`
-   to retrieve your connection string.
+   To learn how to retrieve your connection string in Atlas, see the
+   :atlas:`Atlas driver connection guide </driver-connection>`.
 
 The next part of the connection string contains your username and password
 if you are using password-based authentication. Replace the value of ``user``
@@ -39,7 +46,7 @@ authentication mechanism that does not require a username and password, omit
 this part of the connection URI.
 
 The next part of the connection string specifies the hostname or IP address and
-port of your MongoDB instance. In the example above, we use ``sample-hostname``
+port of your MongoDB instance. In the example above, we use ``sample.host``
 as the hostname and ``27017`` as the port. Replace these values to point to
 your MongoDB instance.
 
@@ -48,12 +55,12 @@ options as parameters. In the example above, we set two connection options:
 ``maxPoolSize=20`` and ``w=majority``. For more information on connection
 options, skip to the :ref:`node-connection-options` section.
 
-.. _connect-atlas-node-driver:
+.. _connect-sample-node-driver:
 
-The code below shows how you can use the sample connection URI in a client to
+The code below shows how you can use a connection URI in a client to
 connect to MongoDB.
 
-.. literalinclude:: /code-snippets/connection/srv.js
+.. literalinclude:: /code-snippets/connection/connect.js
    :language: javascript
 
 .. _node-other-ways-to-connect:
@@ -71,7 +78,7 @@ Connect to a MongoDB Server on Your Local Machine
 .. include:: /includes/localhost-connection.rst
 
 To test whether you can connect to your server, replace the connection
-string in the :ref:`Connect to MongoDB Atlas <connect-atlas-node-driver>` code
+string in the :ref:`Connect to MongoDB <connect-sample-node-driver>` code
 example and run it.
 
 Connect to a Replica Set
@@ -94,10 +101,10 @@ When making a connection, the driver takes the following actions by default:
 - Discovers all replica set members when given the address of any one member.
 - Dispatches operations to the appropriate member, such as write against the **primary**.
 
-.. tip::
+.. tip:: Specify all hosts
 
-   You only need to specify one host to connect to a replica set. However, to ensure connectivity if the specified host
-   is unavailable, provide the full list of hosts.
+   To ensure connectivity if one host is unavailable, provide the full
+   list of hosts when connecting to a replica set.
 
 Direct Connection
 ^^^^^^^^^^^^^^^^^
@@ -109,7 +116,7 @@ driver does not accept the DNS seedlist connection format (SRV) when you
 specify this option.
 
 When you specify ``directConnection`` and connect to a secondary member of the
-replica set, your write operations fail because it is not the primary member.
-To perform read operations, you must enable secondary reads. See the
-:manual:`read preference options </reference/connection-string/#read-preference-options>`
+replica set, your write operations fail because the client isn't
+connected to the primary member. To perform read operations, you must
+enable secondary reads. See the :manual:`read preference options </reference/connection-string/#read-preference-options>`
 for more information.

source/fundamentals/connection/connection-options.txt

@@ -55,7 +55,7 @@ parameters of the connection URI to specify the behavior of the client.
    * - **connectTimeoutMS**
      - non-negative integer
      - ``10000``
-     - Specifies the amount of time to wait to establish a single TCP
+     - Specifies the amount of time, in milliseconds, to wait to establish a single TCP
        socket connection to the server before raising an error. Specifying
        ``0`` disables the connection timeout.
 
@@ -68,7 +68,7 @@ parameters of the connection URI to specify the behavior of the client.
    * - **heartbeatFrequencyMS**
      - integer greater than or equal to 500
      - ``null``
-     - Specifies the interval between regular server monitoring checks.
+     - Specifies the interval, in milliseconds, between regular server monitoring checks.
 
    * - **journal**
      - boolean
@@ -84,14 +84,14 @@ parameters of the connection URI to specify the behavior of the client.
    * - **localThresholdMS**
      - non-negative integer
      - ``15``
-     - Specifies the size of the latency window on round trip time for
+     - Specifies the size of the latency window, in milliseconds, on round trip time for
        selecting between suitable servers. Specifying ``0`` means no wait,
        meaning the fastest available server.
 
    * - **maxIdleTimeMS**
      - non-negative integer
      - ``0``
-     - Specifies the amount of time a connection can be idle before it's closed.
+     - Specifies the amount of time, in milliseconds, a connection can be idle before it's closed.
        Specifying ``0`` means no minimum.
 
    * - **maxPoolSize**
@@ -196,7 +196,7 @@ parameters of the connection URI to specify the behavior of the client.
    * - **socketTimeoutMS**
      - non-negative integer
      - ``0``
-     - Specifies the amount of time spent attempting to send or receive on a
+     - Specifies the amount of time, in milliseconds, spent attempting to send or receive on a
        socket before timing out. Specifying ``0`` means no timeout.
 
    * - **srvMaxHosts**
@@ -216,6 +216,11 @@ parameters of the connection URI to specify the behavior of the client.
      - ``false``
      - The ``ssl`` is an alias for the ``tls`` option.
 
+   * - **timeoutMS**
+     - non-negative integer
+     - unset (feature is not enabled by default)
+     - Specifies the timeout, in milliseconds, for the full execution of an operation.
+
    * - **tls**
      - boolean
      - ``false``
@@ -280,7 +285,7 @@ parameters of the connection URI to specify the behavior of the client.
    * - **waitQueueTimeoutMS**
      - non-negative integer
      - ``0``
-     - Specifies the amount of time spent attempting to check out a connection
+     - Specifies the amount of time, in milliseconds, spent attempting to check out a connection
        from a server's connection pool before timing out.
 
    * - **wTimeoutMS**

source/includes/localhost-connection.rst

@@ -18,8 +18,14 @@ purposes instead of using an Atlas cluster, you need to complete the following:
 After you successfully start your MongoDB server, specify your connection
 string in your driver connection code.
 
-If your MongoDB Server is running locally, you can use the connection string
-``"mongodb://localhost:<port>"`` where ``<port>`` is the port number you
+If your MongoDB Server is running locally, you can use the following
+connection string:
+
+.. code-block:: none
+
+   mongodb://localhost:<port>
+   
+In this connection string, ``<port>`` is the port number on which you
 configured your server to listen for incoming connections.
 
 If you need to specify a different hostname or IP address, see our Server

source/quick-start.txt

@@ -79,6 +79,8 @@ This command performs the following actions:
 At this point, you are ready to use the {+driver-short+} with your
 application.
 
+.. _node-quickstart-connect-cluster:
+
 Create a MongoDB Cluster
 ~~~~~~~~~~~~~~~~~~~~~~~~