JT PR fixes 3

Author: rustagir

composer/composer.json

@@ -2,8 +2,8 @@
   "name": "mongodb/docs-php-library",
   "description": "MongoDB PHP Library Documentation",
   "require": {
-    "ext-mongodb": "^2.0",
-    "mongodb/mongodb": "^2.0"
+    "ext-mongodb": "^2.1",
+    "mongodb/mongodb": "^2.1"
   },
   "require-dev": {
     "doctrine/coding-standard": "^12.0",

source/reference/method/MongoDBClientBulkWrite-createWithCollection.txt

@@ -15,8 +15,11 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::createWithCollection()
 
-   Create an instance of :phpclass:`MongoDB\ClientBulkWrite` from the provided
-   :phpclass:`MongoDB\Collection` instance.
+   Create an instance of the :phpclass:`MongoDB\ClientBulkWrite` builder
+   from the provided :phpclass:`MongoDB\Collection` instance. You can
+   add write operations to the ``ClientBulkWrite`` to create a new
+   :php:`BulkWriteCommand <mongodb-driver-bulkwritecommand>` that the
+   library sends to the server.
 
    .. code-block:: php
 
@@ -52,8 +55,6 @@ Parameters
        - mixed
        - .. include:: /includes/extracts/common-option-comment.rst
 
-         .. include:: /includes/extracts/option-requires-4.4.rst
-
      * - let
        - array|object
        - .. include:: /includes/extracts/common-option-let.rst

source/reference/method/MongoDBClientBulkWrite-deleteMany.txt

@@ -51,8 +51,6 @@ Parameters
        - string|array|object
        - .. include:: /includes/extracts/common-option-hint.rst
 
-         .. include:: /includes/extracts/option-requires-4.4.rst
-
 Errors/Exceptions
 -----------------
 

source/reference/method/MongoDBClientBulkWrite-deleteOne.txt

@@ -51,8 +51,6 @@ Parameters
        - string|array|object
        - .. include:: /includes/extracts/common-option-hint.rst
 
-         .. include:: /includes/extracts/option-requires-4.4.rst
-
 Errors/Exceptions
 -----------------
 

source/reference/method/MongoDBClientBulkWrite-replaceOne.txt

@@ -55,8 +55,6 @@ Parameters
        - string|array|object
        - .. include:: /includes/extracts/common-option-hint.rst
 
-         .. include:: /includes/extracts/option-requires-4.2.rst
-
      * - sort
        - array|object
        - The sort specification for the ordering of the matched

source/reference/method/MongoDBClientBulkWrite-updateMany.txt

@@ -36,9 +36,8 @@ Parameters
 ``$update`` : array|object
   Specifies the field and value combinations to update and any relevant update
   operators. ``$update`` uses MongoDB's :manual:`update operators </reference/operator/update>`.
-  Starting with MongoDB 4.2, you can pass an :manual:`aggregation pipeline
-  </reference/command/update/#update-with-an-aggregation-pipeline>`
-  as this parameter.
+  You can pass an :manual:`aggregation pipeline
+  </reference/command/update/#update-with-an-aggregation-pipeline>` as this parameter. 
 
 ``$options`` : array
   An array specifying the desired options.
@@ -68,8 +67,6 @@ Parameters
        - string|array|object
        - .. include:: /includes/extracts/common-option-hint.rst
 
-         .. include:: /includes/extracts/option-requires-4.2.rst
-
      * - upsert
        - boolean
        - If set to ``true``, creates a new document when no document matches the

source/reference/method/MongoDBClientBulkWrite-updateOne.txt

@@ -36,9 +36,9 @@ Parameters
 ``$update`` : array|object
   Specifies the field and value combinations to update and any relevant update
   operators. ``$update`` uses MongoDB's :manual:`update operators
-  </reference/operator/update>`. Starting with MongoDB 4.2, an `aggregation
-  pipeline <https://mongodb.com/docs/master/reference/command/update/#update-with-an-aggregation-pipeline>`_
-  can be passed as this parameter.
+  </reference/operator/update>`. You can pass an :manual:`aggregation pipeline
+  </reference/command/update/#update-with-an-aggregation-pipeline>` as
+  this parameter.
 
 ``$options`` : array
   An array specifying the desired options.
@@ -64,8 +64,6 @@ Parameters
        - string|array|object
        - .. include:: /includes/extracts/common-option-hint.rst
 
-         .. include:: /includes/extracts/option-requires-4.2.rst
-
      * - sort
        - array|object
        - The sort specification for the ordering of the matched

source/reference/method/MongoDBClientBulkWrite-withCollection.txt

@@ -15,10 +15,15 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::withCollection()
 
-   Return an instance of :phpclass:`MongoDB\ClientBulkWrite` from the provided
-   :phpclass:`MongoDB\Collection` instance. This method allows you to
-   add subsequent write operations on a different collection than that
-   with which the ``MongoDB\ClientBulkWrite`` was created with.
+   Return an updated instance of :phpclass:`MongoDB\ClientBulkWrite`
+   from the provided :phpclass:`MongoDB\Collection` instance. This
+   method allows you to add subsequent write operations on a different
+   collection than that with which the ``ClientBulkWrite`` was created
+   with.
+
+   This method does not build a new :php:`BulkWriteCommand
+   <mongodb-driver-bulkwritecommand>` and does not edit the
+   ``ClientBulkWrite`` instance in place.
 
    .. code-block:: php
 

source/whats-new.txt

@@ -36,7 +36,7 @@ What's New in 2.1
 The {+library-short+} v2.1 release includes the following features,
 improvements, and fixes:
 
-- Implements a *client* bulk write API that allows you to perform write
+- Adds a *client* bulk write API to perform write
   operations on multiple databases and collections in the same call. To learn
   more about this feature, see the :ref:`php-client-bulk-write`
   section of the Bulk Write Operations guide.