Docsp-21006 v4.0 (#762)

* DOCSP-21006 changing href for 139 on node driver ex

* update link

* remove additional link

* remove head

* remove head query-router

* remove head 2

* additional information

* fix render

* fix book reference

* add

* remove

Author: ianf-mongodb

source/core/sharded-cluster-query-router.txt

@@ -291,33 +291,3 @@ Metadata Operations
 -------------------
 
 .. include:: /includes/extracts/mongos-operations-wc.rst
-
-<<<<<<< HEAD
-=======
-Additional Information
-----------------------
-
-FCV Compatibility
-~~~~~~~~~~~~~~~~~
-
-.. include:: /includes/fact-mongos-fcv.rst
-
-
-Connection Pools
-~~~~~~~~~~~~~~~~
-
-.. include:: /includes/extracts/4.2-changes-mongos-repl-connection-pool.rst
-
-.. |newversion| replace:: 4.2
-
-.. |oldversion| replace:: 4.0
-
-Using Aggregation Pipelines with Clusters
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For more information on how sharding works with :ref:`aggregations
-<aggregation-pipeline>`, read the sharding chapter in the `Practical
-MongoDB Aggregations
-<https://www.practical-mongodb-aggregations.com/guides/sharding.html>`__
-e-book.
->>>>>>> a02c196e5 (DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686))

source/includes/driver-examples/driver-example-indexes-1.rst

@@ -134,11 +134,9 @@
      - id: nodejs
        content: |
          To create an index using the
-         `Node.JS driver <https://mongodb.github.io/node-mongodb-native/>`_,
-         use
-         `createIndex() <http://mongodb.github.io/node-mongodb-native/2.1/tutorials/create-indexes/>`_.
+         `Node.JS driver <https://docs.mongodb.com/drivers/node/current/>`_,
+         use ``createIndex()``.
 
-         .. class:: copyable-code
          .. code-block:: javascript
 
             collection.createIndex( { <key and index type specification> }, function(err, result) {
@@ -157,9 +155,8 @@
                callback(result);
             }
 
-         The `createIndex() <http://mongodb.github.io/node-mongodb-native/2.1/tutorials/create-indexes/>`_
-         method only creates an index if an index of the same
-         specification does not already exist.
+         The ``createIndex()`` method only creates an index if an index
+         of the same specification does not already exist.
 
      - id: php
        content: |

source/reference/operator/aggregation/out.txt

@@ -21,12 +21,7 @@ Definition
 
    Takes the documents returned by the aggregation pipeline and writes
    them to a specified collection. The :pipeline:`$out` operator must
-<<<<<<< HEAD
    be *the last stage* in the pipeline.
-=======
-   be *the last stage* in the pipeline. The :pipeline:`$out` operator
-   lets the aggregation pipeline return result sets of any size.
->>>>>>> b84304d59 (remove rouge agg framework)
 
    .. versionchanged:: 3.2.0
 

source/sharding.txt

@@ -346,17 +346,6 @@ applications to access real-time data changes without the complexity
 and risk of tailing the oplog. Applications can use change streams to
 subscribe to all data changes on a collection or collections.
 
-<<<<<<< HEAD
-=======
-Transactions
-------------
-
-Starting in MongoDB 4.2, with the introduction of :doc:`distributed
-transactions </core/transactions>`, multi-document transactions are
-available on sharded clusters.
-
-.. include:: /includes/extracts/transactions-committed-visibility.rst
-
 Additional Information
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -369,9 +358,4 @@ e-book.
 See also:
 
 - :doc:`/core/transactions`
-- :doc:`/core/transactions-production-consideration`
-- :doc:`/core/transactions-sharded-clusters`
-
-
->>>>>>> a02c196e5 (DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686))
-
+- :doc:`/core/transactions-production-consideration`