diff --git a/docs/includes/extracts-collection-option.yaml b/docs/includes/extracts-collection-option.yaml index 838a009f5..ecc82a42d 100644 --- a/docs/includes/extracts-collection-option.yaml +++ b/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 ` 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 `. + 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 diff --git a/docs/includes/extracts-watch-option.yaml b/docs/includes/extracts-watch-option.yaml index 533e76acf..648989c7c 100644 --- a/docs/includes/extracts-watch-option.yaml +++ b/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: | diff --git a/docs/reference/class/MongoDBCollection.txt b/docs/reference/class/MongoDBCollection.txt index 2f23ae019..956b0129f 100644 --- a/docs/reference/class/MongoDBCollection.txt +++ b/docs/reference/class/MongoDBCollection.txt @@ -144,4 +144,3 @@ Methods - :phpmethod:`MongoDB\Collection::updateSearchIndex()` - :phpmethod:`MongoDB\Collection::watch()` - :phpmethod:`MongoDB\Collection::withOptions()` - diff --git a/docs/reference/method/MongoDBDatabase-selectGridFSBucket.txt b/docs/reference/method/MongoDBDatabase-selectGridFSBucket.txt index a931ba4ce..6c624aa37 100644 --- a/docs/reference/method/MongoDBDatabase-selectGridFSBucket.txt +++ b/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 ` diff --git a/docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt b/docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt index 24baebdef..3a0ea02e9 100644 --- a/docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt +++ b/docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt @@ -57,7 +57,7 @@ Parameters Defaults to ``false``. - .. versionadded: 1.4 + .. versionadded:: 1.4 * - metadata - array|object diff --git a/docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt b/docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt index 0ba54e9f6..eabfc2e97 100644 --- a/docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt +++ b/docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt @@ -61,7 +61,7 @@ Parameters Defaults to ``false``. - .. versionadded: 1.4 + .. versionadded:: 1.4 * - metadata - array|object diff --git a/docs/reference/method/MongoDBGridFSBucket__construct.txt b/docs/reference/method/MongoDBGridFSBucket__construct.txt index b051361f6..0b49455da 100644 --- a/docs/reference/method/MongoDBGridFSBucket__construct.txt +++ b/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 `