tweak examples for cpp

Author: kay-kim

primer/source/includes/examples-aggregation-base.yaml

@@ -1,4 +1,4 @@
-collection: "inventory"
+collection: "restaurants"
 options:
   base_file: true
 ---
@@ -7,11 +7,11 @@ title:
   level: 2
 ref: _group-documents-by-a-field-and-calculate-count
 pre: |
-  Use the :pipeline:`$group` stage to group by a specified key. In the
-  :pipeline:`$group` stage, specify the group by key in the ``_id``
-  field. :pipeline:`$group` accesses fields by the field path, which is
+  Use the {{stageGroup}} stage to group by a specified key. In the
+  {{stageGroup}}  stage, specify the group by key in the ``_id``
+  field. {{stageGroup}} accesses fields by the field path, which is
   the field name prefixed by a dollar sign ``$``. The
-  :pipeline:`$group` stage can use :manual:`accumulators
+  {{stageGroup}} stage can use :manual:`accumulators
   </meta/aggregation-quick-reference/#group-operators>` to perform
   calculations for each group.
 
@@ -23,29 +23,33 @@ post: |
 final: |
   The ``_id`` field contains the distinct ``borough`` value, i.e., the
   group by key value.
+replacement:
+  stageGroup: ":pipeline:`$group`"
 ---
 title:
   text: Filter and Group Documents
   level: 2
 ref: _filter-and-group-documents
 pre: |
-  Use the :pipeline:`$match` stage to filter documents.
-  :pipeline:`$match` uses the MongoDB :doc:`query syntax
+  Use the {{stageMatch}} stage to filter documents.
+  {{stageMatch}} uses the MongoDB :doc:`query syntax
   </query>`.
 
-  The following pipeline uses :pipeline:`$match` to query the
+  The following pipeline uses {{stageMatch}} to query the
   ``restaurants`` collection for documents with ``borough`` equal to
   ``"Queens"`` and ``cuisine`` equal to ``Brazilian``.
 
-  Then the :pipeline:`$group` stage groups the matching documents
+  Then the {{stageGroup}} stage groups the matching documents
   by the ``address.zipcode`` field and uses the :group:`$sum`
-  accumulator to calculate the count. :pipeline:`$group` accesses
+  accumulator to calculate the count. {{stageGroup}} accesses
   fields by the field path, which is the field name prefixed by a
   dollar sign ``$``.
 post: |
   The result set consists of the following documents:
 final: |
   The ``_id`` field contains the distinct ``zipcode`` value, i.e., the
   group by key value.
-
+replacement:
+  stageGroup: ":pipeline:`$group`"
+  stageMatch: ":pipeline:`$match`"
 ...

primer/source/includes/examples-aggregation.yaml

@@ -188,6 +188,10 @@ edition: cpp
 operation:
   literalinclude: includes/example-cpp-group-documents-by-a-field-and-calculate-count.cpp
   language: cpp
+post: ''
+final: ''
+replacement:
+  stageGroup: "`group <http://mongodb.github.io/mongo-cxx-driver/classmongocxx_1_1pipeline.html#ade56123c1bb038002fb648dce506da08>`_"
 ---
 source:
   file: examples-aggregation-base.yaml
@@ -197,6 +201,12 @@ edition: cpp
 operation:
   literalinclude: includes/example-cpp-filter-and-group-documents.cpp
   language: cpp
+post: ''
+final: ''
+replacement:
+  stageGroup: "`group <http://mongodb.github.io/mongo-cxx-driver/classmongocxx_1_1pipeline.html#ade56123c1bb038002fb648dce506da08>`_"
+  stageMatch: "`match <http://mongodb.github.io/mongo-cxx-driver/classmongocxx_1_1pipeline.html#af60dba76fccb47386c0a3e6755635ed4>`_"
+
 ---
 source:
   file: examples-aggregation-base.yaml

primer/source/includes/extracts-aggregation-overview.yaml

@@ -51,12 +51,13 @@ content: |
 
   You can use the {{aggregate}} method to
   perform a stage-based aggregation. The
-  {{aggregate}} method accepts as its argument a pipeline
+  {{aggregate}} method accepts as its argument a pipeline_
   of stages, where each :manual:`stage
   </meta/aggregation-quick-reference>`, processed sequentially, describes
   a data processing step.
 
   .. _aggregate: http://mongodb.github.io/mongo-cxx-driver/classmongocxx_1_1collection.html#aa93a46c9e07878fbddeb3ca29af71fc4
+  .. _pipeline: http://mongodb.github.io/mongo-cxx-driver/classmongocxx_1_1pipeline.html
 replacement:
   aggregate: "aggregate_"
 ---

primer/source/includes/extracts-connect.yaml

@@ -6,10 +6,12 @@ content: |
   ``test`` database.
 
   .. code-block:: cpp
-
+     
+     mongocxx::instance inst{};
      mongocxx::client conn{};
 
      auto db = conn["test"];
+
 ---
 ref: java-connect
 edition: java

primer/source/includes/steps-client-install-cpp.yaml

@@ -3,14 +3,14 @@ edition: cpp
 ref: download-cpp
 content: |
   Download the source from
-  `<https://github.com/mongodb/mongo-cxx-driver/releases>`_.
+  `<https://github.com/mongodb/mongo-cxx-driver>`_.
 ---
 title: "Compile the Driver"
 edition: cpp
 ref: compile-cpp
 content: |
   To compile, follow the build instructions on
-  `<https://github.com/mongodb/mongo-cxx-driver/wiki/Download-and-Compile-the-Legacy-Driver>`_.
+  `<https://github.com/mongodb/mongo-cxx-driver/wiki/Quickstart-Guide-(New-Driver)>`_.
 ---
 title: "Connect to MongoDB"
 edition: cpp
@@ -22,10 +22,11 @@ pre: |
   Add the following code in your C++ program.
 action:
   - pre: |
-       Add the following ``#include`` statement.
+       Add the following ``#include`` statements.
     language: javascript
     code: |
       #include <mongocxx/client.hpp>
+      #include <mongocxx/instance.hpp>
 
   - content: |
       .. include:: includes/extracts/cpp-connect.rst