mongodb
diff --git a/‎snooty.toml‎
Lines changed: 16 additions & 11 deletions b/‎snooty.toml‎
Lines changed: 16 additions & 11 deletions
diff --git a/‎source/administration/analyzing-mongodb-performance.txt‎
Lines changed: 2 additions & 2 deletions b/‎source/administration/analyzing-mongodb-performance.txt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎source/core/csfle/reference/encryption-schemas.txt‎
Lines changed: 5 additions & 5 deletions b/‎source/core/csfle/reference/encryption-schemas.txt‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎source/core/csfle/reference/mongocryptd.txt‎
Lines changed: 2 additions & 2 deletions b/‎source/core/csfle/reference/mongocryptd.txt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎source/core/csfle/reference/supported-operations.txt‎
Lines changed: 1 addition & 1 deletion b/‎source/core/csfle/reference/supported-operations.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎source/core/queryable-encryption/features.txt‎
Lines changed: 9 additions & 14 deletions b/‎source/core/queryable-encryption/features.txt‎
Lines changed: 9 additions & 14 deletions
@@ -266,6 +266,9 @@ csfle = "Client-Side Field Level Encryption"
 csfle-abbrev = "CSFLE"
 qe = "Queryable Encryption"
 qe-abbr = ":abbr:`QE (Queryable Encryption)`"
+qe-preview = "{+qe+} Public Preview"
+qe-equality-ga = "{+qe+} with equality queries"
+qe-equality-ga-title = "{+qe+} With Equality Queries"
 in-use-doc = "document with encrypted fields"
 in-use-doc-title = "Document with Encrypted Fields"
 in-use-docs = "documents with encrypted fields"
@@ -285,6 +288,7 @@ aws-iam-abbr = ":abbr:`IAM (Identity and Access Management)`"
 aws-arn-abbr = ":abbr:`ARN (Amazon Resource Name)`"
 aws-long = "Amazon Web Services"
 azure-kv = "Azure Key Vault"
+gcp-abbr = ":abbr:`GCP (Google Cloud Platform)`"
 gcp-kms = "Google Cloud Key Management Service"
 gcp-kms-abbr = "Google Cloud KMS"
 manual-enc = "explicit encryption"
@@ -298,14 +302,17 @@ csfle-code-snippets-gen-keys = "https://github.com/mongodb/docs/tree/master/sour
 libmongocrypt-version = "1.8"
 mongodb-crypt-version = "1.7.3"
 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"
+sample-app-url-qe = "https://github.com/mongodb/docs/tree/master/source/includes/qe-tutorials"
+sample-app-url-qe-old = "https://github.com/mongodb-university/docs-in-use-encryption-examples/tree/main/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 = "7.0.0"
 shared-library-version-drop-down = "{+shared-library-version+} (current)"
 shared-library-package = "``crypt_shared``"
+shared-library-download-link = ""
 efm = "``encryptedFieldsMap``"
+efm-title = "encryptedFieldsMap"
 auto-encrypt-options = "autoEncryptionOpts"
 title-auto-encrypt-options = "AutoEncryptionOpts"
 # Driver Constants
@@ -336,23 +343,21 @@ targets = [
     "core/queryable-encryption/*/*.txt",
 ]
 
-variant = "danger"
+variant = "warning"
 value = """
-    Queryable Encryption is in Public Preview and available for \
-    evaluation purposes. Public Preview is not recommended for \
-    production deployments as breaking changes may be introduced. \
-    To learn more about the Preview please see the \
-    `Queryable Encryption Preview <https://www.mongodb.com/blog/post/mongodb-releases-queryable-encryption-preview/>`__ \
-    blog post.
+    {+qe-equality-ga+} is generally available (GA) in \
+    MongoDB 7.0 and later. Data encrypted using the {+qe-preview+} \ 
+    from earlier versions is incompatible with the GA. \
+    For more information, see :ref:`7.0-compatibility`.
     """
 
 [[banners]]
 targets = ["core/csfle.txt", "core/csfle/*.txt", "core/csfle/*/*.txt"]
 
 variant = "tip"
 value = """
-    The next-generation Queryable Encryption feature is now in Public Preview. \
-    To learn more about Queryable Encryption, see :ref:`qe-manual-feature-qe`.
+    {+qe+} is now generally available (GA). \
+    To learn more, see :ref:`qe-manual-feature-qe`.
     """
 [bundle]
 manpages = "manpages.tar.gz"
 
@@ -32,8 +32,8 @@ In some cases performance issues may be temporary and related to
 abnormal traffic load. As discussed in :ref:`number-of-connections`, scaling
 can help relax excessive traffic.
 
-:ref:`database-profiling` can help you to understand what operations are causing
-degradation.
+Database profiling can help you to understand what operations are
+causing degradation.
 
 .. _analyzing-performance-locks:
 
 
@@ -27,7 +27,7 @@ the `JSON Schema Draft 4 standard syntax
 <https://tools.ietf.org/html/draft-zyp-json-schema-04>`_ and
 the following encryption-specific keywords:
 
-- :ref:`Encrypt <csfle-reference-encyption-schemas-encrypt-keyword>` 
+- :ref:`Encrypt <csfle-reference-encryption-schemas-encrypt-keyword>` 
   specifies the encryption options to use when encrypting the current 
   field. 
 
@@ -59,7 +59,7 @@ configuration object. To learn more about {+csfle-abbrev+}-specific
 Definition
 ----------
 
