Merge v1.16 into v1.17 (#1271)

Author: jmikola

docs/includes/extracts-collection-option.yaml

@@ -7,10 +7,13 @@ content: |
   takes precedence over that of the ``typeMap`` option.
 ---
 ref: collection-option-collation
-source: 
-  ref: common-option-collation
-  file: extracts-common-option.yaml
-post: |
+content: |
+  :manual:`Collation </reference/collation>` allows users to specify
+  language-specific rules for string comparison, such as rules for lettercase
+  and accent marks. When specifying collation, the ``locale`` field is
+  mandatory; all other collation fields are optional. For descriptions of the
+  fields, see :manual:`Collation Document </reference/collation/#collation-document>`.
+
   If the collation is unspecified but the collection has a default collation,
   the operation uses the collation specified for the collection. If no
   collation is specified for the collection or for the operation, MongoDB uses

docs/includes/extracts-watch-option.yaml

@@ -61,7 +61,7 @@ content: |
 
      This is an option of the ``$changeStream`` pipeline stage.
 
-  .. versionadded: 1.13
+  .. versionadded:: 1.13
 ---
 ref: watch-option-maxAwaitTimeMS
 content: |
@@ -121,7 +121,7 @@ content: |
 
      This is an option of the ``$changeStream`` pipeline stage.
 
-  .. versionadded: 1.5
+  .. versionadded:: 1.5
 ---
 ref: watch-option-startAtOperationTime
 content: |

docs/reference/class/MongoDBCollection.txt

@@ -144,4 +144,3 @@ Methods
 - :phpmethod:`MongoDB\Collection::updateSearchIndex()`
 - :phpmethod:`MongoDB\Collection::watch()`
 - :phpmethod:`MongoDB\Collection::withOptions()`
-

docs/reference/method/MongoDBDatabase-selectGridFSBucket.txt

@@ -57,7 +57,7 @@ Parameters
 
          Defaults to ``false``.
 
-         .. versionadded: 1.4
+         .. versionadded:: 1.4
 
      * - readConcern
        - :php:`MongoDB\Driver\ReadConcern <class.mongodb-driver-readconcern>`

docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt

@@ -57,7 +57,7 @@ Parameters
 
          Defaults to ``false``.
 
-         .. versionadded: 1.4
+         .. versionadded:: 1.4
 
      * - metadata
        - array|object

docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt

@@ -61,7 +61,7 @@ Parameters
 
          Defaults to ``false``.
 
-         .. versionadded: 1.4
+         .. versionadded:: 1.4
 
      * - metadata
        - array|object

docs/reference/method/MongoDBGridFSBucket__construct.txt

@@ -68,7 +68,7 @@ Parameters
 
          Defaults to ``false``.
 
-         .. versionadded: 1.4
+         .. versionadded:: 1.4
 
      * - readConcern
        - :php:`MongoDB\Driver\ReadConcern <class.mongodb-driver-readconcern>`