DOCSP-25351 merge (#1924)

kennethdyer · web-flow · commit 0058a58de443 · 2022-09-30T09:52:44.000-04:00
diff --git a/source/reference/operator/aggregation/convert.txt b/source/reference/operator/aggregation/convert.txt
@@ -20,8 +20,6 @@ Definition
 
 .. expression:: $convert
 
-   .. versionadded:: 4.0
-
    Converts a value to a specified type.
 
    :expression:`$convert` has the following syntax:
diff --git a/source/reference/operator/aggregation/currentOp.txt b/source/reference/operator/aggregation/currentOp.txt
@@ -144,8 +144,6 @@ Syntax
 
        Defaults to ``true``.
 
-       .. versionadded:: 4.0
-
    * - :ref:`localOps <currentOp-stage-localOps>`
 
      - .. _currentOp-stage-localOps:
@@ -163,8 +161,6 @@ Syntax
 
        Defaults to ``false``.
 
-       .. versionadded:: 4.0
-
    * - :ref:`backtrace <currentOp-stage-backtrace>`
 
      - .. _currentOp-stage-backtrace:
@@ -201,7 +197,6 @@ Pipeline
 
 - :pipeline:`$currentOp` must be the first stage in the pipeline.
 
-
 - Pipelines that start with :pipeline:`$currentOp` can only be run on
   the ``admin`` database.
 
@@ -985,17 +980,13 @@ relevant for the operation:
       Only present if the operation is part of a multi-document
       transaction.
 
-      .. versionadded:: 4.0
-
       .. data:: $currentOp.transaction.parameters.txnNumber
 
          The transaction number.
 
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0
-
       .. data:: $currentOp.transaction.parameters.autocommit
 
          A boolean flag that indicates if autocommit is on for the
@@ -1004,8 +995,6 @@ relevant for the operation:
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.parameters.readConcern
 
          The :ref:`read concern <transactions-read-concern>` for the
@@ -1018,8 +1007,6 @@ relevant for the operation:
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.globalReadTimestamp
 
          The timestamp of the snapshot read by the operations in the
@@ -1053,17 +1040,13 @@ relevant for the operation:
          Instead, :data:`$currentOp.transaction.globalReadTimestamp` is
          returned.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.startWallClockTime
 
          The date and time (with time zone) of the transaction start.
 
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.timeOpenMicros
 
          The duration, in microseconds, for the transaction.
@@ -1077,8 +1060,6 @@ relevant for the operation:
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.timeActiveMicros
 
          The total amount of time that the transaction has been active;
@@ -1094,8 +1075,6 @@ relevant for the operation:
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       .. data:: $currentOp.transaction.timeInactiveMicros
 
          The total amount of time that the transaction has been
@@ -1181,8 +1160,6 @@ relevant for the operation:
          Only present if the operation is part of a multi-document
          transaction.
 
-         .. versionadded:: 4.0.2
-
       
 .. data:: $currentOp.op
 
diff --git a/source/reference/operator/aggregation/dateFromParts.txt b/source/reference/operator/aggregation/dateFromParts.txt
@@ -190,9 +190,9 @@ Definition
           :ref:`aggregation-expressions`.
 
 .. |outofrange| replace::
-   Starting in MongoDB 4.0, if the number specified is outside this
-   range, :expression:`$dateFromParts` incorporates the difference in
-   the date calculation. See :ref:`dateFromParts-values` for examples.
+   If the number specified is outside this range, :expression:`$dateFromParts` 
+   incorporates the difference in the date calculation. 
+   See :ref:`dateFromParts-values` for examples.
 
 .. |outofrange-4.4| replace::
    If the number specified is outside this range,
@@ -213,10 +213,10 @@ Starting in MongoDB 4.4, the supported value range for ``year`` and
 bound for these values was ``0`` and the supported value range was
 ``0-9999``.
 
-Starting in MongoDB 4.0, if the value specified for fields other than
-``year``, ``isoWeekYear``, and ``timezone`` is outside the valid range,
-:expression:`$dateFromParts` carries or subtracts the difference from
-other date parts to calculate the date.
+If the value specified for fields other than ``year``, ``isoWeekYear``, 
+and ``timezone`` is outside the valid range, :expression:`$dateFromParts` 
+carries or subtracts the difference from other date parts to calculate 
+the date.
 
 Value is Greater than the Range
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/source/reference/operator/aggregation/dateFromString.txt b/source/reference/operator/aggregation/dateFromString.txt
@@ -63,8 +63,6 @@ Definition
           If unspecified, :expression:`$dateFromString` uses
           ``"%Y-%m-%dT%H:%M:%S.%LZ"`` as the default format.
 
-          .. versionadded:: 4.0
-
       * - ``timezone``
 
         - Optional. The time zone to use to format the date.
diff --git a/source/reference/operator/aggregation/dateToString.txt b/source/reference/operator/aggregation/dateToString.txt
@@ -58,13 +58,6 @@ Definition
           If unspecified, :expression:`$dateToString` uses
           ``"%Y-%m-%dT%H:%M:%S.%LZ"`` as the default format.
 
-          .. versionchanged:: 4.0
-
-             The ``format`` field is optional if
-             ``featureCompatibilityVersion`` (fCV) is set to ``"4.0"`` or
-             greater. For more information on fCV, see
-             :dbcommand:`setFeatureCompatibilityVersion`.
-
       * - ``timezone``
 
         - .. include:: /includes/fact-timezone-description.rst
@@ -80,12 +73,6 @@ Definition
           If unspecified, :expression:`$dateToString` returns null if the
           ``date`` is null or missing.
 
-          .. versionadded:: 4.0
-
-             Requires ``featureCompatibilityVersion`` (fCV) set to
-             ``"4.0"`` or greater. For more information on fCV, see
-             :dbcommand:`setFeatureCompatibilityVersion`.
-
 .. seealso::
 
    - :expression:`$toString`
diff --git a/source/reference/operator/aggregation/geoNear.txt b/source/reference/operator/aggregation/geoNear.txt
@@ -92,8 +92,6 @@ Definition
           ``2d`` index and/or only one ``2dsphere`` index, MongoDB looks first
           for a ``2d`` index to use. If a ``2d`` index does not exists, then
           MongoDB looks for a ``2dsphere`` index to use.
-        
-          .. versionadded:: 4.0
             
       * - ``maxDistance``
 
@@ -280,8 +278,6 @@ equal to ``Parks``.
 Specify Which Geospatial Index to Use
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 4.0
-
 Consider a ``places`` collection that has a :doc:`2dsphere
 </core/2dsphere>` index on the ``location`` field and a
 :doc:`2d </core/2d>` index on the ``legacy`` field.
diff --git a/source/reference/operator/aggregation/lookup.txt b/source/reference/operator/aggregation/lookup.txt
@@ -121,9 +121,7 @@ See these examples:
 Join Conditions and Subqueries on a Joined Collection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 3.6
-
-MongoDB 3.6 adds support for:
+MongoDB supports:
 
 - Executing a pipeline on a joined collection.
 
@@ -681,17 +679,15 @@ The operation returns these documents:
 Perform Multiple Joins and a Correlated Subquery with ``$lookup``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionchanged:: 3.6
-
-MongoDB 3.6 adds support for executing a pipeline on a joined collection
-and allows multiple join conditions.
+Pipelines can execute on a joined collection and include multiple join
+conditions.
 
 A join condition can reference a field in the local collection on which
 the :method:`~db.collection.aggregate()` method was run and reference a
 field in the joined collection. This allows a correlated subquery
 between the two collections.
 
-MongoDB 5.0 also supports :ref:`concise correlated subqueries
+MongoDB 5.0 supports :ref:`concise correlated subqueries
 <lookup-concise-correlated-subquery>`.
 
 Create a collection ``orders`` with these documents:
diff --git a/source/reference/operator/aggregation/ltrim.txt b/source/reference/operator/aggregation/ltrim.txt
@@ -15,8 +15,6 @@ Definition
 
 .. expression:: $ltrim
 
-   .. versionadded:: 4.0
-
    Removes whitespace characters, including null, or the specified
    characters from the beginning of a string.
 
diff --git a/source/reference/operator/aggregation/merge.txt b/source/reference/operator/aggregation/merge.txt
@@ -28,8 +28,6 @@ Definition
 
 .. pipeline:: $merge
 
-   .. versionadded:: 4.2
-
    Writes the results of the :doc:`aggregation pipeline
    </core/aggregation-pipeline>` to a specified collection. The
    :pipeline:`$merge` operator must be the **last** stage in the
@@ -690,9 +688,6 @@ results of the aggregation pipeline to a collection:
    * - :pipeline:`$merge`
      - :pipeline:`$out`
 
-   * - - Available starting in MongoDB 4.2
-     - - Available starting in MongoDB 2.6
-
    * - - Can output to a collection in the same or different database.
      - - Can output to a collection in the same or, starting in
          MongoDB 4.4, different database.
diff --git a/source/reference/operator/aggregation/out.txt b/source/reference/operator/aggregation/out.txt
@@ -96,8 +96,6 @@ following summarizes the capabilities of the two stages:
 
    * - :pipeline:`$out`
      - :pipeline:`$merge`
-   * - - Available starting in MongoDB 2.6
-     - - Available starting in MongoDB 4.2
    * - - Can output to a collection in the same or, starting in
          MongoDB 4.4, different database.
      - - Can output to a collection in the same or different database.
diff --git a/source/reference/operator/aggregation/planCacheStats.txt b/source/reference/operator/aggregation/planCacheStats.txt
@@ -131,7 +131,7 @@ document similar to the following:
          ...
       ],
       "indexFilterSet" : <boolean>,
-      "estimatedSizeBytes" : <num>, // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : <num>, // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : <string>,   // Available starting in MongoDB 4.4
       "shard" : <string>   // Available starting in MongoDB 4.4 if run on sharded cluster
    }
@@ -237,8 +237,9 @@ including:
      - A number that describes the estimated size in bytes of a plan
        cache entry.
 
-       .. versionadded:: 5.0 (*Also available starting in 4.4.3, 4.2.12,
-          4.0.23, and 3.6.23*)
+       .. versionadded:: 5.0
+       
+       Starting in MongoDB 5.0, 4.4.3, and 4.2.12, this field is available.
 
    * - :ref:`host <plancachestats-host>`
 
@@ -352,7 +353,7 @@ The operation returns all entries in the cache:
          1.5002
       ],
       "indexFilterSet" : false,
-      "estimatedSizeBytes" : NumberLong(3160),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : NumberLong(3160),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : "mongodb1.example.net:27018",       // Available starting in MongoDB 4.4
       "shard" : "shardA"                           // Available starting in MongoDB 4.4 if run on sharded cluster
    }
@@ -383,7 +384,7 @@ The operation returns all entries in the cache:
          1.0002
       ],
       "indexFilterSet" : false,
-      "estimatedSizeBytes" : NumberLong(2539),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : NumberLong(2539),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : "mongodb1.example.net:27018",       // Available starting in MongoDB 4.4
       "shard" : "shardA"                           // Available starting in MongoDB 4.4 if run on sharded cluster
    }
@@ -414,7 +415,7 @@ The operation returns all entries in the cache:
          1.7502
       ],
       "indexFilterSet" : false,
-      "estimatedSizeBytes" : NumberLong(3183),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : NumberLong(3183),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : "mongodb1.example.net:27018",       // Available starting in MongoDB 4.4
       "shard" : "shardA"                           // Available starting in MongoDB 4.4 if run on sharded cluster
    }
@@ -449,7 +450,7 @@ The operation returns all entries in the cache:
          1.6668666666666665
       ],
       "indexFilterSet" : false,
-      "estimatedSizeBytes" : NumberLong(4653),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : NumberLong(4653),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : "mongodb1.example.net:27018",       // Available starting in MongoDB 4.4
       "shard" : "shardA"                           // Available starting in MongoDB 4.4 if run on sharded cluster
    }
@@ -677,7 +678,7 @@ The operation returns the following:
          1.5002
       ],
       "indexFilterSet" : false,
-      "estimatedSizeBytes" : NumberLong(3160),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12, 4.0.23, 3.6.23
+      "estimatedSizeBytes" : NumberLong(3160),     // Available starting in MongoDB 5.0, 4.4.3, 4.2.12
       "host" : "mongodb1.example.net:27018",       // Available starting in MongoDB 4.4
       "shard" : "shardA"                           // Available starting in MongoDB 4.4 if run on sharded cluster
    }
diff --git a/source/reference/operator/aggregation/round.txt b/source/reference/operator/aggregation/round.txt
@@ -15,7 +15,7 @@ Definition
 
 .. expression:: $round
 
-   .. versionadded:: 4.2.
+   .. versionadded:: 4.2
 
    :expression:`$round` rounds a number to a whole integer *or* to a 
    specified decimal place.
diff --git a/source/reference/operator/aggregation/rtrim.txt b/source/reference/operator/aggregation/rtrim.txt
@@ -15,8 +15,6 @@ Definition
 
 .. expression:: $rtrim
 
-   .. versionadded:: 4.0
-
    Removes whitespace characters, including null, or the specified
    characters from the end of a string.
 
diff --git a/source/reference/operator/aggregation/sample.txt b/source/reference/operator/aggregation/sample.txt
@@ -49,19 +49,6 @@ If any of the previous conditions are false, :pipeline:`$sample`:
    Random sorts are subject to the :ref:`sort memory restrictions
    <sort-memory-limit>`.
 
-MMAPv1 May Return Duplicate Documents
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you are using the:
-
-- MMAPv1 storage engine, :pipeline:`$sample` may return the same
-  document more than once in the result set.
-
-- :ref:`WiredTiger <storage-wiredtiger>` or
-  :ref:`in-memory <storage-inmemory>` storage engine,
-  :pipeline:`$sample` does not return duplicate documents. WiredTiger
-  is the default storage engine as of MongoDB 3.2.
-
 Example
 --------
 
diff --git a/source/reference/operator/aggregation/toBool.txt b/source/reference/operator/aggregation/toBool.txt
@@ -21,8 +21,6 @@ Definition
 
 .. expression:: $toBool
 
-   .. versionadded:: 4.0
-
    Converts a value to a boolean.
 
    :expression:`$toBool` has the following syntax:
diff --git a/source/reference/operator/aggregation/toDate.txt b/source/reference/operator/aggregation/toDate.txt
@@ -19,8 +19,6 @@ Definition
 
 .. expression:: $toDate
 
-   .. versionadded:: 4.0
-
    Converts a value to a date. If the value cannot be converted
    to a date, :expression:`$toDate` errors. If the value is null or
    missing, :expression:`$toDate` returns null.
diff --git a/source/reference/operator/aggregation/toDecimal.txt b/source/reference/operator/aggregation/toDecimal.txt
@@ -20,8 +20,6 @@ Definition
 
 .. expression:: $toDecimal
 
-   .. versionadded:: 4.0
-
    Converts a value to a decimal. If the value cannot be converted
    to a decimal, :expression:`$toDecimal` errors. If the value is null or
    missing, :expression:`$toDecimal` returns null.
diff --git a/source/reference/operator/aggregation/toDouble.txt b/source/reference/operator/aggregation/toDouble.txt
diff --git a/source/reference/operator/aggregation/toInt.txt b/source/reference/operator/aggregation/toInt.txt
diff --git a/source/reference/operator/aggregation/toLong.txt b/source/reference/operator/aggregation/toLong.txt
diff --git a/source/reference/operator/aggregation/toObjectId.txt b/source/reference/operator/aggregation/toObjectId.txt
diff --git a/source/reference/operator/aggregation/toString.txt b/source/reference/operator/aggregation/toString.txt
diff --git a/source/reference/operator/aggregation/trim.txt b/source/reference/operator/aggregation/trim.txt
diff --git a/source/reference/operator/aggregation/unwind.txt b/source/reference/operator/aggregation/unwind.txt