-.. _csfle-reference-encyption-schemas-encrypt-keyword:
+.. _csfle-reference-encryption-schemas-encrypt-keyword:
 .. _field-level-encryption-encrypt-keyword:
 
 .. autoencryptkeyword:: encrypt
@@ -168,7 +168,7 @@ Definition
   - ``bool``
   - ``object``
   - ``array``
-  - ``javascriptWithScope`` (*Deprecated*)
+  - ``javascriptWithScope`` (*Deprecated in MongoDB 4.4*)
 
   If :autoencryptkeyword:`encrypt.algorithm` or its inherited value is
   ``AED_AES_256_CBC_HMAC_SHA_512-Random``, ``bsonType`` is
@@ -204,7 +204,7 @@ Definition
   automatic field level encryption fails and returns an error.
 
   The :autoencryptkeyword:`~encrypt.keyId` or its inherited value *must*
-  exist in the {+key-vault-long+} specified as  part of the auto encryption
+  exist in the {+key-vault-long+} specified as  part of the automatic encryption
   :ref:`configuration options <{+auto-encrypt-options+}>`.
   If the specified {+dek-long+} does not exist, automatic
   encryption fails.
@@ -296,7 +296,7 @@ Definition
   specifies :autoencryptkeyword:`encryptMetadata.keyId`.
 
   The {+dek-long+} *must* exist in the {+key-vault-long+} specified as
-  part of the auto encryption :ref:`configuration options
+  part of the automatic encryption :ref:`configuration options
   <csfle-reference-mongo-client>`. The specified configuration
   options must *also* include appropriate access to the
   :ref:`Key Management Service (KMS) <field-level-encryption-kms>` and
 
@@ -34,7 +34,7 @@ responsibilities:
 - Prevents unsupported operations from being executed on encrypted 
   fields.
 
-- Parses the :ref:`encryption schema <csfle-reference-encyption-schemas-encrypt-keyword>`
+- Parses the :ref:`encryption schema <csfle-reference-encryption-schemas-encrypt-keyword>`
   specified to the database connection. Automatic encryption rules use a
   strict subset of JSON schema syntax. If the automatic encryption rules 
   contain invalid automatic encryption syntax *or* any :query:`document validation
@@ -129,7 +129,7 @@ following parameters:
       - | Set to ``true`` to prevent the driver from automatically spawning ``mongocryptd``.
         | **Default**: ``false``
 
-    * - monogocryptdSpawnPath
+    * - mongocryptdSpawnPath
       - | The full path to ``mongocryptd``.
         | **Default**: Defaults to empty string and spawns from the system path.
 
 
@@ -422,4 +422,4 @@ encrypted field to the following value types:
 - ``decimal128``
 - ``double``
 - ``object``
-- ``javascriptWithScope`` *(Deprecated)*
+- ``javascriptWithScope`` (*Deprecated in MongoDB 4.4*)
@@ -16,17 +16,16 @@ Overview
 --------
 
 On this page, you can learn about the security benefits of {+qe+}, 
-how {+qe+} works and {+qe+} compares to other
-security mechanisms supported by MongoDB. You can also view a
-fictional scenario that demonstrates the value of
-{+qe+} in securing your data.
+how it works, and how it compares to other security mechanisms supported
+by MongoDB. You can also view a fictional scenario that demonstrates the
+value of {+qe+} in securing your data.
 
 .. _qe-features-csfle:
 
 {+qe+}
 --------------------
 
-{+qe+} is a feature of MongoDB that enables a client application to
+{+qe+} enables a client application to
 encrypt data before transporting it over the network using fully
 randomized encryption, while maintaining queryability.
 Sensitive data is transparently encrypted and decrypted by the client
@@ -36,11 +35,9 @@ cardinality (low-frequency) data and high cardinality data are identical
 
 Unlike :ref:`Client-Side Field Level Encryption <manual-csfle-feature>`
 that can use :ref:`Deterministic Encryption <csfle-deterministic-encryption>`,
-{+qe+} uses fast, searchable encryption schemes based on 
-`Structured Encryption 
-<https://dl.acm.org/doi/abs/10.1007/978-3-030-77883-5_13>`__
-that always encrypts a given cleartext input value to a different 
-encrypted output value.
+{+qe+} uses fast, searchable encryption schemes based on `Structured Encryption <https://dl.acm.org/doi/abs/10.1007/978-3-030-77883-5_13>`__. 
+These schemes produce different encrypted output values even when given
+the same cleartext input.
 
 How {+qe+} Works
 ------------------------------
@@ -54,8 +51,7 @@ used in a customer environment.
 In this diagram, the user is able to query on fully randomly encrypted 
 data such as SSN number.
 
-The process and mechanisms that makes this possible within the
-{+qe+} framework are as follows:
+The process and mechanisms that make this possible within {+qe+} are as follows:
 
 1. When the application submits the query, MongoDB drivers first analyze 
    the query.
@@ -88,11 +84,10 @@ that these are not modified or deleted, or query results will be incorrect.
 
 - {+qe+} adds a ``__safeContent__`` field to documents in any collection where there's a {+qe+}
   encrypted field.
-- {+qe+} creates three metadata collections in the same database as the collection where there's a
+- {+qe+} creates two internal metadata collections in the same database as the collection where there's a
   {+qe+} encrypted field. These are named as follows:
 
   - ``enxcol_.<collectionName>.esc``
-  - ``enxcol_.<collectionName>.ecc``
   - ``enxcol_.<collectionName>.ecoc``
 
 .. warning::