DOCSP-37869 Final Cleanup (#84)

Author: jordan-smith721

source/connect.txt

@@ -24,6 +24,7 @@ Connect to MongoDB
 
    /connect/mongoclient
    /connect/connection-targets
+   /connect/connection-options
    /connect/tls
    /connect/network-compression
    /connect/server-selection

source/connect/connection-options.txt

@@ -1,8 +1,8 @@
 .. _pymongo-connection-options:
 
-==================
-Connection Options
-==================
+==========================
+Specify Connection Options
+==========================
 
 .. contents:: On this page
    :local:

source/data-formats.txt

@@ -21,9 +21,19 @@ Specialized Data Formats
    :titlesonly:
    :maxdepth: 1
 
+   /data-formats/custom-types
+   /data-formats/dates-and-times
    /data-formats/uuid
 
-- :ref:`pymongo-uuid`
-
 Overview
---------
+--------
+
+You can use several types of specialized data formats in your {+driver-short+}
+application. To learn how to work with these data formats, see the following
+sections:
+
+- Learn how to encode and decode custom types in the :ref:`pymongo-custom-types` guide.
+- Learn how to work with Python ``datetime`` objects in {+driver-short+} in the
+  :ref:`pymongo-dates-times` guide.
+- Learn about UUIDs and how to maintain cross-language compatibility while
+  working with them in the :ref:`pymongo-uuid` guide.

source/data-formats/uuid.txt

@@ -357,30 +357,7 @@ This will be true if both of the following criteria are met:
 Troubleshooting
 ---------------
 
-ValueError: cannot encode native uuid.UUID with UuidRepresentation.UNSPECIFIED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This error results from trying to encode a native ``UUID`` object to a ``Binary`` object
-when the UUID representation is ``UNSPECIFIED``, as shown in the following code
-example:
-
-.. code-block:: python
-
-  unspecified_collection.insert_one({'_id': 'bar', 'uuid': uuid4()})
-  Traceback (most recent call last):
-  ...
-  ValueError: cannot encode native uuid.UUID with UuidRepresentation.UNSPECIFIED.
-  UUIDs can be manually converted to bson.Binary instances using bson.Binary.from_uuid()
-  or a different UuidRepresentation can be configured. See the documentation for
-  UuidRepresentation for more information.
-
-Instead, you must explicitly convert a native UUID to a ``Binary`` object by using the
-``Binary.from_uuid()`` method, as shown in the following example:
-
-.. code-block:: python
-
-  explicit_binary = Binary.from_uuid(uuid4(), UuidRepresentation.STANDARD)
-  unspec_collection.insert_one({'_id': 'bar', 'uuid': explicit_binary})
+.. include:: /includes/troubleshooting/uuid.rst
 
 API Documentation
 -----------------

source/fundamentals.txt

@@ -1,8 +1,8 @@
 .. _pymongo-get-started:
 
-===========
-Get Started
-===========
+========================
+Get Started with {+driver-short+}
+========================
 
 .. contents:: On this page
    :local:

source/get-started.txt

@@ -13,9 +13,8 @@ The connection string includes the hostname or IP address and
 port of your deployment, the authentication mechanism, user credentials 
 when applicable, and connection options.
 
-.. TODO: Link to other connection options pages
-.. To connect to an instance or deployment not hosted on Atlas, see
-.. :ref:`Other Ways to Connect to MongoDB <pymongo-other-ways-to-connect>`.
+To connect to an instance or deployment not hosted on Atlas, see
+:ref:`pymongo-connection-targets`.
 
 .. procedure::
    :style: connected

source/get-started/create-a-connection-string.txt

@@ -18,7 +18,7 @@ Python 3
      - CPython 3.4
      - PyPy3
 
-   * - 4.5 to 4.6
+   * - 4.5 to 4.7
      - ✓
      - ✓
      - ✓

source/includes/language-compatibility-table-pymongo.rst

@@ -12,7 +12,7 @@
      - MongoDB 4.0
      - MongoDB 3.6
 
-   * - 4.4 to 4.6
+   * - 4.4 to 4.7
      - ✓
      - ✓
      - ✓

source/includes/mongodb-compatibility-table-pymongo.rst

@@ -1,3 +1,17 @@
+Server Reports Wire Version X, PyMongo Requires Y
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you try to connect to MongoDB Server v3.4 or earlier,
+{+driver-short+} might raise the following error:
+
+.. code-block:: 
+
+   pymongo.errors.ConfigurationError: Server at localhost:27017 reports wire version 5, but this version of PyMongo requires at least 6 (MongoDB 3.6).
+
+This occurs when the driver version is too new for the server it's connecting to.
+To resolve this issue, upgrade your MongoDB deployment to v3.6 or later, or downgrade to
+{+driver-short+} v3.x, which supports MongoDB Server v2.6 and later.
+
 AutoReconnect
 ~~~~~~~~~~~~~