mongodb · jdestefano-mongo · Feb 27, 2018 · Feb 20, 2018
diff --git a/source/tutorial/analyze-query-plan.txt b/source/tutorial/analyze-query-plan.txt
@@ -10,6 +10,8 @@ Analyze Query Performance
    :depth: 1
    :class: singlecol
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/atlas-free-tier-setup.txt b/source/tutorial/atlas-free-tier-setup.txt
@@ -14,6 +14,8 @@ deployments. It is a fast, easy, and free way to get started with
 MongoDB. To install and run MongoDB locally, see
 :ref:`Install MongoDB<tutorial-installation>`.
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/change-streams-example.txt b/source/tutorial/change-streams-example.txt
@@ -28,6 +28,9 @@ Change Stream Examples
    :depth: 1
    :class: singlecol
 
+Open A Change Stream
+--------------------
+
 .. tabs-drivers::
 
    tabs:
@@ -82,15 +85,14 @@ Change Stream Examples
           that contains an ``inventory`` collection.
 
 
-Open A Change Stream
---------------------
-
 This example opens a change stream against a replica set. The change stream is bound to a collection and
 change stream documents are iterated with a cursor. This cursor remains open until it is explicitly closed,
 as long as a connection to the MongoDB deployment remains open *and* the collection exists.
 
 .. tabs-drivers::
 
+   hidden: true
+
    tabs:
      - id: python
        content: |
@@ -262,6 +264,8 @@ update operation.
 
 .. tabs-drivers::
 
+   hidden: true
+
    tabs:
      - id: python
        content: |
@@ -349,6 +353,37 @@ response document format.
 Modify Change Stream Output using Aggregation Pipelines
 -------------------------------------------------------
 
+.. COMMENT This is only here to render the tab buttons for this section.
+   This page flowed better with tabs for each section vs.
+   tabs above example as the text leading in was conditional.
+
+.. tabs-drivers::
+
+   tabs:
+     - id: python
+       content: |
+
+     - id: motor
+       content: |
+
+     - id: java-sync
+       content: |
+
+     - id: csharp
+       content: |
+
+     - id: c
+       content: |
+
+     - id: nodejs
+       content: |
+
+     - id: php
+       content: |
+
+     - id: ruby
+       content: |
+
 You can control change stream output by providing an array of one or
 more of the following pipeline stages when configuring the change stream:
 
@@ -360,6 +395,8 @@ more of the following pipeline stages when configuring the change stream:
 
 .. tabs-drivers::
 
+   hidden: true
+
    tabs:
      - id: java-sync
        content: |
@@ -396,6 +433,8 @@ more of the following pipeline stages when configuring the change stream:
 
 .. tabs-drivers::
 
+   hidden: true
+
    tabs:
      - id: java-sync
        content: |
@@ -415,8 +454,6 @@ response document format.
 Resume a Change Stream
 ----------------------
 
-
-
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/getting-started.txt b/source/tutorial/getting-started.txt
@@ -8,6 +8,8 @@ Getting Started
 
 .. default-domain:: mongodb
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/insert-documents.txt b/source/tutorial/insert-documents.txt
@@ -28,6 +28,8 @@ Insert a Single Document
 
 .. versionadded:: 3.2
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/manage-indexes.txt b/source/tutorial/manage-indexes.txt
@@ -18,6 +18,8 @@ creating indexes, refer to the specific index type pages.
 View Existing Indexes
 ---------------------
 
+.. tabs-top::
+
 .. include:: /includes/driver-view-existing-indexes-tabs.rst
 
 .. index:: index; list indexes

diff --git a/source/tutorial/project-fields-from-query-results.txt b/source/tutorial/project-fields-from-query-results.txt
@@ -16,6 +16,8 @@ To limit the amount of data that MongoDB sends to applications, you can
 include a :term:`projection` document to specify or restrict fields to
 return.
 
+.. tabs-top::
+
 .. |query_operations| replace:: query operations with projection
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/query-array-of-documents.txt b/source/tutorial/query-array-of-documents.txt
@@ -13,6 +13,8 @@ Query an Array of Embedded Documents
    :description: MongoDB Manual - how to query an array of documents,  how to query an array of nested documents,  how to query an array of embedded documents.
    :keywords: array of nested documents, array of embedded documents, array of documents, nested documents, array index, select, array, array elements, array items
 
+.. tabs-top::
+
 .. |query_operations| replace:: query operations on an array of nested documents
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/query-arrays.txt b/source/tutorial/query-arrays.txt
@@ -13,6 +13,8 @@ Query an Array
    :description: MongoDB Manual - How to query an array: query on the array field as a whole, check if element in array, query for array element, query if field in array, query by array size.
    :keywords: array, array elements, array items, queries, select, MongoDB Manual, query an array, query for items in array
 
+.. tabs-top::
+
 .. |query_operations| replace:: query operations on array fields
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/query-documents.txt b/source/tutorial/query-documents.txt
@@ -14,6 +14,8 @@ Query Documents
    :description: MongoDB  Manual. How do I query documents, query top level fields, perform equality match, query with query operators, specify compound query conditions.
    :keywords: query, select from collection, select all, select conditions, filters, select where, criteria, greater than, less than, MongoDB Manual
 
+.. tabs-top::
+
 .. |query_operations| replace:: query operations
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/query-embedded-documents.txt b/source/tutorial/query-embedded-documents.txt
@@ -14,6 +14,8 @@ Query on Embedded/Nested Documents
    :description: MongoDB Manual: How to query on embedded documents/nested documents/subdocuments/nested fields. Query/select by embedded documents/nested fields/subdocuments.
    :keywords: filter on embedded documents, nested documents, subdocuments, nested fields, field is embedded document, queries, select, MongoDB, greater than, logical AND, compound conditions, select from collection
 
+.. tabs-top::
+
 .. |query_operations| replace:: query operations on embedded/nested documents
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/query-for-null-fields.txt b/source/tutorial/query-for-null-fields.txt
@@ -11,6 +11,8 @@ Query for Null or Missing Fields
 
 Different query operators in MongoDB treat ``null`` values differently.
 
+.. tabs-top::
+
 .. |query_operations| replace:: operations that query for ``null`` values
 
 .. include:: /includes/driver-example-query-intro.rst

diff --git a/source/tutorial/remove-documents.txt b/source/tutorial/remove-documents.txt
@@ -13,6 +13,8 @@ Delete Documents
    :description: MongoDB Manual: How to delete documents in MongoDB. How to remove documents in MongoDB. How to specify conditions for removing or deleting documents in MongoDB.
    :keywords: delete from collection, remove documents from collection, delete documents from collection, MongoDB Manual
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:

diff --git a/source/tutorial/update-documents.txt b/source/tutorial/update-documents.txt
@@ -17,6 +17,8 @@ Update Documents
    ``inventory`` collection. To create and/or populate the
    ``inventory`` collection, run the following:
 
+.. tabs-top::
+
 .. tabs-drivers::
 
    tabs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ Getting Started @@
     .. default-domain:: mongodb
+    .. tabs-top::
     .. tabs-drivers::
        tabs:
@@ Expand Down @@