DOCSP-18668 BACKPORT (#458)

Author: Dave

source/reference/method/Mongo.watch.txt

@@ -32,46 +32,29 @@ Definition
    .. list-table::
       :header-rows: 1
       :widths: 20 20 80
-   
+
       * - Parameter
-   
         - Type
-   
         - Description
-   
+
       * - ``pipeline``
-   
         - array
-   
-        - :doc:`Aggregation pipeline </core/aggregation-pipeline>` consisting
-          of one or more of the following aggregation stages:
+        - Optional. An :ref:`aggregation-pipeline` consisting of one or
+          more of the following aggregation stages:
 
           .. include:: /includes/extracts/changestream-available-pipeline-stages.rst
 
           Specify a pipeline to filter/modify the change events output.
 
           .. include:: /includes/extracts/4.2-changes-change-stream-modification-error.rst
-          
-          
-   
+
       * - ``options``
-   
         - document
-   
         - Optional. Additional options that modify the behavior of
           :method:`Mongo.watch()`.
-          
-          You must pass an empty array ``[]`` to the ``pipeline`` parameter if
-          you are not specifying a pipeline but are passing the ``options``
-          document.
-          
-          
-   
-
 
    The ``options`` document can contain the following fields and values:
 
-
    .. list-table::
       :header-rows: 1
       :widths: 20 20 80

source/reference/method/db.collection.watch.txt

@@ -15,51 +15,36 @@ Definition
 
 .. method:: db.collection.watch( pipeline, options )
 
-
    .. include:: /includes/fact-mongosh-shell-method.rst
 
-
    *For replica sets and sharded clusters only*
 
    Opens a :ref:`change stream cursor <changeStreams>` on the 
    collection. 
 
-
    .. list-table::
       :header-rows: 1
       :widths: 20 20 80
 
       * - Parameter
-   
         - Type
-   
         - Description
-   
+
       * - ``pipeline``
-   
         - array
-   
-        - :doc:`Aggregation pipeline </core/aggregation-pipeline>` consisting
-          of one or more of the following aggregation stages:
-          
+        - Optional. An :ref:`aggregation-pipeline` consisting of one
+          or more of the following aggregation stages:
+
           .. include:: /includes/extracts/changestream-available-pipeline-stages.rst
-          
+
           Specify a pipeline to filter/modify the change events output.
-          
+
           .. include:: /includes/extracts/4.2-changes-change-stream-modification-error.rst
-          
-          
-   
+
       * - ``options``
-   
         - document
-   
         - Optional. Additional options that modify the behavior of
           :method:`~db.collection.watch()`.
-          
-          You must pass an empty array ``[]`` to the ``pipeline`` parameter if
-          you are not specifying a pipeline but are passing the ``options``
-          document.
 
    The ``options`` document can contain the following fields and values:
 
@@ -68,9 +53,7 @@ Definition
       :widths: 20 20 80
 
       * - Field
-   
         - Type
-   
         - Description
 
       * - ``resumeAfter``
@@ -186,7 +169,6 @@ Definition
 
       :method:`db.watch()` and :method:`Mongo.watch()`
 
-
 Availability
 ------------
 
@@ -230,15 +212,13 @@ Resumability
 
    .. include:: /includes/extracts/changestream-resume-token-versions-4.2-greater.rst
 
-   Hex Encoded Tokens
-   ``````````````````
-
-   .. include:: /includes/extracts/changestream-resume-token-hex-change.rst
+Hex Encoded Tokens
+``````````````````
 
-   Decode Resume Tokens
-   ````````````````````
+.. include:: /includes/extracts/changestream-resume-token-hex-change.rst
 
-   .. include:: /includes/note-decode-resume-tokens.rst
+Decode Resume Tokens
+````````````````````
 
 .. |watchmethod| replace:: :method:`db.collection.watch()`
 

source/reference/method/db.watch.txt

@@ -26,50 +26,32 @@ Definition
    Opens a :ref:`change stream cursor <changeStreams>` for a database
    to report on all its non-``system`` collections.
 
-
    .. list-table::
       :header-rows: 1
       :widths: 20 20 80
-   
+
       * - Parameter
-   
         - Type
-   
         - Description
-   
+
       * - ``pipeline``
-   
         - array
-   
-        - :doc:`Aggregation pipeline </core/aggregation-pipeline>` consisting
+        - Optional. An :ref:`aggregation-pipeline` consisting
           of one or more of the following aggregation stages:
 
           .. include:: /includes/extracts/changestream-available-pipeline-stages.rst
 
           Specify a pipeline to filter/modify the change events output.
 
           .. include:: /includes/extracts/4.2-changes-change-stream-modification-error.rst
-          
-          
-   
+
       * - ``options``
-   
         - document
-   
         - Optional. Additional options that modify the behavior of
           :method:`db.watch()`.
-          
-          You must pass an empty array ``[]`` to the ``pipeline`` parameter if
-          you are not specifying a pipeline but are passing the ``options``
-          document.
-          
-          
-   
-
 
    The ``options`` document can contain the following fields and values:
 
-
    .. list-table::
       :header-rows: 1
       :widths: 20 20 80