Merge "[Docs] Update configuration/controls docs"

doc/source/configuration.rst

@@ -13,11 +13,14 @@ OpenStack environment.
 All of the default configurations are found within ``defaults/main.yml`` in the
 role itself.
 
-*NOTE: Deployers are strongly urged to test this role and any configuration
-changes in a non-production, test environment.*
+.. note::
+
+   Deployers are strongly urged to test this role and any configuration
+   changes in a non-production, test environment.
 
 .. contents::
    :local:
+   :backlinks: none
 
 AIDE
 ----
@@ -32,6 +35,11 @@ long time indexing the disk.  Additional directories can be added to the
 exclusion list, but the directories currenty listed **should not be removed**.
 Deployers can add directories to ``aide_exlude_dirs``.
 
+.. literalinclude:: ../../defaults/main.yml
+   :language: yaml
+   :start-after: ## AIDE
+   :end-before: # By default, the AIDE database won't be initialized
+
 The first AIDE database initialization can consume lots of CPU time and I/O
 resources. By default, the role won't run the database initialization after
 the role is applied to avoid causing performance degradation. The database will

doc/source/controls.rst

@@ -31,7 +31,7 @@ You can also review the STIG controls in one very large page. This can be
 helpful when you need to search using your web browser.
 
 .. toctree::
-   :titlesonly:
+   :maxdepth: 2
 
    auto_controls-by-severity.rst
    auto_controls-by-status.rst