DOCSP-27039: Fundamentals cleanup (#316)

* DOCSP-27039: Fundamentals cleanup

* change streams, other fixes

* unmarshalling method

* monospace

Author: norareidy

source/fundamentals/aggregation.txt

@@ -84,7 +84,7 @@ Examples
 --------
 
 The examples in this section use the following ``Tea`` struct as a model for documents
-in the ``menu`` collection:
+in the ``tea`` collection:
 
 .. literalinclude:: /includes/fundamentals/code-snippets/aggregation.go
    :start-after: start-tea-struct
@@ -93,16 +93,16 @@ in the ``menu`` collection:
    :dedent:
 
 To run the examples in this section, load the sample data into the
-``tea.menu`` collection with the following snippet:
+``tea`` collection in the ``db`` database with the following snippet:
 
 .. literalinclude:: /includes/fundamentals/code-snippets/aggregation.go
    :start-after: begin insert docs
    :end-before: end insert docs
    :language: go
    :dedent:
 
-Each document represents a tea on the menu of a shop and contains
-information about the tea type, the available toppings, and the price.
+Each document contains information about the tea type, the available toppings, and
+the price.
 
 Average Rating
 ~~~~~~~~~~~~~~

source/fundamentals/bson.txt

@@ -78,10 +78,10 @@ use in the {+driver-short+}:
        corresponding to the field type.
 
    * - ``minsize``
-     - If the field type is type int64, uint, uint32, or uint64 and the value of
-       the field can fit in a signed int32, the field will be serialized
-       as a BSON int32 rather than a BSON int64. If the value can't fit
-       in a signed int32, this tag is ignored.
+     - If the field is type ``int64``, ``uint``, ``uint32``, or ``uint64`` and
+       the value of the field can fit in a signed ``int32``, the field will be
+       serialized as a BSON ``int32`` rather than a BSON ``int64``. If the value
+       can't fit in a signed ``int32``, this tag is ignored.
 
    * - ``truncate``
      - If the field type is a non-float numeric type, BSON doubles
@@ -134,7 +134,7 @@ the following rules:
          	Age       int
          }
 
-         coll := client.Database("school").Collection("students")
+         coll := client.Database("db").Collection("students")
          address1 := Address{ "1 Lakewood Way", "Elwood City", "PA" }
          student1 := Student{ FirstName : "Arthur", Address : address1, Age : 8}
          _, err = coll.InsertOne(context.TODO(), student1)
@@ -183,7 +183,7 @@ the following rules:
          	Age       int
          }
 
-         coll := client.Database("school").Collection("students")
+         coll := client.Database("db").Collection("students")
          address1 := Address{ "1 Lakewood Way", "Elwood City", "PA" }
          student1 := Student{ FirstName : "Arthur", Address : address1, Age : 8}
          _, err = coll.InsertOne(context.TODO(), student1)
@@ -285,7 +285,7 @@ operation:
    .. input::
       :language: go
 
-      coll := client.Database("school").Collection("students")
+      coll := client.Database("db").Collection("students")
       filter := bson.D{{"age", 8}}
 
       var result bson.D

source/fundamentals/collations.txt

@@ -135,17 +135,19 @@ that alphabetically precedes ``"Infinite Jest"``:
       if err = cursor.All(context.TODO(), &results); err != nil {
          panic(err)
       }
+
       for _, result := range results {
-         fmt.Println(result)
-      }
+         res, _ := bson.MarshalExtJSON(result, false, false)
+         fmt.Println(string(res))
+      } 
 
    .. output::
       :language: none
       :visible: false
 
-      [{name Ça} {length 1138}]
-      [{name Cryptonomicon} {length 918}]
-      [{name Emma} {length 474}]
+      {"name":"Emma","length":"474"}
+      {"name":"Cryptonomicon","length":"918"}
+      {"name":"Ça","length":"1138"}
 
 Without specifying a default ``books`` collation, the ``Find()`` method would follow default
 binary collation rules to determine the ``name`` values that precede ``"Infinite Jest"``. These
@@ -155,8 +157,8 @@ the following:
 .. code-block:: json
    :copyable: false
 
