Merge branch 'v1.1'

mongodb · Mar 16, 2017 · ed578ab · ed578ab
2 parents 7acb440 + 3473f1a
commit ed578ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docs/includes/apiargs-MongoDBCollection-method-find-option.yaml b/docs/includes/apiargs-MongoDBCollection-method-find-option.yaml
@@ -137,9 +137,9 @@ arg_name: option
 name: modifiers
 type: array|object
 description: |
-  Meta-operators that modify the output or behavior of a query. :manual:`Cursor
-  Methods </reference/method/js-cursor`> describes the query modification
-  methods available in MongoDB.
+  :manual:`Meta operators </reference/operator/query-modifier>` that modify the
+  output or behavior of a query. Use of these operators is deprecated in favor
+  of named options.
 interface: phpmethod
 operation: ~
 optional: true

diff --git a/src/Operation/Find.php b/src/Operation/Find.php
@@ -76,8 +76,9 @@ class Find implements Executable
      *    run. If "$maxTimeMS" also exists in the modifiers document, this
      *    option will take precedence.
      *
-     *  * modifiers (document): Meta-operators modifying the output or behavior
-     *    of a query.
+     *  * modifiers (document): Meta operators that modify the output or
+     *    behavior of a query. Use of these operators is deprecated in favor of
+     *    named options.
      *
      *  * noCursorTimeout (boolean): The server normally times out idle cursors
      *    after an inactivity period (10 minutes) to prevent excess memory use.