DOCSP-20812 cleanup (#193)

* cleanup tasks

Author: kyuan-mongodb

source/atlas/cluster.txt

@@ -36,35 +36,32 @@ Procedure
 .. procedure::
    :style: normal
 
-   .. step:: Navigate to the Database Deployments page for your project.
+   .. step:: Navigate to the {+db-deployments+} page for your project.
 
-      .. procedure::
-         :style: connected
+   .. step:: Open the Build a Database dialog.
 
-         .. step:: If it is not already displayed, select the
-            organization that contains your desired project from the
-            :guilabel:`Organizations` menu in the navigation bar.
+      Click the :guilabel:`Build a Database` button to display the
+      :guilabel:`Deploy a cloud database` dialog.
 
-         .. step:: If it is not already displayed, select your desired
-            project from the :guilabel:`Projects` menu in the
-            navigation bar.
-
-         .. step:: If the :guilabel:`Database Deployments` page is not
-            already displayed, click :guilabel:`Databases` in the
-            sidebar.
-
-   .. step:: Open the Create New Cluster dialog.
-
-      Click the :guilabel:`Create` button to display the
-      :guilabel:`Create New Cluster` dialog.
+      .. figure:: /images/cluster-db-deployment.png
+         :figwidth: 600px
+         :alt: cluster-db-deployment
 
    .. step:: Select a Cluster Type.
 
       Select the :guilabel:`Shared` cluster.
 
+      .. figure:: /images/cluster-shared-type.png
+         :figwidth: 250px
+         :alt: cluster-shared-type
+
    .. step:: Select a Cluster Tier.
 
-      If it is not already selected, select ``M0 Sandbox``.
+      If it is not already selected, select :guilabel:`M0 Sandbox`.
+
+      .. figure:: /images/cluster-m0-tier.png
+         :figwidth: 600px
+         :alt: cluster-m0-tier
 
    .. step:: Create the cluster.
 
@@ -76,7 +73,8 @@ Summary
 -------
 
 If you successfully completed the procedure in this guide, you have
-created free cluster. In the next guide, you will load our sample data
-into your cluster.
+created a free cluster.
+
+In the next guide, you will add a database user.
 
 .. guide-next::

source/atlas/connection-string.txt

@@ -45,25 +45,34 @@ What You'll Need
 Procedure
 ---------
 
-.. tabs-selector:: drivers
-
 .. procedure::
    :style: normal
 
    .. step:: Navigate to the {+db-deployments+} page for your project.
 
-   .. step:: Click the Connect button.
+   .. step:: Click the :guilabel:`Connect` button.
 
       Click the :guilabel:`Connect` button on the cluster management panel.
       The following Atlas screenshot shows the :guilabel:`Connect` button:
 
-      .. figure:: /images/connect_panel.png
-         :figwidth: 328px
-         :alt: connect-panel
+      .. figure:: /images/sample-data-cluster.png
+         :figwidth: 600px
+         :alt: sample-data-cluster
 
    .. step:: Copy the connection string
 
-      .. include:: /includes/driver_copy_paste.rst
+      In the :guilabel:`Choose your connection method` step in the
+      modal, select the button marked :guilabel:`Connect Your
+      Application`. 
+      
+      The following Atlas screenshot shows the connection option
+      buttons:
+
+      .. figure:: /images/connection-string.png
+         :figwidth: 600px
+         :alt: connection-string
+
+      Follow the instructions for your driver language and version.
 
 Summary
 -------

source/atlas/db-user.txt

@@ -22,7 +22,11 @@ Overview
    Add a database user to access the database deployments in your
    project.
 
-In this guide, you will add a database user.
+After creating your cluster, Atlas directs you to a page called
+:guilabel:`Security Quickstart`.
+
+In this guide, you will add a database user in the first section of the
+page.
 
 .. time:: 5
 
@@ -38,28 +42,19 @@ Procedure
 .. procedure::
    :style: normal
 
-   .. step:: Navigate to the {+db-deployments+} page for your project.
-
-   .. step:: Open the Add New Database User dialog.
-
-      .. procedure::
-         :style: connected
-
-         .. step:: In the :guilabel:`Security` section of the left
-            navigation, click :guilabel:`Database Access`. The
-            :guilabel:`Database Users` tab  displays.
-
-         .. step::  Click :icon-fa5:`plus` :guilabel:`Add New Database User`.
+   .. step:: Select :guilabel:`Username and Password`.
 
-   .. step:: Select Password.
+      In the :guilabel:`How would you like to authenticate your
+      connection?` section, select the box labeled :guilabel:`Username
+      and Password`.
 
-      In the :guilabel:`Authentication Method` section of the
-      :guilabel:`Add New Database User` modal window, select the box
-      labeled :guilabel:`Password`.
+      .. figure:: /images/db-user-auth-mech.png
+         :figwidth: 450px
+         :alt: db-user-auth-mech
 
    .. step:: Enter the users information.
 
-      Under :guilabel:`Password Authentication`, there are two text fields.
+      In the box underneath, there are two text fields.
 
       .. procedure::
          :style: connected
@@ -68,25 +63,29 @@ Procedure
 
          .. step:: Enter a password for the new user in the lower text field.
 
-            To use a password auto-generated by Atlas,
-            click the :guilabel:`Autogenerate Secure Password` button.
+            Enter a password of your choice, or use an Atlas auto-generated
+            one, by clicking the :guilabel:`Autogenerate Secure
+            Password` button.
 
-   .. step:: Assign the user a privilege.
+            .. figure:: /images/db-user-password.png
+               :figwidth: 600px
+               :alt: db-user-password
 
-      In the :guilabel:`Built-in Role` section, select
-      :guilabel:`Read and write to any database`.
+   .. step:: Click :guilabel:`Create User`.
 
-   .. step:: Add the user.
+      Now, you see your user under the :guilabel:`Create User` button.
 
-      Click :guilabel:`Add User`. This creates user that can read and
-      write to any of your database deployments.
+      .. figure:: /images/db-user-added.png
+         :figwidth: 600px
+         :alt: db-user-added
 
 Summary
 -------
 
 If you successfully completed the procedure in this guide, you have
 added a database user.
 
-In the next guide, you will configure a network connection.
+In the next guide, you will continue with the :guilabel:`Security
+Quickstart` page to configure a network connection.
 
 .. guide-next::

source/atlas/network-connections.txt

@@ -22,7 +22,12 @@ Overview
    Configure a network connection to allow your users to access the 
    database deployments in your project.
 
-In this guide, you will configure a network connection.
+After creating your cluster, Atlas directs you to a page called
+:guilabel:`Security Quickstart`. In the previous guide, we completed the
+first section, which added a user to the database. 
+
+In this guide, you will configure a network connection with the
+last section of the page.
 
 .. time:: 5
 
@@ -38,33 +43,48 @@ Procedure
 .. procedure::
    :style: normal
 
-   .. step:: Navigate to the {+db-deployments+} page for your project.
- 
-   .. step:: Go to IP Access List view.
+   .. step:: Select :guilabel:`My Local Environment`.
+
+      In the :guilabel:`Where would you like to connect from?` section,
+      select the box labeled :guilabel:`My Local Environment`.
+
+      .. figure:: /images/network-env.png
+         :figwidth: 600px
+         :alt: network-env
+      
+   .. step:: Add your IP address
+
+      In the box labeled :guilabel:`Add entries to your IP Access List`, 
+      click :guilabel:`Add My Current IP Address`.
 
-      .. procedure::
-         :style: connected
+      .. figure:: /images/network-ip.png
+         :figwidth: 600px
+         :alt: network-ip
+            
+      Now, you see your IP address at the bottom of the box.
 
-         .. step:: In the :guilabel:`Security` section of the left 
-            navigation, click :guilabel:`Network Access`. The 
-            :guilabel:`IP Access List` tab displays.
+      .. figure:: /images/network-added.png
+         :figwidth: 600px
+         :alt: network-added
 
-         .. step:: Click :icon-fa5:`plus` :guilabel:`Add IP Address`.
+   .. step:: Click :guilabel:`Finish and Close`.
 
-   .. step:: Click Allow Access from Anywhere.
+      After clicking the :guilabel:`Finish and Create` button at the
+      bottom of the page, you see the following modal:
 
-   .. step:: Add the IP address.
+      .. figure:: /images/network-complete.png
+         :figwidth: 450px
+         :alt: network-complete
+      
 
-      Click :guilabel:`Confirm`. This allows your user to access the 
-      database deployments in your project on any network.
 
 Summary
 -------
 
 If you successfully completed the procedure in this guide, you have 
-configured a network connection. 
+configured a network connection and finished the :guilabel:`Security
+Quickstart`. 
 
-In the next guide, you will retrieve your database deployments 
-connection string.
+In the next guide, you will load our sample data into your cluster.
 
 .. guide-next::

source/atlas/sample-data.txt

@@ -42,35 +42,52 @@ Procedure
 
    .. step:: Click on your cluster name.
 
-   .. step:: Click the Collections tab.
+      .. figure:: /images/sample-data-cluster.png
+         :figwidth: 600px
+         :alt: sample-data-cluster
+
+   .. step:: Click the :guilabel:`Collections` tab.
+
+      .. figure:: /images/sample-data-tab.png
+         :figwidth: 600px
+         :alt: sample-data-tab
 
-   .. step:: Click Load Sample Dataset.
+   .. step:: Click :guilabel:`Load Sample Dataset`.
+
+      .. figure:: /images/sample-data-load.png
+         :figwidth: 600px
+         :alt: sample-data-load
 
-   .. step:: In the ensuing dialog, click Load Sample Dataset confirm.
+   .. step:: In the ensuing dialog, click :guilabel:`Load Sample Dataset` confirm.
+
+      .. figure:: /images/sample-data-confirm-load.png
+         :figwidth: 450px
+         :alt: sample-data-confirm-load
 
       Once the load completes, the :guilabel:`Collections` tab refreshes 
       to show your sample data.
 
-      You should see the following databases in your cluster:
+      You see the following databases in your cluster:
 
       .. list-table::
          :header-rows: 1
          :widths: 20 30
 
-         * - Database Name
+         * - Dataset Name
            - Description
 
          * - ``sample-airbnb``
-           -  Contains details on `AirBnB <https://www.airbnb.com>`__ 
-              listings.
+           -  Contains details on `AirBnB <https://www.airbnb.com>`__ listings.
 
          * - ``sample-analytics``
-           -  Contains training data for a mock financial services
-              application.
+           -  Contains training data for a mock financial services application.
 
          * - ``sample-geospatial``
            - Contains shipwreck data.
 
+         * - ``sample-guides``
+           - Contains planet data.
+
          * - ``sample-mflix``
            - Contains movie data.
 
@@ -92,6 +109,7 @@ Summary
 If you successfully completed the procedure in this guide, you have 
 loaded our sample data. 
 
-In the next guide, you will add a database user.
+In the next guide, you will retrieve your database deployments 
+connection string.
 
 .. guide-next::