-   [{name Cryptonomicon} {length 918}]
-   [{name Emma} {length 474}]
+   {"name":"Emma","length":"474"}
+   {"name":"Cryptonomicon","length":"918"}
 
 To learn more about the ``Find()`` method, see :ref:`golang-retrieve`.
 
@@ -258,27 +260,30 @@ order:
       }
 
       for _, result := range results {
-         fmt.Println(result)
-      }
+         res, _ := bson.MarshalExtJSON(result, false, false)
+         fmt.Println(string(res))
+      } 
 
    .. output::
       :language: none
       :visible: false
 
-      [{name Infinite Jest} {length 1104}]
-      [{name Ça} {length 1138}]
-      [{name Les Misérables} {length 1462}] 
+      {"name":"Les Misérables","length":"1462"}
+      {"name":"Infinite Jest","length":"1104"}
+      {"name":"Ça","length":"1138"}
 
 Without specifying a collation with a ``NumericOrdering`` field set to ``true``, the
-same ``Find()`` operation would compare ``length`` values as strings. For example, the
-operation would consider the string ``"824"`` as greater than ``"1000"``. The
-output would resemble the following:
+same ``Find()`` operation compares ``length`` values as strings. In this case, the
+output resembles the following:
 
 .. code-block:: json
    :copyable: false
 
