Skip to content

Merge v1.16 into v1.17 #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 26, 2024
Merged

Merge v1.16 into v1.17 #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d34b60
DOCSP-36627: Fix double backslashes (#1239)
norareidy Mar 4, 2024
359efd8
DOCSP-36627: More backslash fixes (#1244)
norareidy Mar 4, 2024
e02a74d
DOCSP-36898: Fix seealso syntax in CSFLE tutorial (#1265)
jmikola Mar 22, 2024
a7f9b2d
DOCSP-37027: Remove use of post in collection-option-collation (#1266)
jmikola Mar 25, 2024
1964639
Fix versionadded syntax (#1269)
jmikola Mar 25, 2024
f76f295
Merge branch 'v1.16' into 1.17-merge-up-1.16
jmikola Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions docs/includes/extracts-collection-option.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/includes/extracts-watch-option.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion docs/reference/class/MongoDBCollection.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,3 @@ Methods
- :phpmethod:`MongoDB\Collection::updateSearchIndex()`
- :phpmethod:`MongoDB\Collection::watch()`
- :phpmethod:`MongoDB\Collection::withOptions()`

2 changes: 1 addition & 1 deletion docs/reference/method/MongoDBDatabase-selectGridFSBucket.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Parameters

Defaults to ``false``.

.. versionadded: 1.4
.. versionadded:: 1.4

* - readConcern
- :php:`MongoDB\Driver\ReadConcern <class.mongodb-driver-readconcern>`
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/method/MongoDBGridFSBucket-openUploadStream.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Parameters

Defaults to ``false``.

.. versionadded: 1.4
.. versionadded:: 1.4

* - metadata
- array|object
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/method/MongoDBGridFSBucket-uploadFromStream.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Parameters

Defaults to ``false``.

.. versionadded: 1.4
.. versionadded:: 1.4

* - metadata
- array|object
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/method/MongoDBGridFSBucket__construct.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Parameters

Defaults to ``false``.

.. versionadded: 1.4
.. versionadded:: 1.4

* - readConcern
- :php:`MongoDB\Driver\ReadConcern <class.mongodb-driver-readconcern>`
Expand Down