DOCSP-21096 BACKPORT (#770)

Author: Dave

source/core/retryable-writes.txt

@@ -12,13 +12,11 @@ Retryable Writes
    :depth: 1
    :class: singlecol
 
-.. versionadded:: 3.6
-
 Retryable writes allow MongoDB drivers to automatically retry certain
 write operations a single time if they encounter network errors, or if
-they cannot find a healthy :term:`primary` in the
-:ref:`replica sets <replication>` or :ref:`sharded cluster
-<sharding-introduction>`. [#duplicate-key-update]_
+they cannot find a healthy :term:`primary` in the :ref:`replica set
+<replication>` or :ref:`sharded cluster <sharding-introduction>`.
+[#duplicate-key-update]_
 
 Prerequisites
 -------------
@@ -74,12 +72,23 @@ MongoDB Drivers
   .. include:: /includes/extracts/4.2-changes-drivers-retryWrites-default.rst
 
 :binary:`~bin.mongosh`
-  To enable retryable writes in :binary:`~bin.mongosh`, use
-  the :option:`--retryWrites <mongosh --retryWrites>` command line option:
+  Retryable writes are enabled by default in :binary:`~bin.mongosh`. To
+  disable retryable writes, use the :option:`--retryWrites=false
+  <mongosh --retryWrites>` command line option:
+
+  .. code-block:: bash
+
+     mongosh --retryWrites=false
+
+:binary:`~bin.mongo`
+  Retryable writes are disabled by default in the legacy
+  :binary:`~bin.mongo` shell. To enable retryable writes, use the
+  :option:`--retryWrites=true <mongosh --retryWrites>` command line
+  option:
 
   .. code-block:: bash
 
-     mongosh --retryWrites
+     mongo --retryWrites=true
 
 .. _retryable-write-ops:
 

source/includes/extracts-4.2-changes.yaml

@@ -725,22 +725,21 @@ content: |
 ---
 ref: 4.2-changes-drivers-retryWrites-default
 content: |
-   MongoDB 3.6 introduced support for :ref:`retryable-writes`, but most
-   official MongoDB 3.6 and 4.0-compatible drivers disabled this feature
-   by default. For such drivers, retryable writes could be enabled per
-   connection by including the :urioption:`retryWrites=true
-   <retryWrites>` option in the :ref:`connection string <mongodb-uri>`
-   for that connection. Refer to the `MongoDB Driver Documentation
-   <https://docs.mongodb.com/drivers/?tck=docs_server>`_ to determine
-   the correct default state of :urioption:`retryWrites` for your
-   specific driver and version.
-
-   The official MongoDB 4.2+ compatible drivers enable :ref:`retryable-writes` by
-   default. Applications upgrading to the 4.2+ compatible drivers that require
-   retryable writes may omit the :urioption:`retryWrites=true <retryWrites>`
-   option. Applications upgrading to the 4.2+ compatible drivers that require
-   *disabling* retryable writes must include 
-   :urioption:`retryWrites=false <retryWrites>` in the connection string. 
+
+   Drivers compatible with MongoDB 4.2 and higher enable
+   :ref:`retryable-writes` by default. Earlier drivers require the
+   :urioption:`retryWrites=true <retryWrites>` option. The
+   :urioption:`retryWrites=true <retryWrites>` option can be omitted in
+   applications that use drivers compatible with MongoDB 4.2 and
+   higher.
+
+   |
+
+   To disable retryable writes, applications that use drivers
+   compatible with MongoDB 4.2 and higher must include 
+   :urioption:`retryWrites=false <retryWrites>` in the connection
+   string.
+
 ---
 ref: 4.2-changes-libldap
 content: |