Revert "Revert "(DOCSP-15244) Update BI diagrams (#300)" (#301)" (#303)

This reverts commit ac31293.

Author: zach-carr

source/connect/excel.txt

@@ -48,17 +48,17 @@ Prerequisites
 
               * - Return Value
                 - Meaning
-              * - ::
+              * - .. code-block:: none
 
                      Mach-O 64-bit executable x86_64
 
                 - 64-bit binary
-              * - ::
+              * - .. code-block:: none
 
                      Mach-O executable i386
 
                 - 32-bit binary
-              * - ::
+              * - .. code-block:: none
 
                      Mach-O 64-bit executable x86_64
                      Mach-O executable i386

source/images/bi-connector/cloud-bi-vert.png

@@ -17,7 +17,7 @@ username as URI-style query parameters:
 
        For authentication mechanisms such as ``PLAIN`` (LDAP) or
        ``GSSAPI`` (Kerberos) that delegate credential storage to other
-       services, set the :urioption:`source` value to ``$external``.
+       services, set the ``source`` value to ``$external``.
 
        Not required if :setting:`~security.defaultSource` is set in your
        |bi| :ref:`configuration file <config-format>`.

source/images/bi-connector/cloud-db-vert.png

@@ -19,7 +19,7 @@
 
       * - ``--name``
         - The name of the schema. To learn more about naming schemas,
-          see the :commandoption:`name-schema <mongodrdl --name-schema>`
+          see the :commandoption:`name-schema <name-schema>`
           command.
 
           *Required* if ``--schema`` is not specified.

source/images/bi-connector/cloud-none-vert.png

@@ -20,7 +20,7 @@
 
    .. note::
 
-      On UNIX and macOS platforms, you can issue a `SIGUSR1` signal to
+      On UNIX and macOS platforms, you can issue a ``SIGUSR1`` signal to
       restart the ``mongosqld`` process and rotate the logs.
 
 

source/images/bi-connector/cloud-onprem-vert.png

@@ -22,7 +22,7 @@
 
    .. note::
 
-      Instead of specifying a :urioption:`username` and :urioption:`password` in
+      Instead of specifying a ``username`` and ``password`` in
       your connection string, run :program:`mongosqld` with the :option:`--auth` option to
       direct :program:`mongosqld` to pass the authentication credentials provided by the
       SQL client to the MongoDB server.

source/includes/auth-options.rst

@@ -89,6 +89,7 @@ content: |
   :option:`--auth <mongosqld --auth>` option.
 
   .. figure:: /images/bi-connector/windows-odbc-dsn2.png
+     :alt: Windows ODBC DSN
      :figwidth: 550px
      :align: center
 
@@ -104,4 +105,4 @@ content: |
   instructions for connecting with :doc:`several applications
   </client-applications>` elsewhere in the |bi-short|
   documentation.
-...
+...

source/includes/options/commandoption-mongodrdl-delete.rst

@@ -132,7 +132,7 @@ content: |
      * - :setting:`net.ssl.clusterFile <net.tls.clusterFile>`
        - ``/opt/certs/mdb.pem``
 
-     * - :setting:`security.clusterAuthmode`
+     * - ``security.clusterAuthmode``
        - ``x509``
 
   .. example::

source/includes/options/option-mongosqld-logRotate.rst

@@ -30,7 +30,7 @@ stores no data, and purely serves to bridge your MongoDB cluster with
 business intelligence tools.
 
 .. figure:: /images/bi-connector/cloud-none-vert.png
-   :figwidth: 536px
+   :figwidth: 700px
    :align: center
    :alt: Diagram showing that other BI tools communicate with the DSN, which communicates with MongoDB's BI Connector, which in turn communicates with the MongoDB database.
 
@@ -78,7 +78,7 @@ with connection information that {+atlas+} provides.
 
 .. figure:: /images/bi-connector/cloud-bi-vert.png
    :alt: Hosted DB and BI Connector
-   :figwidth: 641px
+   :figwidth: 700px
    :align: center
 
 Hosted Database and On Premises |bi-short|
@@ -93,7 +93,7 @@ the BI Connector's :doc:`mongosqld process </reference/mongosqld>`.
 
 .. figure:: /images/bi-connector/cloud-db-vert.png
    :alt: On Premises DB and Local BI Connector
-   :figwidth: 678px
+   :figwidth: 700px
    :align: center
 
 On Premises Database and |bi-short|
@@ -106,7 +106,7 @@ server address.
 
 .. figure:: /images/bi-connector/cloud-onprem-vert.png
    :alt: On Premises DB and BI Connector
-   :figwidth: 570px
+   :figwidth: 700px
    :align: center
 
 Local Database and |bi-short|

source/includes/options/option-mongosqld-mongo-uri.rst

@@ -223,7 +223,7 @@ Install ``mongosqld`` as a System Service
        content: |
 
 |bi-short| requires a configuration file with the
-:setting:`~mongosqld.systemLog.path` setting specified when running as a
+``mongosqld.systemLog.path`` setting specified when running as a
 system service. Using your preferred text editor, create a
 ``mongosqld.conf`` file. To review the configuration file options,
 see :ref:`Configuration File <config-format>`. For example:

source/includes/steps-local-quickstart.yaml

@@ -70,14 +70,14 @@ with the following cases:
        values or integers, |bi-short| uses type ``numeric``.
 
    * - Dates
-     - |bi-short| treats any field of type :bsontype:`data_date` as the
+     - |bi-short| treats any field of type ``data_date`` as the
        :term:`SQL` ``timestamp`` type.
 
    * - Timestamps
-     - |bi-short| ignores any field of type :bsontype:`data_timestamp`.
+     - |bi-short| ignores any field of type ``data_timestamp``.
 
    * - ObjectID
-     - |bi-short| treats any field of type :bsontype:`data_oid` as
+     - |bi-short| treats any field of type ``data_oid`` as
        the SQL type ``varchar``.
 
    * - UUID
@@ -432,4 +432,4 @@ This pipeline uses :pipeline:`$unwind` to create a new record for each
 member of ``familyMembers``. The schema tracks the array index in
 the field ``familyMembers_idx``.
 
-.. include:: /includes/geospatial-data.rst
+.. include:: /includes/geospatial-data.rst

source/includes/steps-mac-ssl-config.yaml

@@ -27,8 +27,8 @@ required MongoDB :manual:`privilege action </reference/privilege-actions>`:
      - MySQL Privilege
      - MongoDB Privilege
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/flush.html">FLUSH LOGS</link></mono>`
-     - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_reload">RELOAD</link></mono>`
+   * - `FLUSH LOGS <https://dev.mysql.com/doc/refman/5.7/en/flush.html>`__
+     - `RELOAD <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_reload>`__
      - Only available to the |bi-short|'s admin user specified by the
        :option:`--mongo-username <mongosqld --mongo-username>` option or
        the :setting:`mongodb.net.auth.username` setting.
@@ -57,11 +57,11 @@ required MongoDB :manual:`privilege action </reference/privilege-actions>`:
          database specified by
          :option:`--schemaSource <mongosqld --schemaSource>`
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/kill.html">KILL</link></mono>`
-     - - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_process">PROCESS</link></mono>`
+   * - `KILL <https://dev.mysql.com/doc/refman/5.7/en/kill.html>`__
+     - - `PROCESS <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_process>`__
          privilege to view all threads
 
-       - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super">SUPER</link></mono>`
+       - `SUPER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super>`__
          privilege to kill all threads and statements
 
        - No privilege required to view and kill your own threads and
@@ -71,19 +71,19 @@ required MongoDB :manual:`privilege action </reference/privilege-actions>`:
 
        - No privilege required to kill your own connection or query
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/alter-table.html">ALTER TABLE</link></mono>`
-     - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter">ALTER</link></mono>`,
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_create">CREATE</link></mono>`,
-       and :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_insert">INSERT</link></mono>`
+   * - `ALTER TABLE <https://dev.mysql.com/doc/refman/5.7/en/alter-table.html>`__
+     - `ALTER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter>`__,
+       `CREATE <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_create>`__,
+       and `INSERT <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_insert>`__
        privileges for the table.
 
        Renaming a table requires
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter">ALTER</link></mono>`
-       and :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_drop">DROP</link></mono>`
+       `ALTER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter>`__
+       and `DROP <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_drop>`__
        on the old table, as well as
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter">ALTER</link></mono>`,
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_create">CREATE</link></mono>`,
-       and :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_insert">INSERT</link></mono>`
+       `ALTER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_alter>`__,
+       `CREATE <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_create>`__,
+       and `INSERT <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_insert>`__
        on the new table.
      - Depends on your
        :ref:`sampling configuration <sampling-mode-chart>`: 
@@ -103,14 +103,14 @@ required MongoDB :manual:`privilege action </reference/privilege-actions>`:
        database specified by
        :option:`--schemaSource <mongosqld --schemaSource>`.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/set-variable.html">SET (Variables)</link></mono>`
-     - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super">SUPER</link></mono>`
+   * - `SET (Variables) <https://dev.mysql.com/doc/refman/5.7/en/set-variable.html>`__ 
+     - `SUPER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super>`__ 
        privilege is required to set global variables.
 
        Setting a session variable generally does not require any
        privilege, although there are exceptions that require the
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super">SUPER</link></mono>`
-       privilege (such as :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_sql_log_bin">sql_log_bin</link></mono>`).
+       `SUPER <https://dev.mysql.com/doc/refman/5.7/en/privileges-provided.html#priv_super>`__ 
+       privilege (such as `sql_log_bin <https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_sql_log_bin>`__).
      - Either the |bi-short|'s admin user, as specified by the
        :option:`--mongo-username <mongosqld --mongo-username>` option or
        the :setting:`mongodb.net.auth.username` setting, or any MongoDB
@@ -119,63 +119,63 @@ required MongoDB :manual:`privilege action </reference/privilege-actions>`:
 
        No privilege required to set session variables.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-character-set.html">SHOW CHARACTER SET</link></mono>`
+   * - `SHOW CHARACTER SET <https://dev.mysql.com/doc/refman/5.7/en/show-character-set.html>`__
      - No privilege required.
      - No privilege required.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-collation.html">SHOW COLLATION</link></mono>`
+   * - `SHOW COLLATION <https://dev.mysql.com/doc/refman/5.7/en/show-collation.html>`__
      - No privilege required.
      - No privilege required.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-columns.html">SHOW COLUMNS</link></mono>`
+   * - `SHOW COLUMNS <https://dev.mysql.com/doc/refman/5.7/en/show-columns.html>`__
      - Displays column information for each column where the user
        has some privilege. Column information is not
        displayed for columns where the user does not have some
        privilege.
      - :authaction:`find` on the proper collections.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-create-database.html">SHOW CREATE DATABASE</link></mono>`
+   * - `SHOW CREATE DATABASE <https://dev.mysql.com/doc/refman/5.7/en/show-create-database.html>`__
      - No privilege required.
      - :authaction:`find` on the proper database.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-create-table.html">SHOW CREATE TABLE</link></mono>`
+   * - `SHOW CREATE TABLE <https://dev.mysql.com/doc/refman/5.7/en/show-create-table.html>`__
      - Some privilege for the table.
      - :authaction:`find` on the proper database or collection.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-databases.html">SHOW {DATABASES | SCHEMAS}</link></mono>`
-     - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-create-table.html">SHOW DATABASES</link></mono>` privilege.
+   * - `SHOW {DATABASES | SCHEMAS} <https://dev.mysql.com/doc/refman/5.7/en/show-databases.html>`__
+     - `SHOW DATABASES <https://dev.mysql.com/doc/refman/5.7/en/show-create-table.html>`__ privilege.
      - :authaction:`find` on the proper database or collection.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-index.html">SHOW {INDEX | INDEXES | KEYS}</link></mono>`
+   * - `SHOW {INDEX | INDEXES | KEYS} <https://dev.mysql.com/doc/refman/5.7/en/show-index.html>`__ 
      - This statement requires some privilege for any column in the table.
      - :authaction:`find` on the proper collection.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-processlist.html">SHOW PROCESSLIST</link></mono>`
-     - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html#priv_process">PROCESS</link></mono>`
+   * - `SHOW PROCESSLIST <https://dev.mysql.com/doc/refman/5.7/en/show-processlist.html>`__ 
+     - `PROCESS <https://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html#priv_process>`__ 
        privilege to view all processes.
 
        No privilege required to view your own processes.
      - :authaction:`inprog` to view all processes.
 
        No privilege required to view your own processes.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-status.html">SHOW STATUS</link></mono>`
+   * - `SHOW STATUS <https://dev.mysql.com/doc/refman/5.7/en/show-status.html>`__ 
      - No privilege required.
      - No privilege required.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-tables.html">SHOW TABLES</link></mono>`
+   * - `SHOW TABLES <https://dev.mysql.com/doc/refman/5.7/en/show-tables.html>`__ 
      - Lists non-temporary tables in a given database where the user has
        some privilege.
 
        If you do not have any privilege for a base table or view, it
        does not show up in the output from
-       :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-tables.html">SHOW TABLES</link></mono>`.
+       `SHOW TABLES <https://dev.mysql.com/doc/refman/5.7/en/show-tables.html>`__ .
      - :authaction:`listCollections` on a database displays all tables
        from that database.
 
        :authaction:`find` on a collection only shows the tables from
        that collection.
 
-   * - :xml:`<mono><link target="https://dev.mysql.com/doc/refman/5.7/en/show-variables.html">SHOW VARIABLES</link></mono>`
+   * - `SHOW VARIABLES <https://dev.mysql.com/doc/refman/5.7/en/show-variables.html>`__ 
      - No privilege required.
      - No privilege required.

source/includes/styles/corrections.rst

@@ -267,7 +267,7 @@ functions and query shapes.
   subqueries.
 
 - Improves truncate pushdown coverage and updated the translation to use
-  :operator:`$trunc` with MongoDB versions 4.1.9 and later.
+  ``$trunc`` with MongoDB versions 4.1.9 and later.
 
 - Adds pushdown support for the ``char`` and ``str_to_date`` functions.
 
@@ -392,7 +392,7 @@ Chages/Deprecations
 
 - Deprecates schema-modification support via ``ALTER TABLE``, as well as
   the ``enable_table_alterations`` :ref:`system variable <system-environment-variables>` and
-  :xml:`<mono><link target="https://docs.mongodb.com/manual/reference/configuration-options/#setparameter-option">setParameter</link></mono>`.
+  :manual:`setParameter </reference/configuration-options/#setparameter-option/>`  
 
 .. _bi-2-10-0:
 
@@ -583,7 +583,7 @@ Features and Performance Improvements
 
 - Improve filter optimization for MongoDB versions 3.6 and later
 
-- Expose :xml:`<mono><ref target="type-conversion-modes">type_conversion_mode</ref></mono>`
+- Expose :ref:`type_conversion_mode <type-conversion-modes>`
   in configuration parameters
 
 - Cache catalog columns for quicker lookup
@@ -634,7 +634,7 @@ We encourage :doc:`Tableau <connect/tableau>` users running BIC 2.6.0 to upgrade
 *Released Sep 04, 2018*
 
 - Added
-  :xml:`<mono><ref target="information-functions">EXPLAIN()</ref></mono>`
+  :ref:`EXPLAIN() <information-functions>`
   support.
 
 - Push down :doc:`type conversions <reference/type-conversion>` to