mongodb
diff --git a/‎config/redirects‎
Lines changed: 16 additions & 0 deletions b/‎config/redirects‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎snooty.toml‎
Lines changed: 12 additions & 4 deletions b/‎snooty.toml‎
Lines changed: 12 additions & 4 deletions
diff --git a/‎source/core/csfle.txt‎
Lines changed: 0 additions & 2 deletions b/‎source/core/csfle.txt‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎source/core/csfle/features.txt‎
Lines changed: 2 additions & 2 deletions b/‎source/core/csfle/features.txt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎source/core/csfle/fundamentals.txt‎
Lines changed: 0 additions & 2 deletions b/‎source/core/csfle/fundamentals.txt‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎source/core/csfle/fundamentals/create-schema.txt‎
Lines changed: 1 addition & 1 deletion b/‎source/core/csfle/fundamentals/create-schema.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎source/core/csfle/fundamentals/keys-key-vaults.txt‎
Lines changed: 0 additions & 90 deletions b/‎source/core/csfle/fundamentals/keys-key-vaults.txt‎
Lines changed: 0 additions & 90 deletions
diff --git a/‎source/core/csfle/fundamentals/manage-keys.txt‎
Lines changed: 5 additions & 29 deletions b/‎source/core/csfle/fundamentals/manage-keys.txt‎
Lines changed: 5 additions & 29 deletions
diff --git a/‎source/core/csfle/fundamentals/manual-encryption.txt‎
Lines changed: 4 additions & 8 deletions b/‎source/core/csfle/fundamentals/manual-encryption.txt‎
Lines changed: 4 additions & 8 deletions
diff --git a/‎source/core/csfle/quick-start.txt‎
Lines changed: 4 additions & 4 deletions b/‎source/core/csfle/quick-start.txt‎
Lines changed: 4 additions & 4 deletions
@@ -1865,6 +1865,22 @@ raw: ${prefix}/v2.8/release-notes/2.8-changes -> ${base}/v3.0/release-notes/3.0/
 # DOCSP-3769
 [*]: ${prefix}/${version}/applications/drivers -> ${base}/drivers/
 
+# DOCSP-33707 redirects for QE and CSFLE tutorials post-restructure
+[v7.0-*]:
+${prefix}/${version}/core/queryable-encryption/tutorials/aws/aws-automatic
+-> ${base}/${version}/core/queryable-encryption/overview-enable-qe
+[v7.0-*]:
+${prefix}/${version}/core/queryable-encryption/tutorials/azure/azure-automatic
+-> ${base}/${version}/core/queryable-encryption/overview-enable-qe
+[v7.0-*]:
+${prefix}/${version}/core/queryable-encryption/tutorials/gcp/gcp-automatic
+-> ${base}/${version}/core/queryable-encryption/overview-enable-qe
+[v7.0-*]:
+${prefix}/${version}/core/queryable-encryption/tutorials/kmip/kmip-automatic
+-> ${base}/${version}/core/queryable-encryption/overview-enable-qe
+${prefix}/${version}/core/csfle/reference/compatibility
+-> ${base}/${version}/core/queryable-encryption/reference/compatibility
+
 # Redirects for 4.2 and greater
 
 [v4.2-*]: ${prefix}/${version}/reference/command/eval -> ${base}/${version}/release-notes/4.2-compatibility/#remove-support-for-the-eval-command
 
