diff --git a/docs/bin/testing_formatter.sh b/docs/bin/testing_formatter.sh
index 97423199e49..0867f9a54ef 100755
--- a/docs/bin/testing_formatter.sh
+++ b/docs/bin/testing_formatter.sh
@@ -10,7 +10,7 @@ This list is also available using \`\`ansible-test sanity --list-tests\`\`.
 .. toctree::
    :maxdepth: 1
 
-$(for test in $(../../test/runner/ansible-test sanity --list-tests); do echo "  ${test}"; done)
+$(for test in $(../../test/runner/ansible-test sanity --list-tests); do echo "   ${test}"; done)
 
 
 EOF
diff --git a/docs/docsite/rst/plugins/callback.rst b/docs/docsite/rst/plugins/callback.rst
index ff9f18721ae..425d2ad6dd9 100644
--- a/docs/docsite/rst/plugins/callback.rst
+++ b/docs/docsite/rst/plugins/callback.rst
@@ -16,7 +16,7 @@ Example Callback Plugins
 The :doc:`_plays <callback/log_plays>` callback is an example of how to record playbook events to a log file,
 and the :doc:`mail <callback/mail>` callback sends email on playbook failures.
 
-The :doc:`osx_say <callback/oxs_say>` callback responds with computer synthesized speech on OS X in relation to playbook events.
+The :doc:`osx_say <callback/osx_say>` callback responds with computer synthesized speech on OS X in relation to playbook events.
 
 
 .. _enabling_callbacks:
diff --git a/docs/docsite/rst/plugins/connection.rst b/docs/docsite/rst/plugins/connection.rst
index b06b987d5fb..b22e5cdb6f3 100644
--- a/docs/docsite/rst/plugins/connection.rst
+++ b/docs/docsite/rst/plugins/connection.rst
@@ -39,7 +39,7 @@ Plugins are self-documenting. Each plugin should document its configuration opti
 :ref:`ansible_host<magic_variables_and_hostvars>`
     The name of the host to connect to, if different from the :ref:`inventory <intro_inventory>` hostname.
 :ref:`ansible_port<faq_setting_users_and_ports>`
-    The ssh port number, for :ref:`ssh <ssh_connection>` and :ref:`paramiko_ssh <paramiko_ssh_connection>` it defaults to 22.
+    The ssh port number, for :doc:`ssh <connection/ssh>` and :doc:`paramiko_ssh <connection/paramiko_ssh>` it defaults to 22.
 :ref:`ansible_user<faq_setting_users_and_ports>`
     The default user name to use for log in. Most plugins default to the 'current user running Ansible'.
 
diff --git a/docs/docsite/rst/user_guide/modules_intro.rst b/docs/docsite/rst/user_guide/modules_intro.rst
index 47df4a28763..a598c35bd7d 100644
--- a/docs/docsite/rst/user_guide/modules_intro.rst
+++ b/docs/docsite/rst/user_guide/modules_intro.rst
@@ -44,7 +44,7 @@ Documentation for each module can be accessed from the command line with the ans
 
     ansible-doc yum
 
-For a list of all available modules, see :doc:`modules_by_category`, or run the following at a command prompt::
+For a list of all available modules, see :doc:`../modules/modules_by_category`, or run the following at a command prompt::
 
     ansible-doc -l
 
diff --git a/docs/docsite/rst/user_guide/plugin_filtering_config.rst b/docs/docsite/rst/user_guide/plugin_filtering_config.rst
index e17a7aadaa7..04fb0d368d6 100644
--- a/docs/docsite/rst/user_guide/plugin_filtering_config.rst
+++ b/docs/docsite/rst/user_guide/plugin_filtering_config.rst
@@ -1,4 +1,4 @@
-.. _plugin_filter_config:
+.. _plugin_filtering_config:
 
 Plugin Filter Configuration
 ===========================
diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml
index ef3318a6d15..764fae5a632 100644
--- a/lib/ansible/config/base.yml
+++ b/lib/ansible/config/base.yml
@@ -1453,7 +1453,7 @@ PLUGIN_FILTERS_CFG:
   version_added: "2.5.0"
   description:
     - "A path to configuration for filtering which plugins installed on the system are allowed to be used."
-    - "See :doc:`plugin_filtering_config` for details of the filter file's format."
+    - "See :ref:`plugin_filtering_config` for details of the filter file's format."
     - " The default is /etc/ansible/plugin_filters.yml"
   ini:
   - key: plugin_filters_cfg