[2018.3] Merge forward from 2017.7 to 2018.3

doc/topics/beacons/index.rst

@@ -290,6 +290,8 @@ All beacons are configured using a similar process of enabling the beacon,
 writing a reactor SLS (and state SLS if needed), and mapping a beacon event to
 the reactor SLS.
 
+.. _writing-beacons:
+
 Writing Beacon Plugins
 ======================
 
@@ -360,5 +362,5 @@ new execution modules and functions to back specific beacons.
 Distributing Custom Beacons
 ---------------------------
 
-Custom beacons can be distributed to minions using ``saltutil``, see
-:ref:`Dynamic Module Distribution <dynamic-module-distribution>`.
+Custom beacons can be distributed to minions via the standard methods, see
+:ref:`Modular Systems <modular-systems>`.

doc/topics/development/index.rst

@@ -7,6 +7,7 @@ Developing Salt
     :glob:
 
     *
+    modules/index
     extend/index
     tests/*
     raet/index

doc/topics/development/modules/configuration.rst

@@ -0,0 +1,25 @@
+=====================
+Configuration Options
+=====================
+
+A number of configuration options can affect the load process. This is a quick
+list of them:
+
+* ``autoload_dynamic_modules`` (:conf_minion:`Minion <autoload_dynamic_modules>`)
+* ``cython_enable`` (:conf_minion:`Minion <cython_enable>`, :conf_master:`Master <cython_enable>`)
+* ``disable_modules`` (:conf_minion:`Minion <disable_modules>`)
+* ``disable_returners`` (:conf_minion:`Minion <disable_returners>`)
+* ``enable_zip_modules`` (:conf_minion:`Minion <enable_zip_modules>`)
+* ``extension_modules`` (:conf_master:`Master <extension_modules>`)
+* ``extmod_whitelist`` (:conf_minion:`Minion <extmod_whitelist>`, :conf_master:`Master <extmod_whitelist>`)
+* ``extmod_blacklist`` (:conf_minion:`Minion <extmod_blacklist>`, :conf_master:`Master <extmod_blacklist>`)
+* ``whitelist_modules`` (:conf_minion:`Minion <enable_whitelist_modules>`)
+* ``grains_dirs`` (:conf_minion:`Minion <grains_dirs>`)
+* ``module_dirs`` (:conf_minion:`Minion <module_dirs>`, :conf_master:`Master <module_dirs>`)
+* ``outputter_dirs`` (:conf_minion:`Minion <outputter_dirs>`, :conf_master:`Master <outputter_dirs>`)
+* ``providers`` (:conf_minion:`Minion <providers>`)
+* ``render_dirs`` (:conf_minion:`Minion <render_dirs>`)
+* ``returner_dirs`` (:conf_minion:`Minion <returner_dirs>`)
+* ``runner_dirs`` (:conf_master:`Master <runner_dirs>`)
+* ``states_dirs`` (:conf_minion:`Minion <states_dirs>`)
+* ``utils_dirs`` (:conf_minion:`Minion <utils_dirs>`)