Merge pull request #717

Author: jmikola

source/includes/apiargs-MongoDBCollection-method-aggregate-option.yaml

@@ -23,7 +23,7 @@ post: |
   .. versionadded:: 1.4
 ---
 source:
-  file: apiargs-aggregate-option.yaml
+  file: apiargs-common-option.yaml
   ref: hint
 post: |
   .. versionadded:: 1.3

source/includes/apiargs-MongoDBCollection-method-find-option.yaml

@@ -87,18 +87,11 @@ interface: phpmethod
 operation: ~
 optional: true
 ---
-arg_name: option
-name: hint
-type: string|array|object
-description: |
-  The index to use. Specify either the index name as a string or the index key
-  pattern as a document. If specified, then the query system will only consider
-  plans using the hinted index.
-
+source:
+  file: apiargs-common-option.yaml
+  ref: hint
+post: |
   .. versionadded:: 1.2
-interface: phpmethod
-operation: ~
-optional: true
 ---
 arg_name: option
 name: maxAwaitTimeMS

source/includes/apiargs-MongoDBCollection-method-findOne-option.yaml

@@ -19,8 +19,10 @@ source:
   ref: comment
 ---
 source:
-  file: apiargs-MongoDBCollection-method-find-option.yaml
+  file: apiargs-common-option.yaml
   ref: hint
+post: |
+  .. versionadded:: 1.2
 ---
 source:
   file: apiargs-common-option.yaml

source/includes/apiargs-MongoDBCollection-method-replaceOne-option.yaml

@@ -10,6 +10,15 @@ source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: collation
 ---
+source:
+  file: apiargs-common-option.yaml
+  ref: hint
+post: |
+  This option is available in MongoDB 4.2+ and will result in an exception at
+  execution time if specified for an older server version.
+
+  .. versionadded:: 1.6
+---
 source:
   file: apiargs-common-option.yaml
   ref: session

source/includes/apiargs-MongoDBCollection-method-updateMany-option.yaml

@@ -16,6 +16,15 @@ source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: collation
 ---
+source:
+  file: apiargs-common-option.yaml
+  ref: hint
+post: |
+  This option is available in MongoDB 4.2+ and will result in an exception at
+  execution time if specified for an older server version.
+
+  .. versionadded:: 1.6
+---
 source:
   file: apiargs-common-option.yaml
   ref: session

source/includes/apiargs-MongoDBCollection-method-updateOne-option.yaml

@@ -16,6 +16,15 @@ source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: collation
 ---
+source:
+  file: apiargs-common-option.yaml
+  ref: hint
+post: |
+  This option is available in MongoDB 4.2+ and will result in an exception at
+  execution time if specified for an older server version.
+
+  .. versionadded:: 1.6
+---
 source:
   file: apiargs-common-option.yaml
   ref: session

source/includes/apiargs-MongoDBDatabase-method-aggregate-option.yaml

@@ -19,7 +19,7 @@ source:
   ref: explain
 ---
 source:
-  file: apiargs-aggregate-option.yaml
+  file: apiargs-common-option.yaml
   ref: hint
 ---
 source:

source/includes/apiargs-aggregate-option.yaml

@@ -49,15 +49,4 @@ description: |
 interface: phpmethod
 operation: ~
 optional: true
----
-arg_name: option
-name: hint
-type: string|array|object
-description: |
-  The index to use. Specify either the index name as a string or the index key
-  pattern as a document. If specified, then the query system will only consider
-  plans using the hinted index.
-interface: phpmethod
-operation: ~
-optional: true
 ...

source/includes/apiargs-common-option.yaml

@@ -16,6 +16,17 @@ operation: ~
 optional: true
 ---
 arg_name: option
+name: hint
+type: string|array|object
+description: |
+  The index to use. Specify either the index name as a string or the index key
+  pattern as a document. If specified, then the query system will only consider
+  plans using the hinted index.
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
 name: maxTimeMS
 type: integer
 description: |