Skip to content

Commit 11ae937

Browse files
committed
Merge branch 'v1.13' into v1.15
2 parents 843a422 + 5cb1631 commit 11ae937

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

docs/includes/apiargs-MongoDBDatabase-method-createCollection-option.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ description: |
8989
This option is available in MongoDB 6.0+ and will result in an exception at
9090
execution time if specified for an older server version.
9191
92+
.. note::
93+
94+
Queryable Encryption is in public preview and available for evaluation
95+
purposes. It is not yet recommended for production deployments as breaking
96+
changes may be introduced. See the
97+
`Queryable Encryption Preview <https://www.mongodb.com/blog/post/mongodb-releases-queryable-encryption-preview/>`_
98+
blog post for more information.
99+
92100
.. versionadded:: 1.13
93101
interface: phpmethod
94102
operation: ~

docs/includes/apiargs-dropCollection-option.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ description: |
99
server-side value for ``encryptedFields``. See the
1010
`Client Side Encryption specification <https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/client-side-encryption.rst>`_
1111
for more information.
12+
13+
.. note::
14+
15+
Queryable Encryption is in public preview and available for evaluation
16+
purposes. It is not yet recommended for production deployments as breaking
17+
changes may be introduced. See the
18+
`Queryable Encryption Preview <https://www.mongodb.com/blog/post/mongodb-releases-queryable-encryption-preview/>`_
19+
blog post for more information.
1220
interface: phpmethod
1321
operation: ~
1422
optional: true

docs/tutorial/client-side-encryption.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,11 @@ Automatic Queryable Encryption
285285
.. note::
286286

287287
Automatic queryable encryption is an enterprise only feature and requires
288-
MongoDB 6.0+.
288+
MongoDB 6.0+. Queryable Encryption is in public preview and available for
289+
evaluation purposes. It is not yet recommended for production deployments as
290+
breaking changes may be introduced. See the
291+
`Queryable Encryption Preview <https://www.mongodb.com/blog/post/mongodb-releases-queryable-encryption-preview/>`_
292+
blog post for more information.
289293

290294
The following example uses a local key; however, other key providers such as AWS
291295
are also an option. The data in the ``encryptedIndexed`` and

0 commit comments

Comments
 (0)