@@ -74,7 +74,15 @@ toc_landing_pages = [
    "/core/journaling",
    "/core/kerberos",
    "/core/map-reduce",
+   "/core/queryable-encryption/",
+   "/core/queryable-encryption/fundamentals/keys-key-vaults",
+   "/core/queryable-encryption/fundamentals/",
+   "/core/queryable-encryption/overview-enable-qe",
+   "/core/queryable-encryption/overview-use-qe",
+   "/core/queryable-encryption/tutorials/",
+   "/core/queryable-encryption/reference/",
    "/core/query-optimization",
+   "/core/queryable-encryption/overview-use-qe",
    "/core/read-isolation-consistency-recency",
    "/core/read-preference",
    "/core/replica-set-architectures",
@@ -84,12 +92,9 @@ toc_landing_pages = [
    "/core/schema-validation",
    "/core/schema-validation/specify-json-schema",
    "/core/security-encryption-at-rest",
-   "/core/queryable-encryption/",
-   "/core/queryable-encryption/fundamentals/",
-   "/core/queryable-encryption/tutorials/",
-   "/core/queryable-encryption/reference/",
    "/core/security-hardening",
    "/core/security-internal-authentication",
+   "/core/security-in-use-encryption",
    "/core/security-ldap",
    "/core/security-scram",
    "/core/security-oidc",
@@ -304,6 +309,7 @@ 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-encryption = "In-Use Encryption"
 in-use-doc = "document with encrypted fields"
 in-use-doc-title = "Document with Encrypted Fields"
 in-use-docs = "documents with encrypted fields"
@@ -344,6 +350,8 @@ enc-schema-title = "Encryption Schema"
 efm = "``encryptedFieldsMap``"
 efm-title = "encryptedFieldsMap"
 shared-library = "Automatic Encryption Shared Library"
+shared-library-version = "7.0.0"
+shared-library-version-drop-down = "{+shared-library-version+} (current)"
 shared-library-package = "``crypt_shared``"
 shared-library-download-link = ""
 auto-encrypt-options = "autoEncryptionOpts"
 
@@ -85,7 +85,6 @@ The fundamentals section contains the following pages:
 - :ref:`csfle-fundamentals-automatic-encryption`
 - :ref:`csfle-fundamentals-manual-encryption`
 - :ref:`csfle-fundamentals-create-schema`
-- :ref:`csfle-reference-keys-key-vaults`
 - :ref:`csfle-fundamentals-manage-keys`
 - :ref:`csfle-reference-encryption-algorithms`
 
@@ -109,7 +108,6 @@ The reference section contains the following pages:
 - :ref:`csfle-reference-server-side-schema`
 - :ref:`csfle-reference-automatic-encryption-supported-operations`
 - :ref:`csfle-reference-mongo-client`
-- :ref:`csfle-reference-kms-providers`
 - :ref:`csfle-reference-encryption-components`
 - :ref:`csfle-reference-decryption`
 - :ref:`csfle-reference-cryptographic-primitives`
 
@@ -51,10 +51,10 @@ read and write the encrypted data fields.
    {+csfle-abbrev+}, see :ref:`<csfle-tutorial-automatic-encryption>`.
 
    To view a list of all supported KMS providers, see
-   :ref:`<csfle-reference-kms-providers>`.
+   :ref:`<qe-fundamentals-kms-providers>`.
 
    To learn more about why you should use a remote KMS, see
-   :ref:`csfle-reasons-to-use-remote-kms`.
+   :ref:`qe-reasons-to-use-remote-kms`.
 
 .. _csfle-feature-comparison:
 
 
@@ -17,7 +17,6 @@ Read the following sections to learn how {+csfle+} works and how to use it:
 - :ref:`csfle-fundamentals-automatic-encryption`
 - :ref:`csfle-fundamentals-manual-encryption`
 - :ref:`csfle-fundamentals-create-schema`
-- :ref:`csfle-reference-keys-key-vaults`
 - :ref:`csfle-fundamentals-manage-keys`
 - :ref:`csfle-reference-encryption-algorithms`
 
@@ -27,6 +26,5 @@ Read the following sections to learn how {+csfle+} works and how to use it:
    /core/csfle/fundamentals/automatic-encryption
    /core/csfle/fundamentals/manual-encryption
    /core/csfle/fundamentals/create-schema
-   /core/csfle/fundamentals/keys-key-vaults
    /core/csfle/fundamentals/manage-keys
    /core/csfle/fundamentals/encryption-algorithms
@@ -43,7 +43,7 @@ Encryption rules must contain either the ``encrypt`` or
 To learn more about the encryption algorithms you can define in your
 encryption schema, see :ref:`<csfle-reference-encryption-algorithms>`.
 
-To learn more about {+dek-long+}s, see :ref:`csfle-reference-keys-key-vaults`.
+To learn more about {+dek-long+}s, see :ref:`qe-reference-keys-key-vaults`.
 
 encrypt Keyword
 ~~~~~~~~~~~~~~~
 
@@ -30,7 +30,7 @@ MongoDB uses the following components to perform {+csfle+}:
 - {+kms-long+} ({+kms-abbr+})
 
 To learn more about keys and key vaults, see
-:ref:`csfle-reference-keys-key-vaults`.
+:ref:`qe-reference-keys-key-vaults`.
 
 Supported Key Management Services
 ---------------------------------
@@ -47,31 +47,7 @@ Supported Key Management Services
 
 To learn more about these providers, including diagrams that show how
 your application uses them to perform {+csfle+}, see
-:ref:`csfle-reference-kms-providers`.
-
-.. _csfle-reasons-to-use-remote-kms:
-
-Reasons to Use a Remote Key Management System
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Using a remote {+kms-long+} to manage your {+cmk-long+}
-has the following advantages over using your local filesystem to host
-the {+cmk-abbr+}:
-
-- Secure storage of the key with access auditing
-- Reduced risk of access permission issues
-- Availability and distribution of the key to remote clients
-- Automated key backup and recovery
-- Centralized encryption key lifecycle management
-
-Additionally, for the following {+kms-abbr+} providers, your
-{+kms-abbr+} remotely encrypts and decrypts your {+dek-long+}, ensuring
-your {+cmk-long+} is never exposed to your {+csfle-abbrev+}-enabled
-application:
-
-- {+aws-long+} KMS
-- {+azure-kv+}
-- {+gcp-kms-abbr+}
+:ref:`qe-fundamentals-kms-providers`.
 
 Manage a {+dek-long+}'s Alternate Name
 ---------------------------------------------
@@ -147,7 +123,7 @@ Select the tab that corresponds to your driver language:
          :language: javascript
 
 To learn more about ``dataKeyOpts`` and ``kmsProviders`` objects, see
-:ref:`csfle-reference-kms-providers`.
+:ref:`qe-fundamentals-kms-providers`.
 
 Use Key Alternate Names in an Automatic Encryption Schema
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -286,7 +262,7 @@ The ``rewrapManyDataKey`` uses the following syntax:
    )
 
 To learn more about the ``dataKeyOpts`` object for your KMS provider, see 
-:ref:`csfle-reference-kms-providers-supported-kms`.
+:ref:`qe-fundamentals-kms-providers-supported-kms`.
 
 .. _field-level-encryption-data-key-delete:
 
@@ -307,7 +283,7 @@ You can delete a {+dek-long+} from your {+key-vault-long+} using standard CRUD
       keyVault = db.getKeyVault()
       keyVault.deleteKey(UUID("<UUID String>"))
 
-To learn more about {+key-vault-long+}s see :ref:`csfle-reference-key-vault`.
+To learn more about {+key-vault-long+}s see :ref:`qe-reference-keys-key-vaults`.
 
 Learn More
 ----------
 
@@ -17,13 +17,9 @@
 Overview
 --------
 
-Learn how to use the **{+manual-enc+}** mechanism of {+csfle+}
-({+csfle-abbrev+}).
+.. include:: /includes/queryable-encryption/qe-csfle-manual-enc-overview.rst
 
-.. include:: /includes/fact-manual-enc-definition.rst
-
-{+manual-enc-first+} is available in the following MongoDB products
-of version 4.2 or later:
+{+manual-enc-first+} is available in the following MongoDB products:
 
 - MongoDB Community Server
 - MongoDB Enterprise Advanced
@@ -219,7 +215,7 @@ Learn More
 ----------
 
 To learn more about {+key-vault-long+}s, {+dek-long+}s, and {+cmk-long+}s,
-see :ref:`csfle-reference-keys-key-vaults`.
+see :ref:`qe-reference-keys-key-vaults`.
 
 To learn more about {+kms-abbr+} providers and ``kmsProviders`` objects,
-see :ref:`csfle-reference-kms-providers`.
+see :ref:`qe-fundamentals-kms-providers`.
@@ -265,10 +265,10 @@ To learn how {+csfle-abbrev+} works, see
 To learn more about the topics mentioned in this guide, see the
 following links:
 
-- :ref:`{+cmk-long+}s <csfle-reference-keys-key-vaults>`
-- :ref:`{+kms-long+} providers <csfle-reference-kms-providers>`
-- :ref:`{+dek-long+}s <csfle-reference-keys-key-vaults>`
-- :ref:`{+key-vault-long+}s <csfle-reference-keys-key-vaults>`
+- :ref:`{+cmk-long+}s <qe-reference-keys-key-vaults>`
+- :ref:`{+kms-long+} providers <qe-fundamentals-kms-providers>`
+- :ref:`{+dek-long+}s <qe-reference-keys-key-vaults>`
+- :ref:`{+key-vault-long+}s <qe-reference-keys-key-vaults>`
 - :ref:`Encryption Schemas <csfle-reference-encryption-schemas>`
 - :ref:`mongocryptd <csfle-reference-mongocryptd>`
 - :ref:`{+csfle-abbrev+}-specific MongoClient settings <csfle-reference-mongo-client>`