-   [{name Emma} {length 474}]
-   [{name Cryptonomicon} {length 918}]
+   {"name":"Emma","length":"474"}
+   {"name":"Les Misérables","length":"1462"}
+   {""name":"Infinite Jest","length":"1104"}
+   {"name":"Cryptonomicon","length":"918"}
+   {"name":"Ça","length":"1138"}
 
 Additional Information
 ----------------------

source/fundamentals/crud/read-operations/changestream.txt

@@ -5,8 +5,12 @@
 Monitor Data Changes
 ====================
 
+.. facet::
+   :name: genre
+   :values: reference
+
 .. meta::
-   :description: Learn about opening change streams and monitoring data changes in MongoDB by using the {+driver-long+}.
+   :keywords: code example, delta
 
 .. contents:: On this page
    :local:
@@ -17,19 +21,27 @@ Monitor Data Changes
 Overview
 --------
 
-In this guide, you can learn how to monitor document changes with a change stream.
+In this guide, you can learn how to monitor document changes by using a **change stream**.
 
 A change stream outputs new change events, providing access to real-time data changes.
 You can open a change stream on a collection, database, or client object.
 
 Sample Data
 ~~~~~~~~~~~
 
+The examples in this guide use the following ``Course`` struct as a model for documents
+in the ``courses`` collection:
+
+.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/changeStream.go
+   :start-after: begin struct
+   :end-before: end struct
+   :language: go
+   :dedent:
+
 To run the examples in this guide, load these documents into the
-``db.courses`` collection with the following
-snippet:
+``courses`` collection in the ``db`` database with the following snippet:
 
-.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/sort.go
+.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/changeStream.go
    :language: go
    :dedent:
    :start-after: begin insertDocs
@@ -56,29 +68,19 @@ empty ``Pipeline`` object.
 Example
 ~~~~~~~
 
-The following example opens a change stream on the ``db.courses`` collection and
+The following example opens a change stream on the ``courses`` collection and
 outputs all changes:
 
-.. code-block:: go
-
-   coll := client.Database("db").Collection("courses")
-
-   // open a change stream with an empty pipeline parameter
-   changeStream, err := coll.Watch(context.TODO(), mongo.Pipeline{})
-   if err != nil {
-      panic(err)
-   }
-   defer changeStream.Close(context.TODO())
-
-   // iterate over the cursor to print the change-stream events
-   for changeStream.Next(context.TODO()) {
-      fmt.Println(changeStream.Current)
-   }
+.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/changeStream.go
+   :language: go
+   :dedent:
+   :start-after: begin open stream
+   :end-before: end open stream
 
-If you modify the ``db.courses`` collection in a separate program or shell, this code will print
+If you modify the ``courses`` collection in a separate program or shell, this code will print
 your changes as they occur. Inserting a document with a ``title`` value
-of "Advanced Screenwriting" and an ``enrollment`` value of ``20``
-results in the following change-stream event:
+of ``"Advanced Screenwriting"`` and an ``enrollment`` value of ``20``
+results in the following change event:
 
 .. code-block:: none
    :copyable: false
@@ -108,20 +110,19 @@ You can use the following pipeline stages in this parameter:
 Example
 ~~~~~~~
 
-The following example opens a change stream on the ``db`` database, but only watches for
+The following example opens a change stream on the ``db`` database but only watches for
 new delete operations:
 
-.. code-block:: go
-
-   db := client.Database("db")
-
-   pipeline := bson.D{{"$match", bson.D{{"operationType", "delete"}}}}
-   changeStream, err := db.Watch(context.TODO(), mongo.Pipeline{pipeline})
+.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/changeStream.go
+   :language: go
+   :dedent:
+   :start-after: begin delete events
+   :end-before: end delete events
 
 .. note::
 
    The ``Watch()`` method was called on the ``db`` database, so the code outputs
-   new delete operations in any collection within this database.
+   new delete operations on any collection within this database.
 
 Modify the Behavior of ``Watch()``
 ----------------------------------
@@ -194,28 +195,19 @@ document before a change, set the ``FullDocumentBeforeChange`` field of the
 Example
 ~~~~~~~
 
-The following example calls the ``Watch()`` method on the ``db.courses`` collection. It
+The following example calls the ``Watch()`` method on the ``courses`` collection. It
 specifies a value for the ``FullDocument`` field of the ``options`` parameter to
 output a copy of the entire modified document, instead of only the changed fields:
 
-.. code-block:: go
-
-   coll := client.Database("db").Collection("courses")
-   opts := options.ChangeStream().SetFullDocument(options.UpdateLookup)
-
-   changeStream, err := coll.Watch(context.TODO(), mongo.Pipeline{}, opts)
-   if err != nil {
-     panic(err)
-   }
-   defer changeStream.Close(context.TODO())
-
-   for changeStream.Next(context.TODO()) {
-     fmt.Println(changeStream.Current)
-   }
+.. literalinclude:: /includes/fundamentals/code-snippets/CRUD/changeStream.go
+   :language: go
+   :dedent:
+   :start-after: begin full document
+   :end-before: end full document
 
 Updating the ``enrollment`` value of the document with the
-``title`` of "World Fiction" from ``35`` to ``30`` results in the
-following change-stream event:
+``title`` of ``"World Fiction"`` from ``35`` to ``30`` results in the
+following change event:
 
 .. code-block:: none
    :copyable: false

source/fundamentals/crud/read-operations/count.txt

@@ -21,16 +21,16 @@ Sample Data
 ~~~~~~~~~~~
 
 The examples in this section use the following ``Tea`` struct as a model for documents
-in the ``ratings`` collection:
+in the ``tea`` collection:
 
 .. literalinclude:: /includes/fundamentals/code-snippets/CRUD/countAndEstimate.go
    :start-after: start-tea-struct
    :end-before: end-tea-struct
    :language: go
    :dedent:
 
-To run the examples in this guide, load the sample data into the ``tea.ratings`` collection with the following
-snippet:
+To run the examples in this guide, load the sample data into the ``tea`` collection in the ``db``
+database with the following snippet:
 
 .. literalinclude:: /includes/fundamentals/code-snippets/CRUD/countAndEstimate.go
    :language: go
@@ -147,7 +147,8 @@ Example
 
 The following example performs the following actions:
 
-- Counts the number of documents where the ``rating`` is greater than ``5``
+- Counts the number of documents in which the value of the ``rating`` field is greater
+  than ``5``
 - Assigns the count to the ``counted_documents`` field
 
 .. io-code-block::
@@ -217,7 +218,7 @@ Example
 ```````
 
 The following example estimates the number of documents in the
-``ratings`` collection:
+``tea`` collection:
 
 .. io-code-block::
    :copyable: true
@@ -229,13 +230,13 @@ The following example estimates the number of documents in the
       if err != nil {
          panic(err)
       }
-      fmt.Printf("Estimated number of documents in the ratings collection: %d\n", count)
+      fmt.Printf("Estimated number of documents in the tea collection: %d\n", count)
 
    .. output::
       :language: none
       :visible: false
 
-      Estimated number of documents in the ratings collection: 9
+      Estimated number of documents in the tea collection: 9
 
 Additional Information
 ----------------------