JT PR fixes 1

Author: rustagir

source/includes/write/bulk-write.php

@@ -61,7 +61,7 @@
 $bulkWrite = MongoDB\ClientBulkWrite::createWithCollection($restaurantCollection);
 $bulkWrite->insertOne(['name' => 'Mongo Deli', 'cuisine' => 'Sandwiches']);
 
-$bulkWrite = MongoDB\ClientBulkWrite::withCollection($movieCollection);
+$bulkWrite = $bulkWrite->withCollection($movieCollection);
 $bulkWrite->insertOne(['title' => 'The Green Ray', 'year' => 1986]);
 // end-bulk-client-insert-one
 
@@ -126,7 +126,7 @@
     ['upsert' => true],
 );
 
-$bulkWrite = MongoDB\ClientBulkWrite::withCollection($movieCollection);
+$bulkWrite = $bulkWrite->withCollection($movieCollection);
 $bulkWrite->insertOne(['title' => 'The Green Ray', 'year' => 1986]);
 $bulkWrite->deleteMany(
     ['title' => ['$regex' => 'd{2,}']],

source/reference/class/MongoDBBulkWriteCommandResult.txt

@@ -21,20 +21,24 @@ Methods
      - Description
 
    * - ``getInsertedCount()``
-     - | Returns the number of documents inserted, if any.
+     - | Returns the total number of documents inserted by all
+         insert operations in the bulk write command.
 
    * - ``getMatchedCount()``
-     - | Returns the number of documents matched during update and replace
-         operations, if applicable.
+     - | Returns the total number of documents matched by all
+         update and replace operations in the bulk write command.
 
    * - ``getModifiedCount()``
-     - | Returns the number of documents modified, if any.
+     - | Returns the total number of documents modified by all update
+         and replace operations in the bulk write command.
 
    * - ``getUpsertedCount()``
-     - | Returns the number of documents upserted, if any.
+     - | Returns the total number of documents upserted by all update
+         and replace operations in the bulk write command.
 
    * - ``getDeletedCount()``
-     - | Returns the number of documents deleted, if any.
+     - | Return the total number of documents deleted by all delete
+         operations in the bulk write command.
 
    * - ``getInsertResults()``
      - | Returns a map of results of each successful insert operation. Each
@@ -53,9 +57,10 @@ Methods
          a document with information corresponding to the operation.
 
    * - ``isAcknowledged()``
-     - | Returns a boolean indicating whether the bulk operation was acknowledged.
+     - | Returns a boolean indicating whether the bulk operation was
+         acknowledged by the server.
 
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/class/MongoDBClientBulkWrite.txt

@@ -9,11 +9,17 @@ Definition
 
 .. phpclass:: MongoDB\ClientBulkWrite
 
-   This class allows you to assemble a bulk write command to pass to
-   :phpmethod:`MongoDB\Client::bulkWrite()`.
+   This class enables you to assemble a bulk write command to pass to
+   :phpmethod:`MongoDB\Client::bulkWrite()` to perform write operations
+   across multiple namespaces.
 
-   This class allows you to specify write operations across multiple
-   namespaces in the same cluster.
+   This class is a builder to instantiate a :php:`BulkWriteCommand
+   <mongodb-driver-bulkwritecommand>` instance that the library sends to the
+   server.
+
+   Specify the ``writeConcern`` option as a top-level option to
+   :phpmethod:`MongoDB\Client::bulkWrite()` instead of in each
+   individual operation on this class.
 
 Methods
 -------
@@ -42,4 +48,4 @@ Methods
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClient-bulkWrite.txt

@@ -18,7 +18,7 @@ Definition
 
 .. phpmethod:: MongoDB\Client::bulkWrite()
 
-   Executes multiple write operations across multiple namespaces.
+   Perform multiple write operations across multiple namespaces.
 
    .. code-block:: php
 
@@ -30,21 +30,20 @@ Definition
 Parameters
 ----------
 
-``$bulk`` : :phpclass:`MongoDB\ClientBulkWrite` or ``BulkWriteCommand``
-  (reserve for use with the {+extension-short+} only)
+``$bulk`` : :phpclass:`MongoDB\ClientBulkWrite` or
+  :php:`BulkWriteCommand <mongodb-driver-bulkwritecommand>`
+
+  .. tip:: Prefer ClientBulkWrite API
+
+     We recommend using the ``ClientBulkWrite`` builder class and
+     methods to specify write operations in a bulk write command instead
+     of using the ``BulkWriteCommand`` class.
 
   Represents the assembled bulk write command or builder.
   :phpmethod:`MongoDB\Client::bulkWrite()` supports
-  :phpmethod:`MongoDB\Collection::deleteMany()`,
-  :phpmethod:`MongoDB\Collection::deleteOne()`,
-  :phpmethod:`MongoDB\Collection::insertOne()`,
-  :phpmethod:`MongoDB\Collection::replaceOne()`,
-  :phpmethod:`MongoDB\Collection::updateMany()`, and
-  :phpmethod:`MongoDB\Collection::updateOne()` operations.
-
-  The ``writeConcern`` option is specified as a top-level option to
-  :phpmethod:`MongoDB\Client::bulkWrite()` instead of each individual
-  operation.
+  ``deleteMany``, ``deleteOne()``, ``insertOne()``,
+  ``replaceOne()``, ``updateMany()``, and ``updateOne()``
+  operations.
 
 ``$options`` : array
   An array specifying the desired options.
@@ -89,7 +88,7 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide
 - :ref:`php-write`
 - :phpmethod:`MongoDB\Collection::deleteMany()`
 - :phpmethod:`MongoDB\Collection::deleteOne()`

source/reference/method/MongoDBClientBulkWrite-createWithCollection.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::createWithCollection()
 
-   Creates an instance of :phpclass:`MongoDB\ClientBulkWrite` from the provided
+   Create an instance of :phpclass:`MongoDB\ClientBulkWrite` from the provided
    :phpclass:`MongoDB\Collection` instance.
 
    .. code-block:: php
@@ -82,4 +82,4 @@ Errors/Exceptions
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-deleteMany.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::deleteMany()
 
-   Specifies a delete operation in the bulk write command for all
+   Specify a delete operation in the bulk write command for all
    matching documents. This method returns the
    :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
@@ -70,4 +70,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-deleteOne.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::deleteOne()
 
-   Specifies a delete operation in the bulk write command for the first
+   Specify a delete operation in the bulk write command for the first
    matching document. This method returns the
    :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
@@ -70,4 +70,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-insertOne.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::insertOne()
 
-   Specifies an insert operation in the bulk write command. This method
+   Specify an insert operation in the bulk write command. This method
    returns the :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
    .. code-block:: php
@@ -50,4 +50,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-replaceOne.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::replaceOne()
 
-   Specifies a replace operation in the bulk write command for the first
+   Specify a replace operation in the bulk write command for the first
    matching document. This method returns the
    :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
@@ -86,4 +86,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-updateMany.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::updateMany()
 
-   Specifies an update operation in the bulk write command for all
+   Specify an update operation in the bulk write command for all
    matching documents. This method returns the
    :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
@@ -93,4 +93,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-updateOne.txt

@@ -15,7 +15,7 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::updateOne()
 
-   Specifies an update operation in the bulk write command for the first
+   Specify an update operation in the bulk write command for the first
    matching document. This method returns the
    :phpclass:`MongoDB\ClientBulkWrite` instance on which its called.
 
@@ -95,4 +95,4 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBClientBulkWrite-withCollection.txt

@@ -15,10 +15,10 @@ Definition
 
 .. phpmethod:: MongoDB\ClientBulkWrite::withCollection()
 
-   Creates an instance of :phpclass:`MongoDB\ClientBulkWrite` from the provided
+   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
-   which the ``MongoDB\ClientBulkWrite`` was created with.
+   with which the ``MongoDB\ClientBulkWrite`` was created with.
 
    .. code-block:: php
 
@@ -28,14 +28,16 @@ Definition
 
 
    You cannot mix ``Collection`` instances associated with different
-   ``Manager`` objects.   
+   ``Manager`` objects because the library sends the client bulk
+   write operation as a command to a single server.
 
 Parameters
 ----------
 
 ``$collection`` : :phpclass:`MongoDB\Collection`
-  The ``Collection`` instance to set as the target for bulk write
-  operations.
+  The ``Collection`` instance to set as the target for write operations
+  added to the ``ClientBulkWrite`` instance after calling
+  ``withCollection()``.
 
 Errors/Exceptions
 -----------------
@@ -47,4 +49,4 @@ Errors/Exceptions
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-client-bulk-write` section of the Bulk Write Operations guide

source/reference/method/MongoDBCollection-bulkWrite.txt

@@ -147,7 +147,7 @@ Behavior
 See Also
 --------
 
-- :ref:`php-bulk-write`
+- :ref:`php-coll-bulk-write` section of the Bulk Write Operations guide
 - :ref:`php-write`
 - :phpmethod:`MongoDB\Collection::deleteMany()`
 - :phpmethod:`MongoDB\Collection::deleteOne()`

source/whats-new.txt

@@ -20,13 +20,27 @@ What's New
 Learn about new features, improvements, and fixes introduced in the
 following versions of the {+php-library+}:
 
+* :ref:`Version 2.1 <php-lib-version-2.1>`
 * :ref:`Version 2.0 <php-lib-version-2.0>`
 * :ref:`Version 1.21 <php-lib-version-1.21>`
 * :ref:`Version 1.20 <php-lib-version-1.20>`
 * :ref:`Version 1.19 <php-lib-version-1.19>`
 * :ref:`Version 1.18 <php-lib-version-1.18>`
 * :ref:`Version 1.17 <php-lib-version-1.17>`
 
+.. _php-lib-version-2.1:
+
+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
+  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.
+
 .. _php-lib-version-2.0:
 
 What's New in 2.0