edits

Author: norareidy

source/connection/connect.txt

@@ -4,6 +4,12 @@
 Connect to MongoDB
 ==================
 
+.. contents:: On this page
+   :local:
+   :backlinks: none
+   :depth: 1
+   :class: singlecol
+   
 .. facet::
    :name: genre
    :values: reference
@@ -218,21 +224,28 @@ introduced in Java 9.
 Which type of ``MongoClient`` should I use?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New applications generally use the
-``com.mongodb.client.MongoClient`` interface, which supports:
+New applications generally use the ``com.mongodb.client.MongoClient`` interface,
+which supports the following features:
 
-- Configuration with ``MongoClientSettings`` and ``ConnectionString``.  You can create instances of this interface via factory methods defined in the ``com.mongodb.client.MongoClients`` class.
-- CRUD API using ``MongoDatabase``, and from there, ``MongoCollection``
+- Configuration with ``MongoClientSettings`` and ``ConnectionString``.  You can create
+  instances of this interface by using factory methods defined in the ``com.mongodb.client.MongoClients``
+  class.
+- Access to the CRUD API by using ``MongoDatabase``, and from there, ``MongoCollection``.
 
-Use the ``com.mongodb.MongoClient`` class if you require support for the legacy API, which supports:
+Use the ``com.mongodb.MongoClient`` class if you require support for the legacy API, which supports
+the following features:
 
-- Configuration with ``MongoClientOptions`` and ``MongoClientURI``
-- CRUD API using ``DB``, and from there, ``DBCollection``.  You can access this API via the ``getDB()`` method.
+- Configuration by using ``MongoClientOptions`` and ``MongoClientURI``.
+- Access to the CRUD API by using ``DB``, and from there, ``DBCollection``.  You can access this API
+  by using the ``getDB()`` method.
 
-For applications that require a mix of the new and legacy APIs, ``com.mongodb.MongoClient`` also supports:
+For applications that require a mix of the new and legacy APIs, ``com.mongodb.MongoClient`` also supports
+the following features:
 
-- Configuration with ``MongoClientSettings`` and ``ConnectionString``, the only difference being that you create instances via constructors instead of a factory class.
-- CRUD API using ``MongoDatabase``, and from there, ``MongoCollection``.  You can access this API via the ``getDatabase()`` method.
+- Configuration by using ``MongoClientSettings`` and ``ConnectionString``, the only difference
+  being that you create instances via constructors instead of a factory class.
+- Access to the CRUD API using ``MongoDatabase``, and from there, ``MongoCollection``.  You can access this
+  API by using the ``getDatabase()`` method.
 
 How do I prevent the "java.lang.NoClassDefFoundError: com/mongodb/MongoClient" error?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/data-formats/document-data-format-bson.txt

@@ -93,14 +93,13 @@ your project by downloading the JAR file directly from the
 Frequently Asked Questions
 --------------------------
 
-This section answers questions that may arise about
-the BSON data format.
+This section answers questions that may arise when using the BSON data format.
 
 How do I prevent the "IllegalArgumentException: Invalid BSON field name" error?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Your application might throw this exception if you pass an incorrectly formatted
-document to an operation and you are using a driver version v4.7 or earlier.
+document to an operation and you are using {+driver-short+} v4.7 or earlier.
 
 .. note::
 
@@ -123,8 +122,8 @@ example:
 
 To avoid this error, use the builder class for the appropriate operation.
 The driver offers builder classes to create syntactically correct BSON for
-MongoDB operations. The prior example can be correctly expressed using
-the builder classes as shown in the following code example:
+MongoDB operations. The preceding example can be correctly expressed using
+the builder classes, as shown in the following code example:
 
 .. code-block:: java
    :emphasize-lines: 7
@@ -138,4 +137,4 @@ the builder classes as shown in the following code example:
 
    collection.updateOne(eq("name", "fizz"), set("name", "buzz"));
 
