DOCSP-44608: merge v2 into master

source/reference/class/MongoDBModelCollectionInfo.txt

@@ -7,9 +7,10 @@ Definition
 
 .. phpclass:: MongoDB\Model\CollectionInfo
 
-   This class models information about a collection. Instances of this class are
-   stored in an :php:`Iterator <manual/en/class.iterator.php>`
-   returned by :phpmethod:`MongoDB\Database::listCollections()`.
+   This class models information about a collection. Instances of this
+   class are returned by traversing an :php:`Iterator
+   <manual/en/class.iterator.php>`, which is returned by the
+   :phpmethod:`MongoDB\Database::listCollections()` method.
 
 .. versionchanged:: 1.4
 

source/reference/class/MongoDBModelDatabaseInfo.txt

@@ -7,9 +7,10 @@ Definition
 
 .. phpclass:: MongoDB\Model\DatabaseInfo
 
-   This class models information about a database. Instances of this class are
-   stored in an :php:`Iterator <manual/en/class.iterator.php>`
-   returned by :phpmethod:`MongoDB\Client::listDatabases()`.
+   This class models information about a database. Instances of this
+   class are returned by traversing an :php:`Iterator
+   <manual/en/class.iterator.php>`, which is returned by the
+   :phpmethod:`MongoDB\Client::listDatabases()` method.
 
 .. versionchanged:: 1.4
 

source/reference/class/MongoDBModelIndexInfo.txt

@@ -7,9 +7,10 @@ Definition
 
 .. phpclass:: MongoDB\Model\IndexInfo
 
-   This class models information about an index. Instances of this class are
-   stored in an :php:`Iterator <manual/en/class.iterator.php>`
-   returned by :phpmethod:`MongoDB\Collection::listIndexes()`.
+   This class models information about an index. Instances of this
+   class are returned by traversing an :php:`Iterator
+   <manual/en/class.iterator.php>`, which is returned by the
+   :phpmethod:`MongoDB\Collection::listIndexes()` method.
 
    This class implements PHP's :php:`ArrayAccess <arrayaccess>` interface. This
    provides a mechanism for accessing index fields for which there exists no

source/reference/method/MongoDBClient-listDatabases.txt

@@ -76,7 +76,7 @@ Return Values
 -------------
 
 An :php:`Iterator <manual/en/class.iterator.php>`
-instance, which contains a :phpclass:`MongoDB\Model\DatabaseInfo` object
+instance, which provides a :phpclass:`MongoDB\Model\DatabaseInfo` object
 for each database on the server.
 
 Errors/Exceptions

source/reference/method/MongoDBCollection-listIndexes.txt

@@ -55,7 +55,7 @@ Return Values
 -------------
 
 An :php:`Iterator <manual/en/class.iterator.php>`
-instance, which contains a :phpclass:`MongoDB\Model\IndexInfo` object
+instance, which provides a :phpclass:`MongoDB\Model\IndexInfo` object
 for each index for the collection.
 
 Errors/Exceptions

source/reference/method/MongoDBDatabase-listCollections.txt

@@ -73,7 +73,7 @@ Return Values
 -------------
 
 An :php:`Iterator <manual/en/class.iterator.php>`
-instance, which contains a :phpclass:`MongoDB\Model\CollectionInfo`
+instance, which provides a :phpclass:`MongoDB\Model\CollectionInfo`
 object for each collection in the database.
 
 Example

source/whats-new.txt

@@ -53,8 +53,8 @@ What's New in 2.0
    :ref:`Version 2.0 Breaking Changes <php-v2-breaking-changes>` section
    in the Upgrade Library Versions guide.
 
-The {+library-short+} v2.0 release includes the following features,
-improvements, and fixes:
+The {+library-short+} v2.0 release includes the following API changes
+and removals:
 
 - Removes deprecated fields in GridFS types.
 
@@ -65,7 +65,7 @@ improvements, and fixes:
 
   - The fields ``contentType`` and ``aliases`` are no longer stored in
     the ``files`` GridFS collection. If your application requires this
-    information, you must store it in metadata. To learn mor about
+    information, you must store it in metadata. To learn More about
     GridFS, see the :ref:`php-gridfs` guide.
 
 - Removes the following deprecated options for find operations:
@@ -105,7 +105,7 @@ improvements, and fixes:
   The :phpmethod:`MongoDB\Client::listDatabases()`,
   :phpmethod:`MongoDB\Database::listCollections()`, and
   :phpmethod:`MongoDB\Collection::listIndexes()` methods return a
-  general traversable ``Iterator`` instance that contains the corresponding
+  general traversable ``Iterator`` instance that provides the corresponding
   results.
 
 .. _php-lib-version-1.20: