DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686)

* DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro

* CR1

* CR 1.5

Author: ianf-mongodb

source/aggregation.txt

@@ -31,13 +31,21 @@ transforms the documents into an aggregated result. For example:
 
 .. only:: website and dirhtml
 
+<<<<<<< HEAD
    .. raw:: html
+=======
+- :ref:`Aggregation pipelines <aggregation-pipeline-intro>`
+>>>>>>> 5f656cf37 (DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686))
 
       <video style="width:100%;" src="../_images/agg-pipeline.mp4" controls> </video>
 
 .. only:: website and html and (not dirhtml)
 
+<<<<<<< HEAD
    .. raw:: html
+=======
+.. _aggregation-pipeline-intro:
+>>>>>>> 5f656cf37 (DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686))
 
       <video style="width:100%;" src="_images/agg-pipeline.mp4" controls> </video>
 
@@ -132,6 +140,20 @@ aggregation pipeline and map-reduce.
 
 .. include:: /images/distinct.rst
 
+<<<<<<< HEAD
+=======
+The single purpose aggregation methods are simple but lack the
+capabilities of an :ref:`aggregation pipeline 
+<aggregation-pipeline-intro>`.
+
+.. _aggregation-map-reduce:
+
+Map-Reduce
+----------
+
+.. include:: /includes/fact-use-aggregation-not-map-reduce.rst
+
+>>>>>>> 5f656cf37 (DOCSP-19108 update aggregation-framework -> aggregation-pipeline-intro (#686))
 Additional Features and Behaviors
 ---------------------------------
 

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

@@ -292,3 +292,32 @@ 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))