Merge remote-tracking branch 'upstream/docsp-45382-comp-cvg' into docsp-49786-meta-operator

Author: mongoKart

config/redirects

@@ -61,8 +61,8 @@ raw: ${prefix}/master -> ${base}/upcoming/
 [*-master]: ${prefix}/${version}/fundamentals/gridfs/ -> ${base}/${version}/crud/gridfs/
 [*-master]: ${prefix}/${version}/fundamentals/specify-query/ -> ${base}/${version}/crud/query/specify-query/
 [*-master]: ${prefix}/${version}/fundamentals/transactions/ -> ${base}/${version}/crud/transactions/
-[*-master]: ${prefix}/${version}/fundamentals/bson/ -> ${base}/${version}/data-formats/bson/
-[*-master]: ${prefix}/${version}/fundamentals/time-series/ -> ${base}/${version}/data-formats/time-series/
+[*-master]: ${prefix}/${version}/fundamentals/bson/ -> ${base}/${version}/document-formats/bson/
+[*-master]: ${prefix}/${version}/fundamentals/time-series/ -> ${base}/${version}/time-series/
 [*-master]: ${prefix}/${version}/fundamentals/logging/ -> ${base}/${version}/logging-and-monitoring/logging/
 [*-master]: ${prefix}/${version}/fundamentals/monitoring/ -> ${base}/${version}/logging-and-monitoring/monitoring/
 [*-master]: ${prefix}/${version}/fundamentals/database-collection/ -> ${base}/${version}/databases-collections/
