Merge remote-tracking branch 'upstream/master' into v6.1

Author: jeff-allen-mongo

.github/pull_request_template.md

@@ -11,3 +11,7 @@
 - [ ] Is this free of grammatical errors?
 - [ ] Is this free of staging / rendering issues?
 - [ ] Are all the links working?
+
+## External Review Requirements
+
+[What's expected of an external reviewer?](https://wiki.corp.mongodb.com/display/DE/Reviewing+Guidelines+for+the+MongoDB+Server+Documentation)

snooty.toml

@@ -270,6 +270,8 @@ qe-abbr = ":abbr:`QE (Queryable Encryption)`"
 enc-fields-map = "encrypted fields map"
 enc-fields-map-title = "Encrypted Fields Map"
 shared-library = "Automatic Encryption Shared Library"
+shared-library-version = "6.0.0"
+shared-library-version-drop-down = "{+shared-library-version+} (current)"
 shared-library-package = "``crypt_shared``"
 efm = "``encryptedFieldsMap``"
 auto-encrypt-options = "autoEncryptionOpts"

source/administration/production-notes.txt

@@ -27,11 +27,11 @@ especially when running in production.
 
 .. include:: /includes/fact-mms-summary.rst
 
+.. _prod-notes-supported-platforms:
+
 Platform Support
 ----------------
 
-.. _prod-notes-supported-platforms:
-
 For running **in production**, refer to the
 :ref:`prod-notes-recommended-platforms` for operating system
 recommendations.

source/contents.txt

@@ -36,12 +36,13 @@ project, this Manual and additional editions of this text.
    /crud
    /aggregation
    /data-modeling
-   /core/transactions
    /indexes
    /security
-   /changeStreams
    /replication
    /sharding
+   /changeStreams
+   /core/timeseries-collections
+   /core/transactions
    /administration
    /storage
    /faq

source/core/bulk-write-operations.txt

@@ -24,6 +24,8 @@ perform bulk insert, update, and delete operations.
 MongoDB also supports bulk insert through the 
 :method:`db.collection.insertMany()` method.
 
+.. _bulk-write-operations-ordered-vs-unordered:
+
 Ordered vs Unordered Operations
 -------------------------------
 
@@ -68,83 +70,17 @@ bulkWrite() Methods
 Each write operation is passed to :method:`~db.collection.bulkWrite()` as a 
 document in an array.
 
-For example, the following performs multiple write operations:
-
-The ``characters`` collection contains the following documents:
-
-.. code-block:: javascript
-
-   { "_id" : 1, "char" : "Brisbane", "class" : "monk", "lvl" : 4 },
-   { "_id" : 2, "char" : "Eldon", "class" : "alchemist", "lvl" : 3 },
-   { "_id" : 3, "char" : "Meldane", "class" : "ranger", "lvl" : 3 }
-   
-The following :method:`~db.collection.bulkWrite()` performs multiple 
-operations on the collection:
-
-.. code-block:: javascript
-
-   try {
-      db.characters.bulkWrite(
-         [
-            { insertOne : 
-               { 
-                  "document" : 
-                  {
-                     "_id" : 4, "char" : "Dithras", "class" : "barbarian", "lvl" : 4
-                  }
-               } 
-            },
-            { insertOne : 
-               { 
-                  "document" : 
-                  {
-                     "_id" : 5, "char" : "Taeln", "class" : "fighter", "lvl" : 3
-                  }
-               } 
-            },
-            { updateOne : 
-               { 
-                  "filter" : { "char" : "Eldon" }, 
-                  "update" : { $set : { "status" : "Critical Injury" } }
-               }
-            },
-            { deleteOne : 
-               { "filter" : { "char" : "Brisbane" } }
-            },
-            { replaceOne :
-               {
-                  "filter" : { "char" : "Meldane" },
-                  "replacement" : { "char" : "Tanys", "class" : "oracle", "lvl" : 4 }
-               }
-            }
-         ]
-      );
-   }
-   catch (e) {
-      print(e);
-   }
-
-The operation returns the following:
-
-.. code-block:: javascript
-
-   {
-      "acknowledged" : true,
-      "deletedCount" : 1,
-      "insertedCount" : 2,
-      "matchedCount" : 2,
-      "upsertedCount" : 0,
-      "insertedIds" : {
-         "0" : 4,
-         "1" : 5
-      },
-      "upsertedIds" : {
-      
-      }
-   }
-   
-For more examples, see 
-:ref:`bulkWrite() Examples <bulkwrite-example-bulk-write-operation>`
+Example
+-------
+
+The example in this section uses the ``pizzas`` collection:
+
+.. include:: /includes/pizza-example-collection.rst
+
+.. include:: /includes/pizza-bulk-write-example.rst
+
+For more examples, see :ref:`bulkWrite() Examples
+<bulkwrite-example-bulk-write-operation>`.
 
 Strategies for Bulk Inserts to a Sharded Collection
 ---------------------------------------------------

source/core/databases-and-collections.txt

@@ -128,4 +128,3 @@ or the :method:`db.getCollectionInfos()` method.
    /core/materialized-views
    /core/capped-collections
    /core/clustered-collections
-   /core/timeseries-collections

source/core/index-multikey.txt

@@ -231,11 +231,13 @@ Examples
 Index Basic Arrays
 ~~~~~~~~~~~~~~~~~~
 
-Consider a ``survey`` collection with the following document:
+Create a ``survey`` collection with the following document:
 
 .. code-block:: javascript
 
-   { _id: 1, item: "ABC", ratings: [ 2, 5, 9 ] }
+   db.survey.insertOne(
+      { _id: 1, item: "ABC", ratings: [ 2, 5, 9 ] }
+   )
 
 Create an index on the field ``ratings``:
 

source/core/link-text-indexes.txt

@@ -1,6 +1,6 @@
-==============================
-Perform a Text Search (Legacy)
-==============================
+===================================
+Perform a Text Search (On-Premises)
+===================================
 
 .. default-domain:: mongodb
 

source/core/multikey-index-bounds.txt

@@ -32,13 +32,17 @@ query that specifies multiple predicates on the array and can use a
 :ref:`multikey index <index-type-multikey>` bounds if an
 :query:`$elemMatch` joins the predicates.
 
-For example, a collection ``survey`` contains documents with a field
-``item`` and an array field ``ratings``:
+For example, create a ``survey`` collection that contains documents
+with a field ``item`` and an array field ``ratings``:
 
 .. code-block:: javascript
 
-   { _id: 1, item: "ABC", ratings: [ 2, 9 ] }
-   { _id: 2, item: "XYZ", ratings: [ 4, 3 ] }
+   db.survey.insertMany(
+      [
+         { _id: 1, item: "ABC", ratings: [ 2, 9 ] },
+         { _id: 2, item: "XYZ", ratings: [ 4, 3 ] }
+      ]
+   )
 
 Create a :ref:`multikey index <index-type-multikey>` on the ``ratings``
 array:
@@ -106,13 +110,18 @@ Compound Index on an Array Field
 
 Consider a compound multikey index; i.e. a :ref:`compound index
 <index-type-compound>` where one of the indexed fields is an array. For
-example, a collection ``survey`` contains documents with a field
+example, create a ``survey`` collection that contains documents with a field
 ``item`` and an array field ``ratings``:
 
 .. code-block:: javascript
 
-   { _id: 1, item: "ABC", ratings: [ 2, 9 ] }
-   { _id: 2, item: "XYZ", ratings: [ 4, 3 ] }
+   db.survey.insertMany(
+      [
+         { _id: 1, item: "ABC", ratings: [ 2, 9 ] },
+         { _id: 2, item: "XYZ", ratings: [ 4, 3 ] }
+      ]
+   )
+
 
 Create a :ref:`compound index <index-type-compound>` on the ``item``
 field and the ``ratings`` field:
@@ -181,12 +190,17 @@ and ratings to ``[[3.0, 6.0]]`` to use the combined bounds of:
    "item" : [ [ "L", "Z" ] ], "ratings" : [ [3.0, 6.0] ]
 
 For another example, consider where the scalar fields belong to a nested document.
-For instance, a collection ``survey`` contains the following documents:
+For instance, create a ``survey`` collection that contains the following documents:
 
 .. code-block:: javascript
-
-   { _id: 1, item: { name: "ABC", manufactured: 2016 }, ratings: [ 2, 9 ] }
-   { _id: 2, item: { name: "XYZ", manufactured: 2013 },  ratings: [ 4, 3 ] }
+   
+   db.survey.insertMany(
+      [
+         { _id: 1, item: { name: "ABC", manufactured: 2016 }, ratings: [ 2, 9 ] },
+         { _id: 2, item: { name: "XYZ", manufactured: 2013 },  ratings: [ 4, 3 ] }
+      ]
+   )
+   
 
 Create a compound multikey index on the scalar fields ``"item.name"``,
 ``"item.manufactured"``, and the array field ``ratings`` :

source/core/queryable-encryption/reference/shared-library.txt

@@ -69,7 +69,7 @@ following link:
 
 `MongoDB Download Center <https://www.mongodb.com/try/download/enterprise>`__
 
-- In the **Version** dropdown, select ``6.0.0-rc9 (release candidate)``.
+- In the **Version** dropdown, select ``{+shared-library-version-drop-down+}``.
 - In the **Platform** dropdown, select your platform.
 - In the **Package** dropdown, select ``crypt_shared``.
 - Click **Download**.