Minor doc bug fixes

Refs #24042
Refs #25650
Refs #21296
Refs #23788

conf/master

@@ -354,12 +354,12 @@
 # If this is set to True the first newline after a Jinja block is removed
 # (block, not variable tag!). Defaults to False, corresponds to the Jinja
 # environment init variable "trim_blocks".
-# jinja_trim_blocks: False
+#jinja_trim_blocks: False
 #
 # If this is set to True leading spaces and tabs are stripped from the start
 # of a line to a block. Defaults to False, corresponds to the Jinja
 # environment init variable "lstrip_blocks".
-# jinja_lstrip_blocks: False
+#jinja_lstrip_blocks: False
 
 # The failhard option tells the minions to stop immediately after the first
 # failure detected in the state execution, defaults to False
@@ -379,7 +379,7 @@
 #state_output: full
 
 # Automatically aggregate all states that have support for mod_aggregate by
-# setting to True. Or pass a list of state module names to automatically
+# setting to 'True'. Or pass a list of state module names to automatically
 # aggregate just those types.
 #
 # state_aggregate:
@@ -387,6 +387,11 @@
 #
 #state_aggregate: False
 
+# Send progress events as each function in a state run completes execution
+# by setting to 'True'. Progress events are in the format
+# 'salt/job/<job_id>/prog/<minion_id>/<run_num>'.
+#state_events: False
+
 #####      File Server settings      #####
 ##########################################
 # Salt runs a lightweight file server written in zeromq to deliver files to

doc/ref/configuration/master.rst

@@ -906,6 +906,41 @@ If set to 'changes', the output will be full unless the state didn't change.
 
     state_output: full
 
+.. conf_master:: state_aggregate
+
+``state_aggregate``
+-------------------
+
+Default: ``False``
+
+Automatically aggregate all states that have support for mod_aggregate by
+setting to ``True``. Or pass a list of state module names to automatically
+aggregate just those types.
+
+.. code-block:: yaml
+
+    state_aggregate:
+      - pkg
+
+.. code-block:: yaml
+
+    state_aggregate: True
+
+.. conf_master:: state_events
+
+``state_events``
+----------------
+
+Default: ``False``
+
+Send progress events as each function in a state run completes execution
+by setting to ``True``. Progress events are in the format
+``salt/job/<job_id>/prog/<minion_id>/<run_num>``.
+
+.. code-block:: yaml
+
+    state_events: True
+
 .. conf_master:: yaml_utf8
 
 ``yaml_utf8``

doc/topics/eauth/index.rst

@@ -73,6 +73,11 @@ append a ``%`` to the ID:
           - '*':
             - 'pkg.*'
 
+.. warning::
+    All users that have external authentication privileges are allowed to run
+    :mod:`saltutil.findjob <salt.modules.saltutil.find_job>`. Be aware
+    that this could inadvertently expose some data such as minion IDs.
+
 .. _salt-token-generation:
 
 Tokens

salt/modules/drac.py

@@ -64,7 +64,7 @@ def system_info():
 
     .. code-block:: bash
 
-        salt dell drac.getsysinfo
+        salt dell drac.system_info
     '''
     drac = {}
     section = ''
@@ -85,7 +85,7 @@ def network_info():
 
     .. code-block:: bash
 
-        salt dell drac.getniccfg
+        salt dell drac.network_info
     '''
 
     cmd = __salt__['cmd.run_all']('racadm getniccfg')

salt/modules/state.py

@@ -101,9 +101,9 @@ def _wait(jid):
 
 def running(concurrent=False):
     '''
-    Return a dict of state return data if a state function is already running.
-    This function is used to prevent multiple state calls from being run at
-    the same time.
+    Return a list of strings that contain state return data if a state function is
+    already running. This function is used to prevent multiple state calls from being
+    run at the same time.
 
     CLI Example: