Merge master into v6.1

.gitignore

@@ -38,7 +38,6 @@ source/includes/toc/
 source/includes/table/
 source/includes/steps/
 source/includes/generated/includes-overview.rst
-source/includes/generated/
 source/includes/option/
 source/includes/changelogs/*.rst
 !source/includes/changelogs/releases/*.rst

config/redirects

@@ -1,10 +1,12 @@
 define: prefix docs
 define: base https://www.mongodb.com/${prefix}
 define: versions v2.2 v2.4 v2.6 v3.0 v3.2 v3.4 v3.6 v4.0 v4.2 v4.4 v5.0 v5.1 v5.2 v5.3 v6.0 master
-symlink: manual -> v5.0
-symlink: stable -> v5.0
-symlink: rapid -> v5.2
-symlink: upcoming -> master
+symlink: master -> v6.0
+symlink: stable -> v6.0
+symlink: rapid -> v6.0
+symlink: current -> v6.0
+symlink: upcoming -> v6.0
+symlink: manual -> v6.0
 
 [v2.2]: ${prefix}/${version}/core/read-operations-introduction -> ${base}/${version}/core/read-operations/
 [v2.2]: ${prefix}/${version}/core/write-operations-introduction -> ${base}/${version}/core/write-operations/

snooty.toml

@@ -102,6 +102,7 @@ toc_landing_pages = [
    "/mongo",
    "/reference/aggregation",
    "/reference/bson-types",
+   "/reference/change-events",
    "/reference/collation",
    "/reference/command",
    "/reference/command/nav-administration",
@@ -148,7 +149,7 @@ toc_landing_pages = [
    "/reference/operator/query-logical",
    "/reference/operator/query-miscellaneous",
    "/reference/operator/query-modifiers",
-   "/reference/operator/query-projection",
+   "/reference/operator/projection",
    "/reference/operator/query",
    "/reference/operator/update-array",
    "/reference/operator/update-bitwise",
@@ -262,9 +263,9 @@ kmip-hover = ":abbr:`KMIP (Key Management Interoperability Protocol)`"
 kmip-kms-no-hover = "KMIP-compliant Key Management System"
 kmip-kms = "{+kmip-hover+}-compliant {+kms-abbr+}"
 csfle-code-snippets-gen-keys = "https://github.com/mongodb/docs/tree/master/source/includes/quick-start/generate-master-key"
-libmongocrypt-version = "1.4"
-sample-app-url-csfle = "https://github.com/mongodb/docs/tree/master/source/includes/sample_apps/csfle/build/"
-sample-app-url-qe = "https://github.com/mongodb/docs/tree/master/source/includes/sample_apps/csfle/build/"
+libmongocrypt-version = "1.5"
+sample-app-url-csfle = "https://github.com/mongodb-university/docs-in-use-encryption-examples/tree/main/csfle"
+sample-app-url-qe = "https://github.com/mongodb-university/docs-in-use-encryption-examples/tree/main/queryable-encryption"
 qe = "Queryable Encryption"
 qe-abbr = ":abbr:`QE (Queryable Encryption)`"
 enc-fields-map = "encrypted fields map"

source/changeStreams.txt

@@ -508,6 +508,7 @@ upper-right to set the language of the examples on this page.
    See :ref:`change-stream-output` for more information on the change stream
    response document format.
 
+.. _change-streams-updateLookup:
 
 Lookup Full Document for Update Operations
 ------------------------------------------
@@ -1064,30 +1065,6 @@ Change Streams with Document Pre- and Post-Images
 For complete examples with the change stream output, see
 :ref:`db.collection.watch-change-streams-pre-and-post-images-example`.
 
-.. _change-streams-expanded-events:
-
-Expanded Events
----------------
-
-.. versionadded:: 6.0
-
-Starting in MongoDB 6.0, change streams support change notifications for DDL
-events, like the :ref:`createIndexes <change-event-createIndexes>` and
-:ref:`dropIndexes <change-event-dropIndexes>`. To include expanded
-events in a change stream, create the change stream cursor using the
-``showExpandedEvents`` option.
-
-For example:
-
-.. code-block:: javascript
-
-   let cur = db.names.aggregate( [
-      $changeStream: {
-         showExpandedEvents: true
-      }
-   ] )
-
-   cur.next()
 
 .. toctree::
    :titlesonly:

source/core/auditing.txt

@@ -82,12 +82,18 @@ including the entry for the operation.
 These auditing guarantees require that MongoDB run with
 :setting:`journaling <storage.journal.enabled>` enabled.
 
-.. warning:: MongoDB may lose events **if** the server terminates
-   before it commits the events to the audit log. The client may
-   receive confirmation of the event before MongoDB commits to the
-   audit log. For example, while auditing an aggregation operation, the
-   server might crash after returning the result but before the audit
-   log flushes.
+.. warning::
+
+   MongoDB may lose events **if** the server terminates before it
+   commits the events to the audit log. The client may receive
+   confirmation of the event before MongoDB commits to the audit log.
+   For example, while auditing an aggregation operation, the server
+   might terminate after returning the result but before the audit log
+   flushes.
+
+   In addition, if the server cannot write to the audit log at the
+   :option:`audit destination <mongod --auditDestination>`, the server
+   will terminate.
 
 .. [#filter] Audit configuration can include a :ref:`filter
    <audit-filter>` to limit events to audit.

source/core/csfle/fundamentals/manage-keys.txt

@@ -235,7 +235,6 @@ alternate name ``my-alt-name``.
 Dynamically Assign Keys at Runtime
 ``````````````````````````````````
 
-
 You can use alternate key names to dynamically set the {+dek-long+} for
 a field at runtime. Use this functionality to encrypt individual
 documents with different {+dek-long+}s using the same encryption schema.
@@ -267,67 +266,6 @@ uniquely encrypted using {+dek-long+}s specific to the individual
 document. The keys are assigned dynamically at runtime.
 
 .. _csfle_fundamentals_rotate_keys:
-
-Rotate Encryption Keys
-----------------------
-
-Key rotation is the process of retiring an existing encryption key and replacing 
-it with a new one. Regularly rotating encryption keys is considered a best practice.
-
-Rotate a {+cmk-long+}
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To rotate a {+cmk-long+} (CMK), you must perform the following actions:
-
-#. Decrypt all data using the {+dek-long+}s encrypted with your
-   previous CMK.
-   To learn more about decrypting your data, see :ref:`csfle-fundamentals-manual-encryption-manual-decryption`.
-#. Create a new CMK.
-#. Create new {+dek-long+}s using the new CMK.
-#. Encrypt your data with the new {+dek-long+}s that were created with your
-   new CMK.
-
-.. warning:: Don't Delete Keys Until the Rotation is Complete
-
-   Ensure you keep both your previous and new CMKs and
-   {+dek-long+}s until the rotation is complete. If you delete your
-   previous CMK before the rotation is complete, you will lose
-   all data with {+dek-long+}s that are still encrypted with your previous CMK. 
-   If you delete a previous {+dek-long+} before your rotation is complete, 
-   you risk losing data still encrypted with that {+dek-long+}.
-
-.. warning:: Switching from locally-managed master key to a remote KMS
-
-   Before you switch from a locally-managed master key to a remote KMS,
-   you must decrypt all documents containing field-encrypted data. 
-   Your existing data encryption keys can only be decrypted with the original
-   locally-managed master key and not the CMK that the KMS generates.
-
-   Failure to decrypt all data at this stage may cause permanent and
-   unrecoverable data loss.
-
-``mongosh`` provides a helper method to rotate your CMKs. To learn more, see
-:ref:`csfle-rotate-keys-mongo-shell`.
-
-Rotate a {+dek-long+}
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To rotate a {+dek-long+} (DEK), you must perform the following actions:
-
-#. Decrypt all data encrypted with that DEK.
-   To learn more about decrypting your data, see :ref:`csfle-fundamentals-manual-encryption-manual-decryption`.
-#. Create a new DEK.
-#. Encrypt your decrypted data with the new DEK.
-
-.. warning:: Don't Delete Keys Until the Rotation is Complete
-
-   Ensure you keep both your previous and new DEK until the rotation
-   is complete. If you delete your previous DEK before the rotation
-   is complete, you will lose all data still encrypted with that DEK.
-
-``mongosh`` provides a helper method to rotate your DEKs. To learn more, see
-:ref:`csfle-rotate-keys-mongo-shell`.
-
 .. _csfle-rotate-keys-mongo-shell:
 
 Procedure: Rotate Encryption Keys Using Mongo Shell

source/core/csfle/quick-start.txt

@@ -58,27 +58,27 @@ Before You Get Started
       .. tab:: Java
          :tabid: java-sync
 
-         `Complete Java Application <{+sample-app-url-csfle+}java/local/reader/>`__
+         `Complete Java Application <{+sample-app-url-csfle+}/java/local/reader/>`__
 
       .. tab:: Node.js
          :tabid: nodejs
 
-         `Complete Node.js Application <{+sample-app-url-csfle+}node/local/reader/>`__
+         `Complete Node.js Application <{+sample-app-url-csfle+}/node/local/reader/>`__
 
       .. tab:: Python
          :tabid: python
 
-         `Complete Python Application <{+sample-app-url-csfle+}python/local/reader/>`__
+         `Complete Python Application <{+sample-app-url-csfle+}/python/local/reader/>`__
 
       .. tab:: C#
          :tabid: csharp
 
-         `Complete C# Application <{+sample-app-url-csfle+}dotnet/local/reader/CSFLE/>`__
+         `Complete C# Application <{+sample-app-url-csfle+}/dotnet/local/reader/CSFLE/>`__
 
       .. tab:: Go
          :tabid: go
 
-         `Complete Go Application <{+sample-app-url-csfle+}go/local/reader/>`__
+         `Complete Go Application <{+sample-app-url-csfle+}/go/local/reader/>`__
 
 .. tabs-selector:: drivers
 
@@ -112,31 +112,31 @@ Procedure
                :tabid: java-sync
 
                To view the complete code for making a {+dek-long+}, see
-               `our Github repository <{+sample-app-url-csfle+}java/local/reader/src/main/java/com/mongodb/csfle/makeDataKey.java>`__.
+               `our Github repository <{+sample-app-url-csfle+}/java/local/reader/src/main/java/com/mongodb/csfle/makeDataKey.java>`__.
 
             .. tab::
                :tabid: nodejs
 
                To view the complete code for making a {+dek-long+}, see
-               `our Github repository <{+sample-app-url-csfle+}node/local/reader/make_data_key.js>`__.
+               `our Github repository <{+sample-app-url-csfle+}/node/local/reader/make_data_key.js>`__.
 
             .. tab::
                :tabid: python
 
                To view the complete code for making a {+dek-long+}, see
-               `our Github repository <{+sample-app-url-csfle+}python/local/reader/make_data_key.py>`__.
+               `our Github repository <{+sample-app-url-csfle+}/python/local/reader/make_data_key.py>`__.
 
             .. tab::
                :tabid: csharp
 
                To view the complete code for making a {+dek-long+}, see
-               `our Github repository <{+sample-app-url-csfle+}dotnet/local/reader/CSFLE/MakeDataKey.cs>`__.
+               `our Github repository <{+sample-app-url-csfle+}/dotnet/local/reader/CSFLE/MakeDataKey.cs>`__.
 
             .. tab::
                :tabid: go
 
                To view the complete code for making a {+dek-long+}, see
-               `our Github repository <{+sample-app-url-csfle+}go/local/reader/make-data-key.go>`__.
+               `our Github repository <{+sample-app-url-csfle+}/go/local/reader/make-data-key.go>`__.
 
    .. step:: Configure the MongoClient
 
@@ -154,31 +154,31 @@ Procedure
                :tabid: java-sync
 
                To view the complete code for inserting an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}java/local/reader/src/main/java/com/mongodb/csfle/insertEncryptedDocument.java>`__.
+               `our Github repository <{+sample-app-url-csfle+}/java/local/reader/src/main/java/com/mongodb/csfle/insertEncryptedDocument.java>`__.
 
             .. tab::
                :tabid: nodejs
 
                To view the complete code for inserting an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}node/local/reader/insert_encrypted_document.js>`__.
+               `our Github repository <{+sample-app-url-csfle+}/node/local/reader/insert_encrypted_document.js>`__.
 
             .. tab::
                :tabid: python
 
                To view the complete code for inserting an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}python/local/reader/insert_encrypted_document.py>`__.
+               `our Github repository <{+sample-app-url-csfle+}/python/local/reader/insert_encrypted_document.py>`__.
 
             .. tab::
                :tabid: csharp
 
                To view the complete code for inserting an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}dotnet/local/reader/CSFLE/InsertEncryptedDocument.cs>`__
+               `our Github repository <{+sample-app-url-csfle+}/dotnet/local/reader/CSFLE/InsertEncryptedDocument.cs>`__
 
             .. tab::
                :tabid: go
 
                To view the complete code for inserting an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}go/local/reader/insert-encrypted-document.go>`__.
+               `our Github repository <{+sample-app-url-csfle+}/go/local/reader/insert-encrypted-document.go>`__.
 
    .. step:: Retrieve Your Encrypted Document
 
@@ -192,31 +192,31 @@ Procedure
                :tabid: java-sync
 
                To view the complete code for finding an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}java/local/reader/src/main/java/com/mongodb/csfle/insertEncryptedDocument.java>`__.
+               `our Github repository <{+sample-app-url-csfle+}/java/local/reader/src/main/java/com/mongodb/csfle/insertEncryptedDocument.java>`__.
 
             .. tab::
                :tabid: nodejs
 
                To view the complete code for finding an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}node/local/reader/insert_encrypted_document.js>`__.
+               `our Github repository <{+sample-app-url-csfle+}/node/local/reader/insert_encrypted_document.js>`__.
 
             .. tab::
                :tabid: python
 
                To view the complete code for finding an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}python/local/reader/insert_encrypted_document.py>`__.
+               `our Github repository <{+sample-app-url-csfle+}/python/local/reader/insert_encrypted_document.py>`__.
 
             .. tab::
                :tabid: csharp
 
                To view the complete code for finding an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}dotnet/local/reader/CSFLE/InsertEncryptedDocument.cs>`__
+               `our Github repository <{+sample-app-url-csfle+}/dotnet/local/reader/CSFLE/InsertEncryptedDocument.cs>`__
 
             .. tab::
                :tabid: go
 
                To view the complete code for finding an encrypted document, see
-               `our Github repository <{+sample-app-url-csfle+}go/local/reader/insert-encrypted-document.go>`__.
+               `our Github repository <{+sample-app-url-csfle+}/go/local/reader/insert-encrypted-document.go>`__.
 
 
 Learn More

source/core/csfle/reference/compatibility.txt

@@ -78,5 +78,24 @@ versions or later:
      - ``2.12.1+``
      - `Ruby Driver Quickstart <https://docs.mongodb.com/ruby-driver/current/tutorials/client-side-encryption/>`__
 
+.. _csfle-reference-compatability-key-rotation:
+
+.. important:: Key Rotation Support
+
+   To use the key rotation API of {+csfle-abbrev+}, such as the
+   ``rewrapManyDateKey`` method, you must use specific versions
+   of either your driver's binding package or ``libmongocrypt``.
+
+   The following list details each driver's key rotation API
+   dependencies:
+
+   - Node.js Driver: Use ``mongodb-client-encryption``
+     version 2.2.0-alpha.6 or later.
+   - Java Driver: Use ``mongodb-crypt`` version 1.5.2 or later.
+   - pymongo: Use ``pymongocrypt`` version 1.3.1 or later.
+   - Go Driver: Use ``libmongocrypt`` version 1.5.2 or later.
+   - C#/.NET Driver: Use the MongoDB C#/.NET Driver version 2.17.1 or later.
+
 Please refer to the driver reference documentation for syntax and
 implementation examples.
+