DOCSP-2355: Copy reviews and wordsmithing and single-sourcing (oh my) (#65)

* DOCSP-2355: wordsmithing and tidying up

* DOCSP-2355: clarify embedded docs language, cleanup

Author: schmalliso

conf.py

@@ -70,7 +70,8 @@
     'csharp-api': ('https://mongodb.github.io/mongo-csharp-driver/2.5/apidocs/html/%s.htm', ''),
     'csharp-docs': ('https://mongodb.github.io/mongo-csharp-driver/2.5/reference/%s', ''),
     'java-async-docs': ('http://mongodb.github.io/mongo-java-driver/3.7/%s', ''),
-    'java-async-api': ('http://mongodb.github.io/mongo-java-driver/3.7/javadoc/%s', '')
+    'java-async-api': ('http://mongodb.github.io/mongo-java-driver/3.7/javadoc/%s', ''),
+    'java-sync-api': ('http://mongodb.github.io/mongo-java-driver/3.7/javadoc/%s', ''),
 }
 
 intersphinx_mapping = {}

config/build_conf.yaml

@@ -27,7 +27,6 @@ system:
     - 'integration.yaml'
     - 'sphinx_local.yaml'
 
-
 assets:
   - branch: master
     path: build/docs-tools

config/intersphinx.yaml

@@ -2,10 +2,6 @@ name: mongodb
 url: https://docs.mongodb.com/manual/
 path: mongodb.inv
 ---
-name: python
-url: https://docs.python.org/2/
-path: python2.inv
----
 name: pymongo
 url: https://api.mongodb.com/python/current/
 path: pymongo.inv
@@ -17,4 +13,8 @@ path: motor.inv
 name: phplib
 url: https://docs.mongodb.com/php-library/master/
 path: phplib.inv
+---
+name: compass
+url: https://docs.mongodb.com/compass/current/
+path: objects.inv
 ...

source/guides/server/delete.txt

@@ -18,12 +18,12 @@
      In this guide, you will delete documents from a MongoDB database.
    time: 10
    prerequisites:
-     .. include:: /includes/prereqs_read_CRUD.rst
+     - .. include:: /includes/prereqs_read_CRUD.rst
 
      - Complete the :doc:`/guides/server/import` guide so that there
        is data in your database to delete.
    check_your_environment:
-     NA.
+     .. include:: /includes/check_for_drivers_install.rst
    procedure:
      .. include:: /includes/steps/delete_server.rst
    summary:

source/guides/server/drivers.txt

@@ -14,21 +14,18 @@
 
    product_version: 3.6
    result_description:
-
-     There are several ways to connect to your MongoDB instances.  This
-     guide steps you through the installation of the MongoDB shell, compass, and
-     various MongoDB drivers.
-
+     There are several ways to connect to your MongoDB instances. The
+     following guide steps you through installing the
+     :binary:`~bin.mongo` shell, MongoDB Compass, and the MongoDB
+     drivers, and shows you how to connect your client to a MongoDB 
+     deployment.
    time: 15
    prerequisites:
-
-     .. include:: /includes/prereqs_drivers_install.rst
-
+     .. include:: /includes/steps/prereqs_mtools.rst
    check_your_environment:
-
-     - Ensure that your client platform is compatible with MongoDB.  See MongoDB
-       :ref:`Supported Platforms <mongodb-supported-platforms>`.
-
+     - Ensure that your client platform is compatible with MongoDB. 
+       Refer to the :ref:`Supported Platforms <mongodb-supported-platforms>`
+       table for more information.
    procedure:
 
      .. include:: /includes/steps/drivers_install_gs.rst

source/guides/server/import.txt

@@ -1,23 +1,27 @@
 .. guide::
-   title: Importing Data Into MongoDB
+   title: Import Data into MongoDB
    author: assorted
    type: Getting Started
    level: beginner
    product_version: 3.6
    result_description:
-     You can bulk import data into MongoDB using the :binary:`~bin.mongoimport` binary distributed with the server.
+     In this guide, you will use the
+     :binary:`~bin.mongoimport` tool distributed with MongoDB
+     to bulk import data into your MongoDB instance.
    time: 15
    prerequisites:
      .. include:: /includes/steps/prereqs_mtools.rst
    check_your_environment:
+     .. include:: /includes/check_for_drivers_install.rst
    procedure:
      .. include:: /includes/steps/import.rst
    summary:
-     If you have successfully completed this guide, you have imported your first MongoDB data.
-     Now in the next guide, you will retrieve the information you just imported.
+     If you have successfully completed this guide, you have imported
+     your first MongoDB data. In the next guide, you will retrieve
+     the documents that you just imported.
    whats_next:
-     In this guide, you will read all documents from a collection in the MongoDB database.
-
+     In this guide, you will retrieve all of the documents in a
+     collection in your MongoDB database.
      * :doc:`Read Data From MongoDB </guides/server/read_queries>`
    seealso:
      For CRUD guides:

source/guides/server/insert.txt

@@ -1,5 +1,5 @@
 .. guide::
-   title: Insert Data Into MongoDB
+   title: Insert Data into MongoDB
    author: MongoDB
    type: Getting Started
    level: beginner

source/guides/server/install.txt

@@ -9,10 +9,10 @@
      This guide describes how to install MongoDB.
    time: 10
    prerequisites:
-     - MongoDB supports a variety of 64-bit platforms. Refer to the
-       :ref:`Supported Platforms <mongodb-supported-platforms>` table to
-       verify that MongoDB is supported on the platform to which you
-       wish to install it.
+     MongoDB supports a variety of 64-bit platforms. Refer to the
+     :ref:`Supported Platforms <mongodb-supported-platforms>` table to
+     verify that MongoDB is supported on the platform to which you wish
+     to install it.
    procedure:
      Install MongoDB
      ~~~~~~~~~~~~~~~

source/guides/server/read.txt

@@ -22,9 +22,10 @@
    procedure:
      .. include:: /includes/steps/read_server.rst
    summary:
-     If you have successfully completed this guide, you have retrieved data from MongoDB.
-     Now in the next guide, you will find data in your database table that matches certain
-     criteria using queries.
+     If you have successfully completed this guide, you have retrieved
+     data from MongoDB. Now in the next guide, you will use queries to
+     find data in your :term:`collection` that matches specified
+     criteria.
    whats_next:
      In the next guide, you'll learn how to retrieve data from MongoDB using criteria.
 

source/guides/server/update.txt

@@ -12,18 +12,17 @@
      motor
      nodejs
      java-sync
-     java-async
      csharp
    result_description:
      In this guide, you will update documents in a MongoDB database.
    time: 10
    prerequisites:
-     .. include:: /includes/prereqs_read_CRUD.rst
-
+     - .. include:: /includes/prereqs_read_CRUD.rst
+     
      - Complete the :doc:`/guides/server/import` guide so that there
        is data in your database to update.
-   check_your_environment:
-     NA.
+   check_you_environment:
+     .. include:: /includes/check_for_drivers_install.rst
    procedure:
      .. include:: /includes/steps/update_server.rst
    summary: