fixing include sadness

schmalliso · schmalliso · commit c978d60ca40d · 2015-02-11T18:00:43.000-05:00
diff --git a/source/core/query-optimization.txt b/source/core/query-optimization.txt
@@ -173,7 +173,7 @@ An index **cannot** cover a query if:
 Restrictions on Sharded Collection
 ``````````````````````````````````
 
-.. include:: /includes/extracts-fact-covered-query-sharded-collection-cover.rst
+.. include:: /includes/extracts/fact-covered-query-sharded-collection-cover.rst
 
 ``explain``
 ~~~~~~~~~~~
diff --git a/source/core/server-side-javascript.txt b/source/core/server-side-javascript.txt
@@ -34,8 +34,7 @@ You can also specify a JavaScript file to the :program:`mongo` shell to
 run on the server. For more information, see
 :ref:`running-js-scripts-in-mongo-on-mongod-host`
 
-.. |javascript-using-operation| replace:: the aforementioned operations use
-.. include:: /includes/admonition-javascript-prevalence.rst
+.. include:: /includes/extracts/admonition-js-prevalence-methods.rst
 
 You can also disable server-side execution of JavaScript. For details,
 see :ref:`disable-server-side-js`.
diff --git a/source/includes/extracts-fact-agg-top-level-expressions.yaml b/source/includes/extracts-fact-agg-top-level-expressions.yaml
@@ -5,9 +5,9 @@ inherit:
   ref: _agg-top-level-expressions
   file: extracts-parent-fact-agg-top-level-expressions.yaml
 ---
-ref: fact-agg-top-level-expressions-anyElementsTrue
+ref: fact-agg-top-level-expressions-anyElementTrue
 replacement:
-  exp: ":expression:`$anyElementsTrue`"
+  exp: ":expression:`$anyElementTrue`"
 inherit:
   ref: _agg-top-level-expressions
   file: extracts-parent-fact-agg-top-level-expressions.yaml
@@ -46,4 +46,11 @@ replacement:
 inherit:
   ref: _agg-top-level-expressions
   file: extracts-parent-fact-agg-top-level-expressions.yaml
+---
+ref: fact-agg-top-level-expression-setExpression
+replacement:
+  exp: "the set expression"
+inherit:
+  ref: _agg-top-level-expressions
+  file: extracts-parent-fact-agg-top-level-expressions.yaml
 ...
diff --git a/source/includes/extracts-parent-fact-2.6-wc-gle-change.yaml b/source/includes/extracts-parent-fact-2.6-wc-gle-change.yaml
@@ -7,10 +7,10 @@ content: |
      A new protocol for :ref:`write operations
      <rel-notes-write-operations>` integrates write concerns with the
      write operations, eliminating the need for a separate
-     |gle|. Write methods now return the status of the write
+     {{gle}}. Write methods now return the status of the write
      operation, including error information.
 
-     In previous versions, clients typically used the |gle| in
+     In previous versions, clients typically used the {{gle}} in
      combination with the write operations to ensure that the write
      succeeds.
 ...
diff --git a/source/includes/fact-shard-ranges-inclusive-exclusive.rst b/source/includes/fact-shard-ranges-inclusive-exclusive.rst
@@ -0,0 +1,2 @@
+Shard ranges are always inclusive of the lower value and exclusive
+of the upper boundary.
diff --git a/source/includes/intro-aggregation-set.rst b/source/includes/intro-aggregation-set.rst
@@ -6,6 +6,4 @@ If the set operation returns a set, the operation filters out
 duplicates in the result to output an array that contains only unique
 entries. The order of the elements in the output array is unspecified.
 
-.. |exp| replace:: the set expression
-
-.. include:: /includes/fact-agg-top-level-expressions.rst
+.. include:: /includes/extracts/fact-agg-top-level-expressions-setExpression.rst
diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt
@@ -255,8 +255,6 @@ Core Options
 
 .. include:: /includes/option/setting-conf-storage.wiredTiger.engineConfig.cacheSizeGB.rst
 
-.. include:: /includes/option/setting-conf-storage.wiredTiger.engineConfig.journalCompressor.rst
-
 .. include:: /includes/option/setting-conf-storage.wiredTiger.engineConfig.directoryForIndexes.rst
 
 .. include:: /includes/option/setting-conf-storage.wiredTiger.engineConfig.statisticsLogDelaySecs.rst
diff --git a/source/reference/limits.txt b/source/reference/limits.txt
@@ -217,7 +217,7 @@ Sharding Operational Restrictions
 
 .. limit:: Covered Queries in Sharded Clusters
 
-   .. include:: /includes/excludes/fact-covered-query-sharded-collection-covered-queries.rst
+   .. include:: /includes/extracts/fact-covered-query-sharded-collection-covered-queries.rst
 
 .. limit:: Sharding Existing Collection Data Size
 
diff --git a/source/reference/method.txt b/source/reference/method.txt
@@ -6,8 +6,7 @@
 
 .. default-domain:: mongodb
 
-.. |javascript-using-operation| replace:: these methods use
-.. include:: /includes/excerpts/admonition-js-prevalence-methods.rst
+.. include:: /includes/extracts/admonition-js-prevalence-methods.rst
 
 Collection
 ----------
diff --git a/source/reference/method/cursor.count.txt b/source/reference/method/cursor.count.txt
@@ -44,7 +44,7 @@ Behavior
 Sharded Clusters
 ~~~~~~~~~~~~~~~~
 
-.. include:: /includes/extracts/fact-count-on-sharded-clusters-method-cursor.rst
+.. include:: /includes/extracts/fact-count-on-sharded-clusters-method-cursor.count.rst
 
 Index Use
 ~~~~~~~~~
diff --git a/source/reference/operator/aggregation/anyElementTrue.txt b/source/reference/operator/aggregation/anyElementTrue.txt
@@ -28,9 +28,9 @@ Definition
 Behavior
 --------
 
-.. include:: /includes/extracts/fact-agg-top-level-expressions-anyElementsTrue.rst
+.. include:: /includes/extracts/fact-agg-top-level-expressions-anyElementTrue.rst
 
-.. include:: /includes/extracts/fact-agg-boolean-anyElementsTrue.rst
+.. include:: /includes/extracts/fact-agg-boolean-anyElementTrue.rst
 
 .. list-table::
    :header-rows: 1
diff --git a/source/reference/operator/aggregation/ne.txt b/source/reference/operator/aggregation/ne.txt
@@ -15,9 +15,7 @@ Definition
 
    - ``false`` when the values are equivalent.
 
-   .. include:: /includes/extracts/fact-agg-comparison-expression-ne.rst
-
-   .. include:: /includes/fact-agg-comparison-expressions.rst
+   .. include:: /includes/extracts/fact-agg-comparison-expression-lte.rst
 
    :expression:`$ne` has the following syntax:
 
diff --git a/source/reference/operator/aggregation/setEquals.txt b/source/reference/operator/aggregation/setEquals.txt
@@ -33,7 +33,7 @@ Behavior
 .. include:: /includes/important-set-operator-semantics.rst
    :end-before: .. set-output
 
-.. include:: /includes/extracts-fact-agg-top-level-expressions-setEquals.rst
+.. include:: /includes/extracts/fact-agg-top-level-expressions-setEquals.rst
 
 .. list-table::
    :header-rows: 1
diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt
@@ -126,8 +126,6 @@ Storage Options
 
 .. include:: /includes/option/option-mongod-wiredTigerStatisticsLogDelaySecs.rst
 
-.. include:: /includes/option/option-mongod-wiredTigerJournalCompressor.rst
-
 .. include:: /includes/option/option-mongod-wiredTigerCollectionBlockCompressor.rst
 
 .. include:: /includes/option/option-mongod-wiredTigerIndexPrefixCompression.rst

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Shard ranges are always inclusive of the lower value and exclusive`
	`2`	`+of the upper boundary.`