various wee fixes

Author: schmalliso

snooty.toml

@@ -183,12 +183,12 @@ copy = "©"
 ent-build = "MongoDB Enterprise"
 year = "2020"
 bi = "MongoDB Connector for BI"
-version = "4.2"
+version = "{+version+}"
 
 
 [constants]
-package-branch = "5.0" # For rc = testing.  For GA, will be 4.2.
-windows-dir-version = "5.0" # The wizard installs in 4.2 branch
+package-branch = "5.0" 
+windows-dir-version = "5.0" # wizard
 package-name-org = "mongodb-org"
 package-name-enterprise = "mongodb-enterprise"
 version = "5.0"

source/reference/command/serverStatus.txt

@@ -1853,11 +1853,7 @@ opWriteConcernCounters
       :header-rows: 1
       :widths: 20 80
 
-<<<<<<< HEAD
-      * -
-=======
       * - Specified ``w``
->>>>>>> 764cc625d... DOCSP-14865 update list table header rows for NextGen
         - Description
 
       * - ``"wmajority"``

source/reference/program/mongo.txt

@@ -387,7 +387,9 @@ Core Options
    Specifies a JavaScript file to run and then exit. Generally this should
    be the last option specified.
 
-   .. optional:: To specify a JavaScript file to execute *and* allow
+   .. optional:: 
+   
+      To specify a JavaScript file to execute *and* allow
       :program:`mongo` to prompt you for a password using
       :option:`--password`, pass the filename as the first parameter with
       :option:`--username` and :option:`--password` as the last options, as

source/tutorial/add-shards-to-shard-cluster.txt

@@ -55,7 +55,9 @@ instance.
    name of the replica set and specify a member of the set. In
    production deployments, all shards should be replica sets.
 
-   .. optional:: You can instead use the :dbcommand:`addShard` database
+   .. optional:: 
+   
+      You can instead use the :dbcommand:`addShard` database
       command, which lets you specify a name and maximum size for the
       shard. If you do not specify these, MongoDB automatically assigns
       a name and maximum size. To use the database command, see

source/tutorial/convert-secondary-into-arbiter.txt

@@ -65,7 +65,9 @@ Convert Secondary to Arbiter and Reuse the Port Number
 
       mv /data/db /data/db-old
 
-   .. optional:: You may remove the data instead.
+   .. optional:: 
+   
+      You may remove the data instead.
 
 #. Create a new, empty data directory to point to when restarting the
    :binary:`~bin.mongod` instance. You can reuse the previous name. For
@@ -176,4 +178,6 @@ Convert Secondary to Arbiter Running on a New Port Number
 
       mv /data/db /data/db-old
 
-   .. optional:: You may remove the data instead.
+   .. optional:: 
+   
+      You may remove the data instead.