DOCSP-15546 fix v5.0-specific build errors

andf-mongodb · andf-mongodb · commit 6c860eaa7d43 · 2021-04-12T16:31:14.000-04:00
diff --git a/snooty.toml b/snooty.toml
@@ -151,6 +151,7 @@ toc_landing_pages = [
    "/release-notes/4.2",
    "/release-notes/4.4-downgrade",
    "/release-notes/4.4",
+   "/release-notes/5.0",
    "/replication",
    "/security",
    "/sharding",
@@ -187,12 +188,13 @@ version = "{+version+}"
 
 
 [constants]
-package-branch = "5.0" 
+package-branch = "5.0" # testing for dev rc releases
 windows-dir-version = "5.0" # wizard
 package-name-org = "mongodb-org"
 package-name-enterprise = "mongodb-enterprise"
 version = "5.0"
 release = "5.0"
+version-dev = "4.9"
 pgp-version = "{+version+}"
 rsa-key = "4B7C549A058F8B6B"
 pgp-fingerprint = "E162F504A20CDF15827F718D4B7C549A058F8B6B"
diff --git a/source/includes/changelogs/releases/4.4.5.rst b/source/includes/changelogs/releases/4.4.5.rst
@@ -9,8 +9,8 @@ Sharding
 - :issue:`SERVER-53462` Improve range-deleter logging 
 - :issue:`SERVER-53827` range_deleter_server_status.js should use assert.soon to check the number of range deletion tasks
 - :issue:`SERVER-54014` Define a reasonable maxTimeMsOverride for the checkOID requests
-- :issue:`SERVER-54585` Unable to run `findAndModify` against the Config server collections
-- :issue:`SERVER-54701` shardCollection might succesfully write to the config server but end up with missing indexes on the primary Shard
+- :issue:`SERVER-54585` Unable to run ``findAndModify`` against the Config server collections
+- :issue:`SERVER-54701` shardCollection might successfully write to the config server but end up with missing indexes on the primary Shard
 
 Replication
 ~~~~~~~~~~~
diff --git a/source/includes/fact-timezone-description-no-option.rst b/source/includes/fact-timezone-description-no-option.rst
@@ -9,21 +9,21 @@ If no ``timezone`` is provided, the result is displayed in ``UTC``.
    :header-rows: 1
    :widths: 30 70
 
-   * - ``Format``
-     - ``Examples``
+   * - Format
+     - Examples
 
-   * - `Olson Timezone Identifier`
+   * - Olson Timezone Identifier
 
-     - ::
+     - .. code-block:: bash
 
-         "America/New_York"
-         "Europe/London"
-         "GMT"
+          "America/New_York"
+          "Europe/London"
+          "GMT"
 
-   * - `UTC Offset`
+   * - UTC Offset
 
-     - ::
+     - .. code-block:: bash
 
-         +/-[hh]:[mm], e.g. "+04:45"
-         +/-[hh][mm], e.g. "-0530"
-         +/-[hh], e.g. "+03"
+          +/-[hh]:[mm], e.g. "+04:45"
+          +/-[hh][mm], e.g. "-0530"
+          +/-[hh], e.g. "+03"
diff --git a/source/reference/command/serverStatus.txt b/source/reference/command/serverStatus.txt
@@ -218,9 +218,9 @@ asserts
 
    A document that reports on the number of assertions raised since the
    MongoDB process started. While assert errors are typically uncommon,
-   if there are non-zero values for the :data:`asserts`, you should
-   examine the log file for more information. In many cases, these
-   errors are trivial, but are worth investigating.
+   if there are non-zero values for the :serverstatus:`asserts`, you
+   should examine the log file for more information. In many cases,
+   these errors are trivial, but are worth investigating.
 
 .. serverstatus:: asserts.regular
 
diff --git a/source/reference/method/db.collection.ensureIndex.txt b/source/reference/method/db.collection.ensureIndex.txt
@@ -6,30 +6,10 @@ db.collection.ensureIndex()
 
 .. method:: db.collection.ensureIndex(keys, options)
 
-.. admonition:: Removed in 5.0
-   :class: note
+.. note:: Removed in 5.0
 
-<<<<<<< HEAD
    :method:`db.collection.ensureIndex()` has been replaced by 
    :method:`db.collection.createIndex()`.
-=======
-   .. include:: /includes/fact-mongo-shell-method.rst
-
-
-   .. deprecated:: 3.0
-
-      :method:`db.collection.ensureIndex()` has been replaced by 
-      :method:`db.collection.createIndex()`.
-
-   Creates an index on the specified field if the index does not
-   already exist.
-
-Additional Information
-----------------------
-
-- Use :method:`db.collection.createIndex()` rather than
-  :method:`db.collection.ensureIndex()` to create new indexes.
->>>>>>> 22fb3e9e4... DOCSP-14923 fix deprecated directive for NextGen
 
 .. seealso:: 
 
diff --git a/source/reference/operator/aggregation/dateDiff.txt b/source/reference/operator/aggregation/dateDiff.txt
@@ -169,9 +169,9 @@ Create a collection of customer orders:
 
 The following example:
 
- - Returns the average number of days for a delivery.
- - Uses ``dateDiff`` to calculate the difference between the
-   ``purchased`` date and the ``delivered`` date.
+- Returns the average number of days for a delivery.
+- Uses ``dateDiff`` to calculate the difference between the
+  ``purchased`` date and the ``delivered`` date.
 
 .. code-block:: javascript
    :emphasize-lines: 11-16
@@ -304,33 +304,33 @@ precision:
 
 The results are summarized in this table:
 
-   .. list-table::
-      :header-rows: 1
-      :widths: 23 23 18 18 18
-
-      * - Start
-        - End
-        - Years
-        - Months
-        - Days 
-
-      * - 2010-01-01
-        - 2011-01-01
-        - 1
-        - 12
-        - 365
-
-      * - 2010-01-01
-        - 2011-07-01
-        - 1
-        - 18
-        - 546
-
-      * - 2010-03-01
-        - 2010-04-30
-        - 0
-        - 1
-        - 60
+.. list-table::
+   :header-rows: 1
+   :widths: 23 23 18 18 18
+
+   * - Start
+     - End
+     - Years
+     - Months
+     - Days 
+
+   * - 2010-01-01
+     - 2011-01-01
+     - 1
+     - 12
+     - 365
+
+   * - 2010-01-01
+     - 2011-07-01
+     - 1
+     - 18
+     - 546
+
+   * - 2010-03-01
+     - 2010-04-30
+     - 0
+     - 1
+     - 60
  
 The count only increments when a new ``unit`` starts, so 18 months are
 reported as 1 year in the second row and 60 days are reported as one
@@ -411,29 +411,29 @@ weeks in each month with the following code:
 
 The results are summarized in this table:
 
-   .. list-table::
-      :header-rows: 1
-      :widths: 40 20 20 20 
-
-      * - Month
-        - Sunday
-        - Monday
-        - Friday
-
-      * - January
-        - 5
-        - 4
-        - 4
-
-      * - February
-        - 4
-        - 3
-        - 4
-
-      * - March
-        - 4
-        - 4
-        - 4
+.. list-table::
+   :header-rows: 1
+   :widths: 40 20 20 20 
+
+   * - Month
+     - Sunday
+     - Monday
+     - Friday
+
+   * - January
+     - 5
+     - 4
+     - 4
+
+   * - February
+     - 4
+     - 3
+     - 4
+
+   * - March
+     - 4
+     - 4
+     - 4
 
 From the results:
 
diff --git a/source/reference/operator/aggregation/dateSubtract.txt b/source/reference/operator/aggregation/dateSubtract.txt
@@ -220,10 +220,9 @@ aggregation pipeline to decrement the ``logoutTime``.
 Two similar comparisons are made in the :pipeline:`$match` stage. First
 the :expression:`$year` and :expression:`$month` operators extract the
 year and month, respectively, from the ``logoutTime`` Date object. Then
-the month and year are checked to see if they :expression:`$match` the
-selection targets. Since "January" is encoded as "1", :query:`$expr`
-is true when the year and month are equal (:expression:`$eq`) to "2021"
-and "1".
+the month and year are checked to see if they match the selection
+targets. Since "January" is encoded as "1", :query:`$expr` is true when
+the year and month are equal (:expression:`$eq`) to "2021" and "1".
 
 The :pipeline:`$project` stage uses ``$dateSubtract`` to subtract 3
 hours from the ``logoutTime`` of each selected dcoument. 
diff --git a/source/reference/read-concern.txt b/source/reference/read-concern.txt
@@ -588,7 +588,7 @@ with causally consistent sessions.
 
    It is not possible to specify :ref:`atClusterTime <atClusterTime>` in
    conjunction with ``afterClusterTime``. To use :ref:`atClusterTime
-   <atClusterTime>` with read concern `"snapshot"` you have to disable
+   <atClusterTime>` with read concern ``"snapshot"`` you have to disable
    :ref:`causally consistent sessions <sessions>`.
 
 To satisfy a read request with an ``afterClusterTime`` value of ``T``,
diff --git a/source/reference/replica-configuration.txt b/source/reference/replica-configuration.txt
@@ -210,7 +210,7 @@ Replica Set Configuration Fields
       
       Each replica set member must have a unique
       :rsconf:`_id <members[n]._id>`. Avoid re-using ``_id`` values
-      *even if* no :rsconf:`members[n]` entry is using that ``_id`` in
+      *even if* no ``members[n]`` entry is using that ``_id`` in
       the current configuration.
       
       Once set, you cannot change the 
diff --git a/source/release-notes/5.0-compatibility.txt b/source/release-notes/5.0-compatibility.txt
@@ -91,8 +91,8 @@ Projection Compatibility Changes
 Map Reduce Changes
 ------------------
 
-Read Concern `Snapshot` on Capped Collections
----------------------------------------------
+Read Concern ``snapshot`` on Capped Collections
+-----------------------------------------------
 
 .. include:: /includes/extracts/transactions-capped-collection-read-change.rst
 
