correction to address TOOLS-1035 changes

Author: schmalliso

source/includes/options-mongorestore.yaml

@@ -447,11 +447,7 @@ description: |
   .. versionadded:: 3.2
 
   Restores from compressed files or data stream created by
-<<<<<<< HEAD
-  :binary:`mongodump --archive <bin.mongodump>`
-=======
   :binary:`~bin.mongodump --archive <mongodump>`
->>>>>>> DOCSP-980: clarify oplogReplay behaviour for 3.4
 
   To restore from a dump directory that contains compressed files, run
   :binary:`~bin.mongorestore` with the new ``--gzip`` option.

source/reference/program/mongorestore.txt

@@ -67,17 +67,11 @@ Version Compatibility
 
 .. include:: /includes/warning-mongodump-compatibility-2.2.rst
 
-.. COMMENT upon completion of TOOLS-1035, either delete the whole section or delete everything after the semicolon.
-
 Exclude ``system.profile`` Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :binary:`~bin.mongorestore` does not restore the :data:`system.profile
-<<database>.system.profile>` collection data; however, if the backup
-data includes :data:`system.profile <<database>.system.profile>`
-collection data and the collection does not exist in the target
-database, :binary:`~bin.mongorestore` creates the collection but does not
-insert any data into the collection.
+<<database>.system.profile>` collection data.
 
 .. _mongorestore-required-access:
 
@@ -213,13 +207,14 @@ running on the localhost interface on port ``27017``.
 
 .. versionadded:: 3.4
 
-You may alternatively use :option:`--nsInclude <mongorestore --nsInclude>` to specify the
-canonical name of the collection that you wish to restore rather than
-:option:`--collection <mongorestore --collection>`. :option:`--nsInclude <mongorestore --nsInclude>` enables you to specify
-the :term:`namespace` of one or more collections that you
-wish to include in the restore operation. The following example
-restores the ``people`` collection from the ``accounts`` database
-in the ``dump/`` sub-directory of the current directory:
+You may alternatively use :option:`--nsInclude <mongorestore
+--nsInclude>` to specify the canonical name of the collection that you
+wish to restore rather than :option:`--collection <mongorestore
+--collection>`. :option:`--nsInclude <mongorestore --nsInclude>`
+enables you to specify the :term:`namespace` of one or more collections
+that you wish to include in the restore operation. The following
+example restores the ``people`` collection from the ``accounts``
+database in the ``dump/`` sub-directory of the current directory:
 
 .. code-block:: sh
 
@@ -232,18 +227,20 @@ Restore Collections Using Wild Cards
 
 .. versionadded:: 3.4
 
-:option:`--nsInclude <mongorestore --nsInclude>` and :option:`--nsExclude <mongorestore --nsExclude>` support specifying
-the :term:`namespaces <namespace>` you wish to include or exclude from a restore operation
-using asterisks as *wild cards*.
+:option:`--nsInclude <mongorestore --nsInclude>` and
+:option:`--nsExclude <mongorestore --nsExclude>` support specifying the
+:term:`namespaces <namespace>` you wish to include or exclude from a
+restore operation using asterisks as *wild cards*.
 
 The following example restores the documents in the ``dump/``
 sub-directory of the current directory that match the specified
-namespace pattern. The :option:`--nsInclude <mongorestore --nsInclude>` statement specifies to
-only restore documents in the ``transactions`` database while
-:option:`--nsExclude <mongorestore --nsExclude>` instructs :binary:`~bin.mongorestore` to exclude
-collections whose names end with ``_dev``. :binary:`~bin.mongorestore`
-restores data to the :binary:`~bin.mongod` instance running on the
-localhost interface on port ``27017``.
+namespace pattern. The :option:`--nsInclude <mongorestore --nsInclude>`
+statement specifies to only restore documents in the ``transactions``
+database while :option:`--nsExclude <mongorestore --nsExclude>`
+instructs :binary:`~bin.mongorestore` to exclude collections whose
+names end with ``_dev``. :binary:`~bin.mongorestore` restores data to
+the :binary:`~bin.mongod` instance running on the localhost interface
+on port ``27017``.
 
 .. code-block:: sh
 
@@ -256,15 +253,17 @@ Change Collections' Namespaces during Restore
 
 .. versionadded:: 3.4
 
-MongoDB 3.4 added the :option:`--nsFrom <mongorestore --nsFrom>` and :option:`--nsTo <mongorestore --nsTo>` options,
-which enable you to change the namespace of a collection that you are
-restoring. :option:`--nsFrom <mongorestore --nsFrom>` and :option:`--nsTo <mongorestore --nsTo>` support using
-asterisks as wild cards *and* support using dollar signs to delimit
-"wild card" variables to use in the replacement.
+MongoDB 3.4 added the :option:`--nsFrom <mongorestore --nsFrom>` and
+:option:`--nsTo <mongorestore --nsTo>` options, which enable you to
+change the namespace of a collection that you are restoring.
+:option:`--nsFrom <mongorestore --nsFrom>` and :option:`--nsTo
+<mongorestore --nsTo>` support using asterisks as wild cards *and*
+support using dollar signs to delimit "wild card" variables to use in
+the replacement.
 
 Consider a database ``data`` that you have exported to a ``dump/``
-directory using :binary:`~bin.mongodump`. The ``data`` database contains the following
-collections:
+directory using :binary:`~bin.mongodump`. The ``data`` database
+contains the following collections:
 
 - ``sales_customer1``
 - ``sales_customer2``
@@ -273,11 +272,13 @@ collections:
 - ``users_customer2``
 - ``users_customer3``
 
-Using :option:`--nsFrom <mongorestore --nsFrom>` and :option:`--nsTo <mongorestore --nsTo>`, you can restore the data
-into different namespaces. The following operation
+Using :option:`--nsFrom <mongorestore --nsFrom>` and :option:`--nsTo
+<mongorestore --nsTo>`, you can restore the data into different
+namespaces. The following operation
 
-- restores the ``sales_<customerName>`` collections in the ``data`` database to
-  ``sales`` collections in the ``<customerName>`` database, and
+- restores the ``sales_<customerName>`` collections in the ``data``
+  database to ``sales`` collections in the ``<customerName>`` database,
+  and
 
 - restores the ``users_<customerName>`` collections to ``users``
   collections in the ``<customerName>`` database.
@@ -289,12 +290,12 @@ into different namespaces. The following operation
 Restore with Access Control
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In the following example, :binary:`~bin.mongorestore` restores a database
-dump located at ``/opt/backup/mongodump-2011-10-24``, to a database
-running on port ``37017`` on the host
-``mongodb1.example.net``. The :binary:`~bin.mongorestore` command authenticates to
-the MongoDB instance using the username ``user`` and the
-password ``pass``, as follows:
+In the following example, :binary:`~bin.mongorestore` restores a
+database dump located at ``/opt/backup/mongodump-2011-10-24``, to a
+database running on port ``37017`` on the host
+``mongodb1.example.net``. The :binary:`~bin.mongorestore` command
+authenticates to the MongoDB instance using the username ``user`` and
+the password ``pass``, as follows:
 
 .. code-block:: sh
 
@@ -333,8 +334,8 @@ Restore a Database from Standard Input
 
 .. versionadded:: 3.2
 
-To restore from the standard input, run :binary:`~bin.mongorestore` with the
-``archive`` option but *omit* the filename. For example:
+To restore from the standard input, run :binary:`~bin.mongorestore`
+with the ``archive`` option but *omit* the filename. For example:
 
 .. code-block:: sh
 
@@ -350,9 +351,9 @@ Restore from Compressed Data
    compressed files or data stream created by :binary:`~bin.mongodump`.
 
 To restore from a dump directory that contains compressed files, run
-:binary:`~bin.mongorestore` with the new ``--gzip`` option. For example, the
-following operation restores the ``test`` database from the compressed
-files located in the default ``dump`` directory:
+:binary:`~bin.mongorestore` with the new ``--gzip`` option. For
+example, the following operation restores the ``test`` database from
+the compressed files located in the default ``dump`` directory:
 
 .. code-block:: sh