Backport 655 to v5.3 (#661)

* [Java Sync] P1 - Shift Java ToC (#615)

* fix redirects (#616)

* [Java Sync] P2 - Shift Java ToC  (#617)

* toc tweak

* reference

* databases adn collections

* reference links

* rm reference landing

Author: rachel-mack

config/redirects

@@ -8,9 +8,67 @@ symlink: upcoming -> master
 raw: ${prefix}/ -> ${base}/current/
 raw: ${prefix}/master -> ${base}/upcoming/
 
-[*-master]: ${prefix}/${version}/fundamentals/versioned-api/ -> ${base}/${version}/fundamentals/stable-api/
+[*-v5.2]: ${prefix}/${version}/fundamentals/versioned-api/ -> ${base}/${version}/fundamentals/stable-api/
 [*-v4.6]: ${prefix}/${version}/fundamentals/crud/read-operations/change-streams/ -> ${base}/${version}/fundamentals/crud/read-operations/retrieve/
 [*-master]: ${prefix}/${version}/fundamentals/csfle/ -> ${base}/${version}/fundamentals/encrypt-fields/
 [*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/change-a-document/ -> ${base}/${version}/fundamentals/crud/write-operations/modify/
 [*-v4.10]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/
 [*-v4.8]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/ -> ${base}/${version}/crud/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/ -> ${base}/${version}/crud/read-operations/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/retrieve/ -> ${base}/${version}/crud/read-operations/retrieve/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/cursor/ -> ${base}/${version}/crud/read-operations/cursor/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/change-streams/ -> ${base}/${version}/logging-monitoring/change-streams/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/sort/ -> ${base}/${version}/crud/read-operations/sort/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/skip/ -> ${base}/${version}/crud/read-operations/skip/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/limit/ -> ${base}/${version}/crud/read-operations/limit/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/project/ -> ${base}/${version}/crud/read-operations/project/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/geo/ -> ${base}/${version}/crud/read-operations/geo/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/read-operations/text/ -> ${base}/${version}/crud/read-operations/text/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/ -> ${base}/${version}/crud/write-operations/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/insert/ -> ${base}/${version}/crud/write-operations/insert/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/delete/ -> ${base}/${version}/crud/write-operations/delete/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/ -> ${base}/${version}/crud/write-operations/modify/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/embedded-arrays/ -> ${base}/${version}/crud/write-operations/embedded-arrays/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/upsert/ -> ${base}/${version}/crud/write-operations/upsert/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/write-operations/bulk/ -> ${base}/${version}/crud/write-operations/bulk/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/query-document/ -> ${base}/${version}/crud/query-document/
+[v5.0-master]: ${prefix}/${version}/fundamentals/crud/compound-operations/ -> ${base}/${version}/crud/compound-operations/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/ -> ${base}/${version}/data-formats/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-bson/ -> ${base}/${version}/data-formats/document-data-format-bson/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-extended-json/ -> ${base}/${version}/data-formats/document-data-format-extended-json/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/documents/ -> ${base}/${version}/data-formats/documents/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-pojo/ -> ${base}/${version}/data-formats/document-data-format-pojo/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-record/ -> ${base}/${version}/data-formats/document-data-format-record/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/pojo-customization/ -> ${base}/${version}/data-formats/pojo-customization/
+[v5.0-master]: ${prefix}/${version}/fundamentals/data-formats/codecs/ -> ${base}/${version}/data-formats/codecs/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/ -> ${base}/${version}/connection/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/connect/ -> ${base}/${version}/connection/connect/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/connection-options/ -> ${base}/${version}/connection/connection-options/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/mongoclientsettings/ -> ${base}/${version}/connection/mongoclientsettings/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/network-compression/ -> ${base}/${version}/connection/network-compression/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/connection/socks/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/tls/ -> ${base}/${version}/security/tls/
+[v5.0-master]: ${prefix}/${version}/fundamentals/connection/jndi/ -> ${base}/${version}/connection/jndi/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/ -> ${base}/${version}/crud/builders/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/aggregates/ -> ${base}/${version}/crud/builders/aggregates/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/filters/ -> ${base}/${version}/crud/builders/filters/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/indexes/ -> ${base}/${version}/crud/builders/indexes/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/projections/ -> ${base}/${version}/crud/builders/projections/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/sort/ -> ${base}/${version}/crud/builders/sort/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/updates/ -> ${base}/${version}/crud/builders/updates/
+[v5.0-master]: ${prefix}/${version}/fundamentals/builders/vector-search -> ${base}/${version}/atlas-vector-search/
+[v5.0-master]: ${prefix}/${version}/fundamentals/aggregation/ -> ${base}/${version}/crud/aggregation/
+[v5.0-master]: ${prefix}/${version}/fundamentals/aggregation-expression-operations/ -> ${base}/${version}/crud/aggregation-expression-operations/
+[v5.0-master]: ${prefix}/${version}/fundamentals/collations/ -> ${base}/${version}/crud/collations/
+[v5.0-master]: ${prefix}/${version}/fundamentals/stable-api/ -> ${base}/${version}/connection/stable-api/
+[v5.0-master]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/connection/connection-troubleshooting/
+[v5.0-master]: ${prefix}/${version}/fundamentals/gridfs/ -> ${base}/${version}/crud/gridfs/
+[v5.0-master]: ${prefix}/${version}/fundamentals/transactions/ -> ${base}/${version}/crud/transactions/
+[v5.0-master]: ${prefix}/${version}/fundamentals/time-series/ -> ${base}/${version}/data-formats/time-series/
+[v5.0-master]: ${prefix}/${version}/quick-start/ -> ${base}/${version}/getting-started/
+[v5.0-master]: ${prefix}/${version}/fundamentals/databases-collections/ -> ${base}/${version}/getting-started/databases-collections/
+[v5.0-master]: ${prefix}/${version}/integrations/ -> ${base}/${version}/getting-started/integrations/
+[v5.0-master]: ${prefix}/${version}/quick-reference/ -> ${base}/${version}/getting-started/quick-reference/
+[v5.0-master]: ${prefix}/${version}/fundamentals/enterprise-auth/ -> ${base}/${version}/security/enterprise-auth/
+[v5.0-master]: ${prefix}/${version}/connection/socks/ -> ${base}/${version}/security/socks/

snooty.toml

@@ -7,12 +7,13 @@ intersphinx = [
 ]
 
 toc_landing_pages = [
-    "/fundamentals/connection",
-    "/fundamentals/crud",
-    "/fundamentals/builders",
-    "/fundamentals/aggregation",
-    "/usage-examples",
-    "/fundamentals/builders/aggregates",
+    "/getting-started",
+    "/connection",
+    "/crud",
+    "/builders",
+    "/aggregation",
+    "/data-formats",
+    "/api-documentation"
 ]
 
 sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"

source/fundamentals/aggregation.txt renamed to source/aggregation.txt

@@ -17,6 +17,10 @@ Aggregation
    :depth: 2
    :class: singlecol
 
+.. toctree::
+
+   Aggregation Expressions </aggregation/aggregation-expression-operations>
+
 Overview
 --------
 

source/fundamentals/aggregation-expression-operations.txt renamed to source/aggregation/aggregation-expression-operations.txt

@@ -0,0 +1,21 @@
+.. _java-atlas-search:
+
+============
+Atlas Search
+============
+
+.. facet::
+   :name: genre
+   :values: reference
+
+.. meta::
+   :keywords: full text, text analyzer, meta, pipeline, scoring, Lucene
+   :description: Learn about how to use Atlas Search in the {+driver-long+}.
+
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 2
+   :class: singlecol
+
+See :atlas:`Atlas Search </atlas-search/>` in the MongoDB Atlas documentation.

source/atlas-search.txt

@@ -7,9 +7,10 @@ Atlas Vector Search
 .. facet::
    :name: genre
    :values: reference
- 
+
 .. meta::
-   :keywords: code example, semantic, nearest
+   :keywords: full text, text analyzer, meta, pipeline, scoring, Lucene, AI, artificial intelligence, code example, semantic, nearest
+   :description: Learn about how to use Atlas Vector Search in the {+driver-long+}.
 
 .. contents:: On this page
    :local:
@@ -103,4 +104,4 @@ guide, see the following API documentation:
 - `Projections.metaVectorSearchScore()
   <{+api+}/apidocs/mongodb-driver-core/com/mongodb/client/model/Projections.html#metaVectorSearchScore(java.lang.String)>`__
 
-- `BinaryVector <{+api+}/apidocs/bson/org/bson/BinaryVector.html>`__
+- `BinaryVector <{+api+}/apidocs/bson/org/bson/BinaryVector.html>`__

source/fundamentals/builders/vector-search.txt renamed to source/atlas-vector-search.txt

@@ -6,12 +6,12 @@ Builders
 
 .. toctree::
 
-   Aggregation </fundamentals/builders/aggregates>
-   Filters </fundamentals/builders/filters>
-   Indexes </fundamentals/builders/indexes>
-   Projection </fundamentals/builders/projections>
-   Sort </fundamentals/builders/sort>
-   Update </fundamentals/builders/updates>
+   Aggregation </builders/aggregates>
+   Filters </builders/filters>
+   Indexes </builders/indexes>
+   Projection </builders/projections>
+   Sort </builders/sort>
+   Update </builders/updates>
 
 .. contents:: On this page
    :local:

source/fundamentals/builders.txt renamed to source/builders.txt

@@ -17,7 +17,7 @@ Aggregates Builders
 
 .. toctree::
 
-   Atlas Vector Search </fundamentals/builders/vector-search>
+   Atlas Vector Search </builders/vector-search>
 
 .. _aggregates-builders:
 
@@ -90,7 +90,7 @@ Project
 
 Use the ``project()`` method to create a :manual:`$project </reference/operator/aggregation/project/>`
 pipeline stage that project specified document fields. Field projection
-in aggregation follows the same rules as :doc:`field projection in queries </fundamentals/crud/read-operations/project>`.
+in aggregation follows the same rules as :doc:`field projection in queries </crud/read-operations/project>`.
 
 .. tip::
 

source/fundamentals/builders/aggregates.txt renamed to source/builders/aggregates.txt

@@ -20,7 +20,7 @@ In this guide, you can learn how to use **builders** to specify
 
 Builders are classes provided by the MongoDB Java driver that help you
 construct :ref:`BSON <bson>` objects. To learn more, see our :doc:`guide
-on builders </fundamentals/builders/>`. 
+on builders </builders/>`. 
 
 Filters are the operations MongoDB uses to limit your results to what
 you want to see. 

source/fundamentals/builders/filters.txt renamed to source/builders/filters.txt

@@ -16,7 +16,7 @@ Overview
 --------
 
 In this guide, you can learn how to specify **indexes** using
-:doc:`builders </fundamentals/builders/>` in the MongoDB Java driver.
+:doc:`builders </builders/>` in the MongoDB Java driver.
 The ``Indexes`` builder provides helper methods for constructing the
 following types of indexes:  
 

source/fundamentals/builders/indexes.txt renamed to source/builders/indexes.txt

@@ -16,7 +16,7 @@ Overview
 --------
 
 In this guide, you can learn how to specify **projections** using
-:doc:`builders </fundamentals/builders/>` in the MongoDB Java driver.
+:doc:`builders </builders/>` in the MongoDB Java driver.
 
 MongoDB supports **field projection**, specifying which fields to include and exclude when returning results from a
 query. Projection in MongoDB follows some basic rules:

source/fundamentals/builders/projections.txt renamed to source/builders/projections.txt

@@ -32,14 +32,14 @@ examples of sort criteria are:
 
 Builders are classes provided by the MongoDB Java driver that help you
 construct :ref:`BSON <bson>` objects. To learn more, see our :doc:`guide
-on builders </fundamentals/builders/>`. 
+on builders </builders/>`. 
 
 You should read this guide if you would like to use builders to specify sort
 criteria for your queries.
 
 If you want to learn the fundamentals of sorting in the MongoDB Java
 driver, consider reading our
-:doc:`guide on sorting </fundamentals/crud/read-operations/sort/>`.
+:doc:`guide on sorting </crud/read-operations/sort/>`.
 
 .. _sorts-builders-sort-sample:
 
@@ -63,7 +63,7 @@ criteria operators supported by MongoDB. These methods return a ``Bson`` object
 that you can pass to the  ``sort()`` method of a ``FindIterable`` instance or to 
 ``Aggregates.sort()``. If you want to learn more about the ``Aggregates``
 class, see our 
-:doc:`guide on the Aggregates builder </fundamentals/builders/aggregates>`.
+:doc:`guide on the Aggregates builder </builders/aggregates>`.
 
 For more information about the classes and interfaces in this section, see the
 following API Documentation:

source/fundamentals/builders/sort.txt renamed to source/builders/sort.txt

@@ -2,8 +2,6 @@
 Run a Command
 =============
 
-
-
 You can run all raw database operations using the
 ``MongoDatabase.runCommand()`` method. A raw database operation is a
 command you can execute directly on the {+mdb-server+} CLI. These

source/fundamentals/builders/updates.txt renamed to source/builders/updates.txt

@@ -6,13 +6,13 @@ Connection Guide
 
 .. toctree::
 
-   Connect to MongoDB </fundamentals/connection/connect>
-   Connection Options </fundamentals/connection/connection-options>
-   MongoClient Settings </fundamentals/connection/mongoclientsettings>
-   Network Compression </fundamentals/connection/network-compression>
-   TLS/SSL </fundamentals/connection/tls>
-   SOCKS5 Proxy </fundamentals/connection/socks>
-   JNDI Datasource </fundamentals/connection/jndi>
+   Connect to MongoDB </connection/connect>
+   Connection Options </connection/connection-options>
+   MongoClient Settings </connection/mongoclientsettings>
+   Stable API </connection/stable-api>
+   Network Compression </connection/network-compression>
+   JNDI Datasource </connection/jndi>
+   Connection Troubleshooting </connection/connection-troubleshooting>
    AWS Lambda <https://www.mongodb.com/docs/atlas/manage-connections-aws-lambda/>
 
 .. contents:: On this page

source/usage-examples/command.txt renamed to source/command.txt

@@ -33,9 +33,7 @@ Use the ``MongoClients.create()`` method to construct a ``MongoClient``.
 
    As each ``MongoClient`` represents a thread-safe pool of connections to the
    database, most applications only require a single instance of a
-   ``MongoClient``, even across multiple threads. To learn more about
-   how connection pools work in the driver, see the :ref:`FAQ page <java-faq-connection-pool>`.
-
+   ``MongoClient``, even across multiple threads. 
 All resource usage limits, such as max connections, apply to individual
 ``MongoClient`` instances.
 

source/fundamentals/connection.txt renamed to source/connection.txt

@@ -194,7 +194,7 @@ parameters of the connection URI to specify the behavior of the client.
    * - **authMechanism**
      - string
      - Specifies the :doc:`authentication mechanism
-       </fundamentals/auth>` that the driver uses if a credential
+       </security/auth>` that the driver uses if a credential
        was supplied.
 
        | **Default**: By default, the client picks the most secure

source/fundamentals/connection/connect.txt renamed to source/connection/connect.txt

@@ -31,8 +31,6 @@ Connection Troubleshooting
            finding more resources
          - The `MongoDB Community Forums <{+communityForums+}>`__ for
            questions, discussions, or general technical support
-         - The :ref:`Frequently Asked Questions (FAQ) <java-faq>` page for
-           answers to common questions about the {+driver-short+}
 
    .. replacement:: server-selection-timeout-error
 
@@ -150,11 +148,6 @@ Connection Troubleshooting
 
       ``maxIdleTimeMS``
 
-   .. replacement:: connection-pools-learn-more
-
-      To learn more about how connection pooling works in the driver, see
-      :ref:`java-faq-connection-pool` in the FAQ.
-
    .. replacement:: scram-failure-error
 
       .. code-block::

source/fundamentals/connection/connection-options.txt renamed to source/connection/connection-options.txt

@@ -0,0 +1,28 @@
+.. _java-crud-operations:
+
+===============
+CRUD Operations
+===============
+
+.. toctree::
+   :caption: CRUD Operations
+
+   Read </crud/read-operations>
+   Write </crud/write-operations>
+   Query </crud/query-document>
+   Compound Operations </crud/compound-operations>
+   Transactions </crud/transactions>
+   Collations </crud/collations>
+   Large File Storage with GridFS </crud/gridfs>
+
+CRUD (Create, Read, Update, Delete) operations enable you to work with
+data stored in MongoDB.
+
+- :ref:`Read Operations <java-read-operations>` find and return
+  documents stored in your database.
+- :ref:`Write Operations <java-write-operations>` insert, modify,
+  or delete documents in your database.
+
+Some operations combine aspects of read and write operations. See our
+guide on :ref:`compound operations <java-compound-operations>`
+to learn more about these hybrid methods.

source/connection-troubleshooting.txt renamed to source/connection/connection-troubleshooting.txt

@@ -1,9 +1,9 @@
+.. _java-compound-operations:
+
 ===================
 Compound Operations
 ===================
 
-
-
 .. contents:: On this page
    :local:
    :backlinks: none
@@ -101,10 +101,10 @@ The output of the preceding code resembles the following:
    {"food": "pizza", "color": "green"}
 
 For more information about the ``Projections`` class, see our
-:doc:`guide on the Projections builder </fundamentals/builders/projections/>`.
+:doc:`guide on the Projections builder </builders/projections/>`.
 
 For more information about the upsert operation, see our 
-:doc:`guide on upserts </fundamentals/crud/write-operations/upsert/>`.
+:doc:`guide on upserts </crud/write-operations/upsert/>`.
 
 For more information about the methods and classes mentioned in this section,
 see the following API Documentation:
@@ -187,7 +187,7 @@ The output of the preceding code resembles the following:
    {"_id": 2, "food": "pear", "color": "yellow"}
 
 For more information about the ``Sorts`` class, see our
-:doc:`guide on the Sorts builder </fundamentals/builders/sort/>`.
+:doc:`guide on the Sorts builder </builders/sort/>`.
 
 For more information about the methods and classes mentioned in this section,
 see the following API Documentation:
@@ -318,10 +318,10 @@ instance:
    for the duration of your compound operation. 
 
 For information on the ``Updates`` class, see our
-:doc:`guide on the Updates builder </fundamentals/builders/updates/>`.
+:doc:`guide on the Updates builder </builders/updates/>`.
 
 For more information of the ``Filters`` class, see our
-:doc:`guide on the Filters builder </fundamentals/builders/filters/>`.
+:doc:`guide on the Filters builder </builders/filters/>`.
 
 For more information about the ``findOneAndUpdate()`` method, see 
 the API Documentation for the `MongoCollection class <{+api+}/apidocs/mongodb-driver-sync/com/mongodb/client/MongoCollection.html#findOneAndUpdate(org.bson.conversions.Bson,java.util.List,com.mongodb.client.model.FindOneAndUpdateOptions)>`__.