remove rouge agg framework

Author: ianf-mongodb

source/aggregation.txt

@@ -15,7 +15,7 @@ results. Aggregation operations group values from multiple documents
 together, and can perform a variety of operations on the grouped data
 to return a single result. MongoDB provides three ways to perform
 aggregation: the :ref:`aggregation pipeline
-<aggregation-framework>`, the :ref:`map-reduce function
+<aggregation-pipeline>`, the :ref:`map-reduce function
 <aggregation-map-reduce>`, and :ref:`single purpose aggregation methods
 <single-purpose-agg-operations>`.
 
@@ -24,7 +24,7 @@ aggregation: the :ref:`aggregation pipeline
 Aggregation Pipeline
 --------------------
 
-MongoDB's :doc:`aggregation framework
+MongoDB's :doc:`aggregation pipeline
 </core/aggregation-pipeline>` is modeled on the concept of data
 processing pipelines. Documents enter a multi-stage pipeline that
 transforms the documents into an aggregated result. For example:

source/reference/operator/aggregation/out.txt

@@ -21,7 +21,12 @@ 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