-To learn more about the available builders classes, see the :ref:`<java-builders>` documentation.
+To learn more about the available builders classes, see the :ref:`<java-builders>` guide.

source/data-formats/pojo-customization.txt

@@ -775,7 +775,8 @@ No, the ``PojoCodecProvider`` automatically generates an ObjectId.
 Can the ID field be a compound key?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Yes. For an example of this, see `our implementation <https://github.com/niccottrell/mongo-java-tests/blob/master/src/test/PojoCompoundIdTest.java>`_
+Yes. For an example of this, see `our implementation <https://github.com/niccottrell/mongo-java-tests/blob/master/src/test/PojoCompoundIdTest.java>`__
+in Github.
 
 Can I use polymorphism in a POJO accessor?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -786,8 +787,8 @@ Yes, by using a discriminator. For more information, see the :ref:`Discriminator
 Can I control serialization of ``LocalDate``?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Yes, the 3.7 Java driver adds native support for ``JSR-310 Instant``,
-``LocalDate`` & ``LocalDateTime``.
+Yes, the {+driver-short+} v3.7 adds native support for ``JSR-310 Instant``,
+``LocalDate`` and ``LocalDateTime``.
 
 Can I serialize a ``java.util.Date`` as a string in format **yyyy-mm-dd**?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -814,7 +815,7 @@ reflection if no public setter is available.
 Can I mix private, protected, and public setters and getters?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-No. The native POJO codec assumes that getters/setters have the same
+No. The native POJO codec assumes that getters and setters have the same
 modifiers for each field.
 
 For example, the following methods throws an exception during encoding:
@@ -828,12 +829,13 @@ How do I fix: "org.bson.codecs.configuration.CodecConfigurationException: Can't
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This exception means you must register a codec for the class since
-there is none at the moment.
+none exist.
 
 How do I specify the collection name for a particular POJO class? Is there an annotation?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-There is no annotation. We recommend adding a static string in your class as shown:
+There is no annotation. We recommend adding a static string in your class as shown
+in the following code:
 
 .. code-block:: java
 

source/versioning/legacy.txt

@@ -172,19 +172,19 @@ Frequently Asked Questions
 
 This section answers questions that may arise about the legacy API.
 
-How do I connect to my MongoDB instance with the legacy API?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How do I connect to my MongoDB instance by using the legacy API?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following example shows how to connect to a MongoDB instance with the
-legacy API and the current API.
-
-Imagine we are connecting to a collection that contains only this document:
+Imagine we are connecting to a collection that contains only the following document:
 
 .. code-block:: json
    :copyable: false
 
    {"_id": 1, "val": 1}
 
+The following example shows how to connect to this MongoDB collection by using
+the legacy API and the current API:
+
 .. tabs::
 
    .. tab:: Legacy API
@@ -227,10 +227,10 @@ see the following API documentation pages:
 See the :ref:`Migrate from the Legacy API <java-legacy-api>` page
 for a list of differences between the legacy and current API.
 
-How do I use the legacy ``MongoClientOptions`` and ``MongoClientURI`` Classes?
+How do I use the legacy ``MongoClientOptions`` and ``MongoClientURI`` classes?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Here is an example showing how to use the legacy ``MongoClientOptions`` and
+The following example shows how to use the legacy ``MongoClientOptions`` and
 ``MongoClientURI`` classes to set your write concern:
 
 .. tabs::
@@ -254,7 +254,7 @@ Here is an example showing how to use the legacy ``MongoClientOptions`` and
          :end-before: end current-api-mongoclientsettings-example
 
 For more information about the legacy classes and methods used in the preceding example,
-see the following API Documentation pages:
+see the following API documentation:
 
 - `Legacy API documentation <{+api+}/apidocs/mongodb-driver-legacy/index.html>`__
 - `MongoClient <{+api+}/apidocs/mongodb-driver-legacy/com/mongodb/MongoClient.html>`__