@@ -82,10 +82,10 @@ raw: ${prefix}/master -> ${base}/upcoming/
 [*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/update-one/ -> ${base}/${version}/crud/update-one/
 [*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/update-one/arrays/ -> ${base}/${version}/crud/update-one/arrays/
 [*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/update-one/fields/ -> ${base}/${version}/crud/update-one/fields/
-[*-master]: ${prefix}/${version}/fundamentals/serialization/class-mapping/ -> ${base}/${version}/data-formats/custom-types/class-mapping/
-[*-master]: ${prefix}/${version}/fundamentals/serialization/poco/ -> ${base}/${version}/data-formats/custom-types/poco/
-[*-master]: ${prefix}/${version}/fundamentals/serialization/polymorphic-objects/ -> ${base}/${version}/data-formats/custom-types/polymorphic-objects/
-[*-master]: ${prefix}/${version}/fundamentals/serialization/ -> ${base}/${version}/data-formats/custom-types/serialization/
+[*-master]: ${prefix}/${version}/fundamentals/serialization/class-mapping/ -> ${base}/${version}/serialization/class-mapping/
+[*-master]: ${prefix}/${version}/fundamentals/serialization/poco/ -> ${base}/${version}/serialization/poco/
+[*-master]: ${prefix}/${version}/fundamentals/serialization/polymorphic-objects/ -> ${base}/${version}/serialization/polymorphic-objects/
+[*-master]: ${prefix}/${version}/fundamentals/serialization/ -> ${base}/${version}/serialization/
 [*-master]: ${prefix}/${version}/fundamentals/databases-collections/run-command/ -> ${base}/${version}/run-command/
 [*-master]: ${prefix}/${version}/fundamentals/authentication/ -> ${base}/${version}/security/authentication/
 [*-master]: ${prefix}/${version}/fundamentals/authentication/aws-iam/ -> ${base}/${version}/security/authentication/aws-iam/

snooty.toml

@@ -3,7 +3,8 @@ toc_landing_pages = [
     "/connect/connection-options",
     "/security/authentication",
     "/aggregation",
-    "/aggregation/stages"
+    "/aggregation/stages",
+    "/serialization"
 ]
 name = "csharp"
 title = "C#/.NET"

source/data-formats.txt

@@ -0,0 +1,29 @@
+.. _csharp-document-formats:
+
+================
+Document Formats
+================
+
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 2
+   :class: singlecol
+
+.. facet::
+   :name: genre
+   :values: reference
+
+.. meta::
+   :keywords: bson, json, object, notation, read, write
+
+.. toctree::
+   :caption: Document Formats
+
+   BSON </document-formats/bson>
+   Extended JSON </document-formats/extended-json>
+
+Learn about using different document formats with the {+driver-short+} in the following guides:
+
+- :ref:`csharp-bson`
+- :ref:`csharp-extended-json`

source/data-formats/custom-types.txt

@@ -6,6 +6,9 @@ BSON Operations
 
 .. default-domain:: mongodb
 
+.. meta::
+   :keywords: document, BSON, serializer
+
 .. contents:: On this page
    :local:
    :backlinks: none
@@ -44,7 +47,8 @@ The code samples in this guide use the following BSON document as an example:
 Create a BSON Document
 ----------------------
 
-To build a BSON document in {+language+}, create an instance of the ``BsonDocument`` class.
+To build a representation of a BSON document in {+language+}, create an instance of the
+``BsonDocument`` class.
 The ``BsonDocument`` constructor accepts ``BsonElement`` arguments that map to the fields
 and values in the document. Each ``BsonElement`` can be either an instance of the 
 ``BsonElement`` class or a field-value pair inside curly braces ( ``{}`` ).
@@ -212,6 +216,22 @@ BSON document stored in ``myFile.bson``:
    ``System.IO.Stream`` object. This means that you can read or write any location 
    that can be accessed by a stream.
 
+Read and Write Other Formats
+----------------------------
+
+The preceding examples show how to read and write BSON data by using the
+``BsonBinaryReader`` and ``BsonBinaryWriter`` classes. These classes implement the 
+``IBsonReader`` and ``IBsonWriter`` interfaces. To read and write data in other formats,
+the {+driver-short+} provides the following alternative implementations of the ``IBsonReader``
+and ``IBsonWriter`` interfaces:
+
+- ``JsonReader`` and ``JsonWriter``: Read and write JSON data
+- ``BsonDocumentReader`` and ``BsonDocumentWriter``: Read and write BSON data
+  contained in a ``BsonDocument`` object
+
+Because these classes implement the same interfaces, you can call their methods in the same way
+as the preceding ``BsonBinaryReader`` and ``BsonBinaryWriter`` examples.
+
 .. _csharp-bson-api:
 
 API Documentation
@@ -224,3 +244,5 @@ guide, see the following API documentation:
 - `BsonElement <{+new-api-root+}/MongoDB.Bson/MongoDB.Bson.BsonElement.html>`__
 - `BsonBinaryReader <{+new-api-root+}/MongoDB.Bson/MongoDB.Bson.IO.BsonBinaryReader.html>`__
 - `BsonBinaryWriter <{+new-api-root+}/MongoDB.Bson/MongoDB.Bson.IO.BsonBinaryWriter.html>`__
+- `IBsonReader <{+new-api-root+}/MongoDB.Bson/MongoDB.Bson.IO.IBsonReader.html>`__
+- `IBsonWriter <{+new-api-root+}/MongoDB.Bson/MongoDB.Bson.IO.IBsonWriter.html>`__

source/document-formats.txt

@@ -18,13 +18,15 @@ MongoDB C# Driver
    Databases & Collections </databases-collections>
    CRUD Operations </crud>
    Aggregation </aggregation>
-   Data Formats </data-formats>
    Indexes </indexes>
    Run a Database Command </run-command>
    Atlas Search </atlas-search>
    Atlas Vector Search </atlas-vector-search>
+   Time Series </time-series>
    Logging and Monitoring </logging-and-monitoring>
    Security </security>
+   Serialization </serialization>
+   Document Formats </document-formats>
    Integrations </integrations>
    Reference </reference>
    API Documentation <{+api-root+}>
@@ -65,12 +67,6 @@ Transform Your Data with Aggregation
 Learn how to use the {+driver-short+} to perform aggregation operations in the
 :ref:`csharp-aggregation` section.
 
-Data Formats
-------------
-
-Learn how to work with specialized data formats and custom types in the
-:ref:`csharp-data-formats` section.
-
 Optimize Queries with Indexes
 -----------------------------
 
@@ -96,6 +92,11 @@ rather than keyword matches in the
 `Atlas Vector Search <https://www.mongodb.com/docs/atlas/atlas-search/tutorial/>`__
 documentation.
 
+Time Series
+-----------
+
+Learn how to work with time series collections in the :ref:`csharp-time-series` section.
+
 Logging and Monitoring
 ----------------------
 
@@ -108,6 +109,16 @@ Secure Your Data
 Learn about ways you can authenticate your application and encrypt your data in
 the :ref:`csharp-security` section.
 
+Serialization
+-------------
+
+Learn how to serialize and deserialize data in the :ref:`csharp-serialization` section.
+
+Document Formats
+----------------
+
+Learn about different notations you can use to read and write data in the :ref:`csharp-document-formats` section.
+
 Reference
 ---------
 

source/data-formats/bson.txt renamed to source/document-formats/bson.txt

@@ -16,7 +16,15 @@ Serialization
    :backlinks: none
    :depth: 2
    :class: singlecol
-   
+
+.. toctree::
+   :caption: Custom Types
+
+   Class Mapping </serialization/class-mapping>
+   POCOs </serialization/custom-types/poco>
+   Polymorphic Objects </serialization/polymorphic-objects>
+   GUIDs </serialization/guids>
+
 Overview
 --------