Merge branch '2017.7' into '2018.3'

Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py

doc/.scripts/compile-translation-catalogs

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 '''
-    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :codeauthor: Pedro Algarvio (pedro@algarvio.me)
 
 
     compile-translation-catalogs

doc/.scripts/download-translation-catalog

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 '''
-    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :codeauthor: Pedro Algarvio (pedro@algarvio.me)
 
 
     download-translation-catalog

doc/.scripts/setup-transifex-config

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 '''
-    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :codeauthor: Pedro Algarvio (pedro@algarvio.me)
 
 
     setup-transifex-config

doc/.scripts/update-transifex-source-translations

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 '''
-    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :codeauthor: Pedro Algarvio (pedro@algarvio.me)
 
 
     update-transifex-source-translations

doc/_ext/saltautodoc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 '''
-    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :codeauthor: Pedro Algarvio (pedro@algarvio.me)
 
 
     saltautodoc.py

doc/conf.py

@@ -106,6 +106,7 @@ MOCK_MODULES = [
 
     'tornado',
     'tornado.concurrent',
+    'tornado.escape',
     'tornado.gen',
     'tornado.httpclient',
     'tornado.httpserver',
@@ -137,8 +138,8 @@ MOCK_MODULES = [
     'pymongo',
     'rabbitmq_server',
     'redis',
-    'requests',
+    #'requests',
-    'requests.exceptions',
+    #'requests.exceptions',
     'rpm',
     'rpmUtils',
     'rpmUtils.arch',
@@ -237,8 +238,7 @@ formulas_dir = os.path.join(os.pardir, docs_basepath, 'formulas')
 
 # ----- Intersphinx Settings ------------------------------------------------>
 intersphinx_mapping = {
-        'python2': ('http://docs.python.org/2', None),
+    'python': ('https://docs.python.org/3', None)
-        'python3': ('http://docs.python.org/3', None)
 }
 # <---- Intersphinx Settings -------------------------------------------------
 
@@ -357,9 +357,8 @@ rst_prolog = """\
 # A shortcut for linking to tickets on the GitHub issue tracker
 extlinks = {
     'blob': ('https://github.com/saltstack/salt/blob/%s/%%s' % 'develop', None),
-    'download': ('https://cloud.github.com/downloads/saltstack/salt/%s', None),
+    'issue': ('https://github.com/saltstack/salt/issues/%s', 'issue #'),
-    'issue': ('https://github.com/saltstack/salt/issues/%s', 'issue '),
+    'pull': ('https://github.com/saltstack/salt/pull/%s', 'PR #'),
-    'pull': ('https://github.com/saltstack/salt/pull/%s', 'PR '),
     'formula_url': ('https://github.com/saltstack-formulas/%s', ''),
 }
 

doc/contents.rst

@@ -7,6 +7,7 @@ Salt Table of Contents
 .. toctree::
     :maxdepth: 2
 
+    topics/index
     topics/installation/index
     topics/configuration/index
     topics/using_salt
@@ -15,12 +16,16 @@ Salt Table of Contents
     topics/utils/index
     topics/event/index
     topics/orchestrate/index
+    topics/solaris/index
     topics/ssh/index
+    topics/thorium/index
     topics/cloud/index
     topics/proxyminion/index
     topics/network_automation/index
     topics/virt/index
     ref/cli/index
+    ref/pillar/index
+    ref/tops/index
     ref/index
     topics/api
     topics/topology/index
@@ -30,3 +35,4 @@ Salt Table of Contents
     topics/development/index
     topics/releases/index
     topics/venafi/index
+    glossary

doc/ref/beacons/all/salt.beacons.sensehat.rst

@@ -1,5 +1,5 @@
 salt.beacons.sensehat module
-=======================
+============================
 
 .. automodule:: salt.beacons.sensehat
     :members:

doc/ref/cli/index.rst

@@ -74,6 +74,12 @@ salt-syndic
 
     salt-syndic
 
+salt-unity
+==========
+.. toctree::
+
+    salt-unity
+
 salt-api
 ========
 .. toctree::

doc/ref/cli/salt.rst

@@ -46,14 +46,6 @@ Options
     Instead of waiting for the job to run on minions only print the job id of
     the started execution and complete.
 
-.. option:: --state-output=STATE_OUTPUT
-
-    .. versionadded:: 0.17
-
-    Override the configured ``state_output`` value for minion output. One of
-    ``full``, ``terse``, ``mixed``, ``changes`` or ``filter``.  Default:
-    ``full``.
-
 .. option:: --subset=SUBSET
 
     Execute the routine on a random subset of the targeted minions.  The

doc/ref/clients/index.rst

@@ -72,6 +72,7 @@ Each module type has a corresponding loader function.
 Salt's Client Interfaces
 ========================
 
+.. _client-interfaces:
 .. _local-client:
 
 LocalClient

doc/ref/configuration/logging/index.rst

@@ -9,7 +9,7 @@ issues you might find along the way.
 
 If you want to get some more information on the nitty-gritty of salt's logging
 system, please head over to the :ref:`logging development
-document<logging-internals>`, if all you're after is salt's logging
+document <logging-internals>`, if all you're after is salt's logging
 configurations, please continue reading.
 
 
@@ -25,10 +25,9 @@ example, setting ``log_level: error`` will log statements at ``error``,
 ``quiet`` level.
 
 Most of the logging levels are defined by default in Python's logging library
-and can be found in the official `Python documentation
+and can be found in the official :ref:`Python documentation <python:levels>`.
-<https://docs.python.org/library/logging.html#levels>`_.  Salt uses some more
+Salt uses some more levels in addition to the standard levels.  All levels
-levels in addition to the standard levels.  All levels available in salt are
+available in salt are shown in the table below.
-shown in the table below.
 
 .. note::
 
@@ -74,11 +73,14 @@ The log records can be sent to a regular file, local path name, or network
 location.  Remote logging works best when configured to use rsyslogd(8) (e.g.:
 ``file:///dev/log``), with rsyslogd(8) configured for network logging.  The
 format for remote addresses is:
-``<file|udp|tcp>://<host|socketpath>:<port-if-required>/<log-facility>``. Where
+
-``log-facility`` is the symbolic name of a syslog facility as defined in the
+.. code-block:: text
-:ref:`SysLogHandler documentation
+
-<python2:logging.handlers.SysLogHandler.encodePriority>` . It defaults to
+    <file|udp|tcp>://<host|socketpath>:<port-if-required>/<log-facility>
-``LOG_USER``.
+
+Where ``log-facility`` is the symbolic name of a syslog facility as defined in
+the :py:meth:`SysLogHandler documentation
+<logging.handlers.SysLogHandler.encodePriority>`. It defaults to ``LOG_USER``.
 
 Default: Dependent of the binary being executed, for example, for
 ``salt-master``, ``/var/log/salt/master``.
@@ -148,7 +150,7 @@ The level of messages to send to the log file. One of ``all``, ``garbage``,
 Default: ``%H:%M:%S``
 
 The date and time format used in console log messages. Allowed date/time
-formatting can be seen on :func:`time.strftime <python2:time.strftime>`.
+formatting matches those used in :py:func:`time.strftime`.
 
 .. code-block:: yaml
 
@@ -162,7 +164,7 @@ formatting can be seen on :func:`time.strftime <python2:time.strftime>`.
 Default: ``%Y-%m-%d %H:%M:%S``
 
 The date and time format used in log file messages. Allowed date/time
-formatting can be seen on :func:`time.strftime <python2:time.strftime>`.
+formatting matches those used in :py:func:`time.strftime`.
 
 .. code-block:: yaml
 
@@ -176,8 +178,8 @@ formatting can be seen on :func:`time.strftime <python2:time.strftime>`.
 Default: ``[%(levelname)-8s] %(message)s``
 
 The format of the console logging messages. All standard python logging
-:ref:`LogRecord attributes <python2:logrecord-attributes>` can be used.  Salt
+:py:class:`~logging.LogRecord` attributes can be used. Salt also provides these
-also provides these custom LogRecord attributes to colorize console log output:
+custom LogRecord attributes to colorize console log output:
 
 .. code-block:: python
 
@@ -204,9 +206,9 @@ also provides these custom LogRecord attributes to colorize console log output:
 Default: ``%(asctime)s,%(msecs)03d [%(name)-17s][%(levelname)-8s] %(message)s``
 
 The format of the log file logging messages. All standard python logging
-:ref:`LogRecord attributes <python2:logrecord-attributes>` can be used.  Salt
+:py:class:`~logging.LogRecord` attributes can be used.  Salt also provides
-also provides these custom LogRecord attributes that include padding and
+these custom LogRecord attributes that include padding and enclosing brackets
-enclosing brackets ``[`` and ``]``:
+``[`` and ``]``:
 
 .. code-block:: python
 

doc/ref/configuration/master.rst

@@ -872,8 +872,7 @@ Changes the underlying transport layer. ZeroMQ is the recommended transport
 while additional transport layers are under development. Supported values are
 ``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has
 a significant impact on performance and should not be changed unless you know
-what you are doing! Transports are explained in :ref:`Salt Transports
+what you are doing!
-<transports>`.
 
 .. code-block:: yaml
 
@@ -886,10 +885,10 @@ what you are doing! Transports are explained in :ref:`Salt Transports
 
 Default: ``{}``
 
-(experimental) Starts multiple transports and overrides options for each transport with the provided dictionary
+(experimental) Starts multiple transports and overrides options for each
-This setting has a significant impact on performance and should not be changed unless you know
+transport with the provided dictionary This setting has a significant impact on
-what you are doing! Transports are explained in :ref:`Salt Transports
+performance and should not be changed unless you know what you are doing!  The
-<transports>`. The following example shows how to start a TCP transport alongside a ZMQ transport.
+following example shows how to start a TCP transport alongside a ZMQ transport.
 
 .. code-block:: yaml
 
@@ -1031,7 +1030,7 @@ a minion performs an authentication check with the master.
 .. conf_master:: minion_data_cache_events
 
 ``minion_data_cache_events``
---------------------
+----------------------------
 
 .. versionadded:: 2017.7.3
 
@@ -1062,6 +1061,23 @@ Define the default salt-ssh roster module to use
 
     roster: cache
 
+.. conf_master:: roster_defaults
+
+``roster_defaults``
+-------------------
+
+.. versionadded:: 2017.7.0
+
+Default settings which will be inherited by all rosters.
+
+.. code-block:: yaml
+
+    roster_defaults:
+      user: daniel
+      sudo: True
+      priv: /root/.ssh/id_rsa
+      tty: True
+
 .. conf_master:: roster_file
 
 ``roster_file``
@@ -1706,10 +1722,10 @@ constant names without ssl module prefix: ``CERT_REQUIRED`` or ``PROTOCOL_SSLv23
         certfile: <path_to_certfile>
         ssl_version: PROTOCOL_TLSv1_2
 
-.. conf_master:: allow_minion_key_revoke
+.. conf_master:: preserve_minion_cache
 
-``allow_minion_key_revoke``
+``preserve_minion_cache``
----------------------------
+-------------------------
 
 Default: ``False``
 
@@ -1738,7 +1754,7 @@ the master will drop the request and the minion's key will remain accepted.
 
 .. code-block:: yaml
 
-    rotate_aes_key: True
+    allow_minion_key_revoke: False
 
 
 Master Large Scale Tuning Settings
@@ -4319,7 +4335,7 @@ Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']``
 When fetching from remote repositories, by default Salt will fetch branches and
 tags. This parameter can be used to override the default and specify
 alternate refspecs to be fetched. This parameter works similarly to its
-:ref:`GitFS counterpart <git_pillar-custom-refspecs>`, in that it can be
+:ref:`GitFS counterpart <gitfs-custom-refspecs>`, in that it can be
 configured both globally and for individual remotes.
 
 .. code-block:: yaml
@@ -4367,12 +4383,14 @@ The pillar_source_merging_strategy option allows you to configure merging
 strategy between different sources. It accepts 5 values:
 
 * ``none``:
-.. versionadded:: 2016.3.4
+
   It will not do any merging at all and only parse the pillar data from the passed environment and 'base' if no environment was specified.
 
+  .. versionadded:: 2016.3.4
+
 * ``recurse``:
 
-  it will merge recursively mapping of data. For example, theses 2 sources:
+  It will recursively merge data. For example, theses 2 sources:
 
   .. code-block:: yaml
 
@@ -5469,7 +5487,7 @@ Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']``
 When fetching from remote repositories, by default Salt will fetch branches and
 tags. This parameter can be used to override the default and specify
 alternate refspecs to be fetched. This parameter works similarly to its
-:ref:`GitFS counterpart <winrepo-custom-refspecs>`, in that it can be
+:ref:`GitFS counterpart <gitfs-custom-refspecs>`, in that it can be
 configured both globally and for individual remotes.
 
 .. code-block:: yaml

doc/ref/configuration/minion.rst

@@ -324,7 +324,7 @@ option on the Salt master.
 .. conf_minion:: publish_port
 
 ``publish_port``
----------------
+----------------
 
 Default: ``4505``
 
@@ -561,7 +561,7 @@ ids.
 
 Default: ``True``
 
-Caches the minion id to a file when the minion's :minion_conf:`id` is not
+Caches the minion id to a file when the minion's :conf_minion:`id` is not
 statically defined in the minion config. This setting prevents potential
 problems when automatic minion id resolution changes, which can cause the
 minion to lose connection with the master. To turn off minion id caching,
@@ -1007,7 +1007,7 @@ is appropriate if you expect occasional downtime from the master(s).
 
     master_tries: 1
 
-.. conf_minion:: acceptance_wait_time_max
+.. conf_minion:: auth_tries
 
 ``auth_tries``
 --------------
@@ -1275,8 +1275,7 @@ Changes the underlying transport layer. ZeroMQ is the recommended transport
 while additional transport layers are under development. Supported values are
 ``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has
 a significant impact on performance and should not be changed unless you know
-what you are doing! Transports are explained in :ref:`Salt Transports
+what you are doing!
-<transports>`.
 
 .. code-block:: yaml
 
@@ -1591,7 +1590,7 @@ below.
 Default: ``-1``
 
 Specify a max size (in bytes) for modules on import. This feature is currently
-only supported on *nix operating systems and requires psutil.
+only supported on \*NIX operating systems and requires psutil.
 
 .. code-block:: yaml
 
@@ -2658,7 +2657,7 @@ Thread Settings
 .. conf_minion:: multiprocessing
 
 ``multiprocessing``
--------
+-------------------
 
 Default: ``True``
 

doc/ref/engines/all/salt.engines.napalm_syslog.rst

@@ -1,6 +1,6 @@
-===========================
+==========================
 salt.engines.napalm_syslog
-===========================
+==========================
 
 .. automodule:: salt.engines.napalm_syslog
     :members:

doc/ref/grains/all/salt.grains.metadata.rst

@@ -1,6 +1,6 @@
-=================
+====================
 salt.grains.metadata
-=================
+====================
 
 .. automodule:: salt.grains.metadata
     :members:

doc/ref/internals/unicode.rst

@@ -1,4 +1,4 @@
-.. __unicode:
+.. _unicode:
 
 ===============
 Unicode in Salt
@@ -12,19 +12,29 @@ several basic rules to help developers handle Unicode correctly.
 
 Salt's basic workflow for Unicode handling is as follows:
 
-1) Salt should convert whatever data is passed on CLI/API to Unicode. Internally,
+1) Salt should convert whatever data is passed on CLI/API to Unicode.
-everything that Salt does should be Unicode unless it is printing to the screen
+   Internally, everything that Salt does should be Unicode unless it is
-or writing to storage.
+   printing to the screen or writing to storage.
 
 2) Modules and various Salt pluggable systems use incoming data assuming Unicode.
 
-    2.1) For Salt modules that query an API; the module should convert the data received from the API into Unicode.
+   2.1) For Salt modules that query an API; the module should convert the data
+        received from the API into Unicode.
 
-    2.2) For Salt modules that shell out to get output; the module should convert data received into Unicode. (This does not apply if using the `cmd` execution module, which should handle this for you.
+   2.2) For Salt modules that shell out to get output; the module should
+        convert data received into Unicode. (This does not apply if using the
+        :mod:`cmd <salt.modules.cmdmod>` execution module, which should handle
+        this for you.
 
-    2.3) For Salt modules which print directly to the console (not via an outputter) or which write directly to disk, a string should be encoded when appropriate. To handle this conversion, the global variable `__salt_system_encoding__` is available, which declares the locale of the system that Salt is running on.
+   2.3) For Salt modules which print directly to the console (not via an
+        outputter) or which write directly to disk, a string should be encoded
+        when appropriate. To handle this conversion, the global variable
+        ``__salt_system_encoding__`` is available, which declares the locale of
+        the system that Salt is running on.
 
-3) When a function in a Salt module returns, it should return Unicode.
+3) When a function in a Salt module returns a string, it should return a
+   ``unicode`` type in Python 2.
 
-4) When Salt delivers the data to an outputter or a returner, it is the job of the outputter
+4) When Salt delivers the data to an outputter or a returner, it is the job of
-or returner to encode the Unicode before displaying it on the console or writing it to storage.
+   the outputter or returner to encode the Unicode before displaying it on the
+   console or writing it to storage.

doc/ref/modules/all/index.rst

@@ -11,6 +11,8 @@ execution modules
         salt.modules.group
         salt.modules.kernelpkg
         salt.modules.pkg
+        salt.modules.service
+        salt.modules.shadow
         salt.modules.user
 
 .. currentmodule:: salt.modules
@@ -95,7 +97,6 @@ execution modules
     cron
     csf
     cyg
-    cytest
     daemontools
     data
     datadog_api

doc/ref/modules/all/salt.modules.cytest.rst

@@ -1,5 +0,0 @@
-salt.modules.cytest module
-==========================
-
-.. automodule:: salt.modules.cytest
-    :members:

doc/ref/modules/all/salt.modules.napalm_network.rst

@@ -1,5 +1,5 @@
 salt.modules.napalm_network module
-===============================
+==================================
 
 .. automodule:: salt.modules.napalm_network
     :members:

doc/ref/modules/all/salt.modules.pkg.rst

@@ -30,7 +30,7 @@ Execution Module                       Used for
 :py:mod:`~salt.modules.solarispkg`     Solaris-based OSes using ``pkgadd(1M)``
 :py:mod:`~salt.modules.solarisips`     Solaris-based OSes using IPS ``pkg(1)``
 :py:mod:`~salt.modules.win_pkg`        Salt's :ref:`Windows Package Manager
-                                       <windows-package-manager`
+                                       <windows-package-manager>`
 :py:mod:`~salt.modules.yumpkg`         RedHat-based distros and derivatives
                                        using ``yum(8)`` or ``dnf(8)``
 :py:mod:`~salt.modules.zypper`         SUSE-based distros using ``zypper(8)``

doc/ref/modules/all/salt.modules.service.rst

@@ -33,7 +33,3 @@ Execution Module                       Used for
 :py:mod:`~salt.modules.win_service`    Windows
 ====================================== ========================================
 
-|
-
-.. automodule:: salt.modules.service
-    :members:

doc/ref/modules/all/salt.modules.shadow.rst

@@ -18,9 +18,3 @@ Execution Module                       Used for
 :py:mod:`~salt.modules.solaris_shadow` Solaris-based OSes
 :py:mod:`~salt.modules.win_shadow`     Windows
 ====================================== ========================================
-
-|
-
-.. automodule:: salt.modules.shadow
-    :members:
-

doc/ref/modules/index.rst

@@ -137,7 +137,7 @@ call functions available in other execution modules.
 The variable ``__salt__`` is packed into the modules after they are loaded into
 the Salt minion.
 
-The ``__salt__`` variable is a :ref:`Python dictionary <python2:typesmapping>`
+The ``__salt__`` variable is a :ref:`Python dictionary <typesmapping>`
 containing all of the Salt functions. Dictionary keys are strings representing
 the names of the modules and the values are the functions themselves.
 
@@ -157,6 +157,7 @@ Calling Execution Modules on the Salt Master
 ============================================
 
 .. versionadded:: 2016.11.0
+
 Execution modules can now also be called via the :command:`salt-run` command
 using the :ref:`salt runner <salt_salt_runner>`.
 
@@ -175,8 +176,8 @@ Grains Data
 -----------
 
 The values detected by the Salt Grains on the minion are available in a
-:ref:`dict <python2:typesmapping>` named ``__grains__`` and can be accessed
+:ref:`Python dictionary <typesmapping>` named ``__grains__`` and can be
-from within callable objects in the Python modules.
+accessed from within callable objects in the Python modules.
 
 To see the contents of the grains dictionary for a given system in your
 deployment run the :func:`grains.items` function:
@@ -287,7 +288,7 @@ Virtual module names are set using the ``__virtual__`` function and the
 ``__virtual__`` Function
 ========================
 
-The ``__virtual__`` function returns either a :ref:`string <python2:typesseq>`,
+The ``__virtual__`` function returns either a :ref:`string <typesseq>`,
 :py:data:`True`, :py:data:`False`, or :py:data:`False` with an :ref:`error
 string <modules-error-info>`. If a string is returned then the module is loaded
 using the name of the string as the virtual name. If ``True`` is returned the
@@ -509,7 +510,7 @@ To add documentation add a `Python docstring`_ to the function.
 Now when the sys.doc call is executed the docstring will be cleanly returned
 to the calling terminal.
 
-.. _`Python docstring`: http://docs.python.org/2/glossary.html#term-docstring
+.. _`Python docstring`: https://docs.python.org/3/glossary.html#term-docstring
 
 Documentation added to execution modules in docstrings will automatically be
 added to the online web-based documentation.

doc/ref/proxy/all/salt.proxy.napalm.rst

@@ -1,6 +1,6 @@
-================
+=================
 salt.proxy.napalm
-================
+=================
 
 .. automodule:: salt.proxy.napalm
     :members:

doc/ref/renderers/index.rst

@@ -77,7 +77,7 @@ Other renderer combinations are possible:
 
 The following is a contrived example SLS file using the ``jinja | mako | yaml`` renderer:
 
-.. code-block:: python
+.. code-block:: text
 
     #!jinja|mako|yaml
 

doc/ref/returners/index.rst

@@ -80,9 +80,9 @@ Other optional functions can be included to add support for
         '''
         # Get a redis connection
         serv = redis.Redis(
-                    host='redis-serv.example.com',
+            host='redis-serv.example.com',
-                    port=6379,
+            port=6379,
-                    db='0')
+            db='0')
         serv.sadd("%(id)s:jobs" % ret, ret['jid'])
         serv.set("%(jid)s:%(id)s" % ret, salt.utils.json.dumps(ret['return']))
         serv.sadd('jobs', ret['jid'])

doc/ref/states/all/salt.states.rbac_solaris.rst

@@ -1,4 +1,4 @@
-======------============
+========================
 salt.states.rbac_solaris
 ========================
 

doc/ref/states/compiler_ordering.rst

@@ -1,3 +1,5 @@
+.. _compiler-ordering:
+
 =====================================
 Understanding State Compiler Ordering
 =====================================

doc/ref/states/requisites.rst

@@ -24,7 +24,7 @@ the targeting state. The following example demonstrates a direct requisite:
 .. code-block:: yaml
 
     vim:
-      pkg.installed: []
+      pkg.installed
 
     /etc/vimrc:
       file.managed:
@@ -86,7 +86,7 @@ State target matching
 ~~~~~~~~~~~~~~~~~~~~~
 
 In order to understand how state targets are matched, it is helpful to know
-:ref:`how the state compiler is working <compiler_ordering>`. Consider the following
+:ref:`how the state compiler is working <compiler-ordering>`. Consider the following
 example:
 
 .. code-block:: yaml
@@ -664,7 +664,7 @@ id declaration. This is useful when many files need to have the same defaults.
         - group: apache
         - mode: 755
 
-    /etc/bar.conf
+    /etc/bar.conf:
       file.managed:
         - source: salt://bar.conf
         - use:
@@ -1004,10 +1004,10 @@ same privileges as the salt-minion.
     comment-repo:
       file.replace:
         - name: /etc/yum.repos.d/fedora.repo
-        - pattern: ^enabled=0
+        - pattern: '^enabled=0'
         - repl: enabled=1
         - check_cmd:
-          - ! grep 'enabled=0' /etc/yum.repos.d/fedora.repo
+          - "! grep 'enabled=0' /etc/yum.repos.d/fedora.repo"
 
 This will attempt to do a replace on all ``enabled=0`` in the .repo file, and
 replace them with ``enabled=1``. The ``check_cmd`` is just a bash command. It

doc/ref/states/top.rst

@@ -249,8 +249,8 @@ Match Type   Description
 ============ ================================================================================================================
 glob         Full minion ID or glob expression to match multiple minions (e.g. ``minion123`` or ``minion*``)
 pcre         Perl-compatible regular expression (PCRE) matching a minion ID (e.g.  ``web[0-3].domain.com``)
-grain        Match a :ref:`grain <grain>`, optionally using globbing (e.g. ``kernel:Linux`` or ``kernel:*BSD``)
+grain        Match a :ref:`grain <grains>`, optionally using globbing (e.g. ``kernel:Linux`` or ``kernel:*BSD``)
-grain_pcre   Match a :ref:`grain <grain>` using PCRE (e.g. ``kernel:(Free|Open)BSD``)
+grain_pcre   Match a :ref:`grain <grains>` using PCRE (e.g. ``kernel:(Free|Open)BSD``)
 list         Comma-separated list of minions (e.g. ``minion1,minion2,minion3``)
 pillar       :ref:`Pillar <pillar>` match, optionally using globbing (e.g. ``role:webserver`` or ``role:web*``)
 pillar_pcre  :ref:`Pillar <pillar>` match using PCRE (e.g. ``role:web(server|proxy)``

doc/ref/states/writing.rst

@@ -20,7 +20,7 @@ illustrate:
 
 .. code-block:: yaml
 
-    /etc/salt/master: # maps to "name"
+    /etc/salt/master: # maps to "name", unless a "name" argument is specified below
       file.managed: # maps to <filename>.<function> - e.g. "managed" in https://github.com/saltstack/salt/tree/develop/salt/states/file.py
         - user: root # one of many options passed to the manage function
         - group: root
@@ -50,22 +50,115 @@ directly define the user interface.
     .. _here: https://github.com/saltstack/salt/blob/v0.16.2/salt/states/pkgrepo.py#L163-183
 
 
+Best Practices
+==============
+
+A well-written state function will follow these steps:
+
+.. note::
+    This is an extremely simplified example. Feel free to browse the `source
+    code`_ for Salt's state modules to see other examples.
+
+    .. _`source code`: https://github.com/saltstack/salt/tree/develop/salt/states
+
+1. Set up the return dictionary and perform any necessary input validation
+   (type checking, looking for use of mutually-exclusive arguments, etc.).
+
+   .. code-block:: python
+
+       ret = {'name': name,
+              'result': False,
+              'changes': {},
+              'comment': ''}
+
+       if foo and bar:
+           ret['comment'] = 'Only one of foo and bar is permitted'
+           return ret
+
+2. Check if changes need to be made. This is best done with an
+   information-gathering function in an accompanying :ref:`execution module
+   <writing-execution-modules>`. The state should be able to use the return
+   from this function to tell whether or not the minion is already in the
+   desired state.
+
+   .. code-block:: python
+
+       result = __salt__['modname.check'](name)
+
+3. If step 2 found that the minion is already in the desired state, then exit
+   immediately with a ``True`` result and without making any changes.
+
+   .. code-block:: python
+
+       if result:
+           ret['result'] = True
+           ret['comment'] = '{0} is already installed'.format(name)
+           return ret
+
+4. If step 2 found that changes *do* need to be made, then check to see if the
+   state was being run in test mode (i.e. with ``test=True``). If so, then exit
+   with a ``None`` result, a relevant comment, and (if possible) a ``changes``
+   entry describing what changes would be made.
+
+   .. code-block:: python
+
+       if __opts__['test']:
+           ret['result'] = None
+           ret['comment'] = '{0} would be installed'.format(name)
+           ret['changes'] = result
+           return ret
+
+5. Make the desired changes. This should again be done using a function from an
+   accompanying execution module. If the result of that function is enough to
+   tell you whether or not an error occurred, then you can exit with a
+   ``False`` result and a relevant comment to explain what happened.
+
+   .. code-block:: python
+
+       result = __salt__['modname.install'](name)
+
+6. Perform the same check from step 2 again to confirm whether or not the
+   minion is in the desired state. Just as in step 2, this function should be
+   able to tell you by its return data whether or not changes need to be made.
+
+   .. code-block:: python
+
+       ret['changes'] = __salt__['modname.check'](name)
+
+   As you can see here, we are setting the ``changes`` key in the return
+   dictionary to the result of the ``modname.check`` function (just as we did
+   in step 4). The assumption here is that the information-gathering function
+   will return a dictionary explaining what changes need to be made. This may
+   or may not fit your use case.
+
+7. Set the return data and return!
+
+   .. code-block:: python
+
+       if ret['changes']:
+           ret['comment'] = '{0} failed to install'.format(name)
+       else:
+           ret['result'] = True
+           ret['comment'] = '{0} was installed'.format(name)
+
+       return ret
+
 Using Custom State Modules
 ==========================
 
-Place your custom state modules inside a ``_states`` directory within the
+Before the state module can be used, it must be distributed to minions. This
-:conf_master:`file_roots` specified by the master config file. These custom
+can be done by placing them into ``salt://_states/``. They can then be
-state modules can then be distributed in a number of ways. Custom state modules
+distributed manually to minions by running :mod:`saltutil.sync_states
-are distributed when :py:func:`state.apply <salt.modules.state.apply_>` is run,
-or by executing the :mod:`saltutil.sync_states
 <salt.modules.saltutil.sync_states>` or :mod:`saltutil.sync_all
-<salt.modules.saltutil.sync_all>` functions.
+<salt.modules.saltutil.sync_all>`. Alternatively, when running a
+:ref:`highstate <running-highstate>` custom types will automatically be synced.
 
-Any custom states which have been synced to a minion, that are named the
+Any custom states which have been synced to a minion, that are named the same
-same as one of Salt's default set of states, will take the place of the default
+as one of Salt's default set of states, will take the place of the default
-state with the same name. Note that a state's default name is its filename
+state with the same name. Note that a state module's name defaults to one based
-(i.e. ``foo.py`` becomes state ``foo``), but that its name can be overridden
+on its filename (i.e. ``foo.py`` becomes state module ``foo``), but that its
-by using a :ref:`__virtual__ function <virtual-modules>`.
+name can be overridden by using a :ref:`__virtual__ function
+<virtual-modules>`.
 
 Cross Calling Execution Modules from States
 ===========================================
@@ -97,11 +190,12 @@ functions available in other state modules.
 The variable ``__states__`` is packed into the modules after they are loaded into
 the Salt minion.
 
-The ``__states__`` variable is a :ref:`Python dictionary <python2:typesmapping>`
+The ``__states__`` variable is a :ref:`Python dictionary <typesmapping>`
-containing all of the state modules. Dictionary keys are strings representing the
+containing all of the state modules. Dictionary keys are strings representing
-names of the modules and the values are the functions themselves.
+the names of the modules and the values are the functions themselves.
 
-Salt state modules can be cross-called by accessing the value in the ``__states__`` dict:
+Salt state modules can be cross-called by accessing the value in the
+``__states__`` dict:
 
 .. code-block:: python
 

doc/topics/beacons/index.rst

@@ -176,7 +176,7 @@ following on the event bus:
 
 .. code-block:: json
 
-    salt/beacon/larry/inotify//etc/important_file	{
+    {
      "_stamp": "2015-09-09T15:59:37.972753",
      "data": {
          "change": "IN_IGNORED",

doc/topics/best_practices.rst

@@ -200,7 +200,7 @@ preferred:
 
 ``/srv/salt/apache/conf.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% set name = 'httpd' %}
     {% set tmpl = 'salt://apache/files/httpd.conf' %}
@@ -234,7 +234,7 @@ locations within a single state:
 
 ``/srv/salt/apache/conf.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% from "apache/map.jinja" import apache with context %}
 
@@ -267,7 +267,8 @@ is not very modular to one that is:
 .. code-block:: yaml
 
     httpd:
-      pkg.installed: []
+      pkg:
+        - installed
       service.running:
         - enable: True
 
@@ -331,7 +332,7 @@ modification of static values:
 
 ``/srv/salt/apache/map.jinja``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% set apache = salt['grains.filter_by']({
         'Debian': {
@@ -357,7 +358,7 @@ modification of static values:
 
 ``/srv/salt/apache/init.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% from "apache/map.jinja" import apache with context %}
 
@@ -387,7 +388,7 @@ to be broken into two states.
 
 ``/srv/salt/apache/map.jinja``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% set apache = salt['grains.filter_by']({
         'Debian': {
@@ -414,7 +415,7 @@ to be broken into two states.
 
 ``/srv/salt/apache/init.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% from "apache/map.jinja" import apache with context %}
 
@@ -427,7 +428,7 @@ to be broken into two states.
 
 ``/srv/salt/apache/conf.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% from "apache/map.jinja" import apache with context %}
 
@@ -521,7 +522,7 @@ the associated pillar:
 
 ``/srv/salt/mysql/testerdb.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     testdb:
       mysql_database.present:
@@ -529,7 +530,7 @@ the associated pillar:
 
 ``/srv/salt/mysql/user.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     include:
       - mysql.testerdb

doc/topics/cloud/deploy.rst

@@ -257,4 +257,4 @@ This has also been tested to work with pipes, if needed:
 
 .. code-block:: yaml
 
-    script_args: | head
+    script_args: '| head'

doc/topics/cloud/dimensiondata.rst

@@ -2,7 +2,6 @@
 Getting Started With Dimension Data Cloud
 =========================================
 
-
 Dimension Data are a global IT Services company and form part of the NTT Group.
 Dimension Data provide IT-as-a-Service to customers around the globe on their
 cloud platform (Compute as a Service). The CaaS service is available either on
@@ -10,14 +9,15 @@ one of the public cloud instances or as a private instance on premises.
 
 http://cloud.dimensiondata.com/
 
-CaaS has its own non-standard `API`_ , SaltStack provides a 
+CaaS has its own non-standard API , SaltStack provides a wrapper on top of this
-wrapper on top of this `API`_ with common methods with other IaaS solutions and
+API with common methods with other IaaS solutions and Public cloud providers.
-Public cloud providers. Therefore, you can use the Dimension Data
+Therefore, you can use the Dimension Data module to communicate with both the
-module to communicate with both the public and private clouds.
+public and private clouds.
 
 
 Dependencies
 ============
+
 This driver requires the Python ``apache-libcloud`` and ``netaddr`` library to be installed.
 
 
@@ -53,13 +53,14 @@ Possible regions:
       driver: dimensiondata
 
 .. note::
-    .. versionchanged:: 2015.8.0
 
-    The ``provider`` parameter in cloud provider definitions was renamed to ``driver``. This
+    In version 2015.8.0, the ``provider`` parameter in cloud provider
-    change was made to avoid confusion with the ``provider`` parameter that is used in cloud profile
+    definitions was renamed to ``driver``. This change was made to avoid
-    definitions. Cloud provider definitions now use ``driver`` to refer to the Salt cloud module that
+    confusion with the ``provider`` parameter that is used in cloud profile
-    provides the underlying functionality to connect to a cloud host, while cloud profiles continue
+    definitions. Cloud provider definitions now use ``driver`` to refer to the
-    to use ``provider`` to refer to provider configurations that you define.
+    Salt cloud module that provides the underlying functionality to connect to
+    a cloud host, while cloud profiles continue to use ``provider`` to refer to
+    provider configurations that you define.
 
 Profiles
 ========

doc/topics/cloud/misc.rst

@@ -27,7 +27,7 @@ This has also been tested to work with pipes, if needed:
 
 .. code-block:: yaml
 
-    script_args: | head
+    script_args: '| head'
 
 
 Selecting the File Transport

doc/topics/cloud/proxmox.rst

@@ -149,10 +149,10 @@ with their default settings listed.
 
     # The name of the image, from ``salt-cloud --list-images proxmox``
     image: local:vztmpl/ubuntu-12.04-standard_12.04-1_amd64.tar.gz
-    
+
     # Whether or not to verify the SSL cert on the Proxmox host
     verify_ssl: False
-    
+
     # Network interfaces, netX
     net0: name=eth0,bridge=vmbr0,ip=dhcp
 
@@ -172,7 +172,7 @@ QEMU profile file (for a new VM):
 
     # Technology used to create the VM ('qemu', 'openvz'(on Proxmox <4.x) or 'lxc'(on Proxmox 4.x+))
     technology: qemu
- 
+
     # Proxmox node name
     host: node_name
 
@@ -187,7 +187,7 @@ QEMU profile file (for a new VM):
 
     # OS Type enum (other / wxp / w2k / w2k3 / w2k8 / wvista / win7 / win8 / l24 / l26 / solaris)
     ostype: win7
-    
+
     # Hard disk location
     sata0: <location>:<size>, format=<qcow2/vmdk/raw>, size=<size>GB #Example: local:120,format=qcow2,size=120GB
 
@@ -231,7 +231,7 @@ QEMU profile file (for a clone):
 
     # Technology used to create the VM ('qemu' or 'lxc')
     technology: qemu
- 
+
     # Proxmox node name
     host: node_name
 
@@ -244,5 +244,11 @@ QEMU profile file (for a clone):
 More information can be found on Proxmox API under the 'POST' method of /nodes/{node}/qemu/{vmid}/clone
 
 .. note::
-    The Proxmox API offers a lot more options and parameters, which are not yet supported by this salt-cloud 'overlay'. Feel free to add your contribution by forking the github repository and modifying  the following file: salt/salt/cloud/clouds/proxmox.py
+    The Proxmox API offers a lot more options and parameters, which are not yet
-    An easy way to support more parameters for VM creation would be to add the names of the optional parameters in the 'create_nodes(vm_)' function, under the 'qemu' technology. But it requires you to dig into the code ...
+    supported by this salt-cloud 'overlay'. Feel free to add your contribution
+    by forking the github repository and modifying  the following file:
+    ``salt/cloud/clouds/proxmox.py``
+
+    An easy way to support more parameters for VM creation would be to add the
+    names of the optional parameters in the 'create_nodes(vm\_)' function, under
+    the 'qemu' technology. But it requires you to dig into the code ...

doc/topics/cloud/releases/0.8.5.rst

@@ -149,7 +149,7 @@ This has also been tested to work with pipes, if needed:
 
 .. code-block:: yaml
 
-    script_args: | head
+    script_args: '| head'
 
 Remove Old SSH Keys
 ===================

doc/topics/cloud/virtualbox.rst

@@ -28,8 +28,6 @@ The Virtualbox cloud module just needs to use the virtualbox driver for now. Vir
        driver: virtualbox
 
 
-.. _vmware-cloud-profile:
-
 Profiles
 ========
 

doc/topics/cloud/vmware.rst

@@ -211,7 +211,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
 
       hardware_version: 10
       image: centos64Guest
-      
+
       #For Windows VM
       win_username: Administrator
       win_password: administrator
@@ -232,13 +232,14 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
     the current VM/template\'s vCPU count is used.
 
 ``cores_per_socket``
-    .. versionadded:: 2016.11.0
     Enter the number of cores per vCPU that you want the VM/template to have. If not specified,
-    this will default to 1. 
+    this will default to 1.
-    
-    .. note::
 
-        Cores per socket should be less than or equal to the total number of vCPUs assigned to the VM/template.
+    .. note::
+        Cores per socket should be less than or equal to the total number of
+        vCPUs assigned to the VM/template.
+
+    .. versionadded:: 2016.11.0
 
 ``memory``
     Enter the memory size (in MB or GB) that you want the VM/template to have. If
@@ -515,31 +516,31 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
 
 ``win_username``
     Specify windows vm administrator account.
-        
+
     .. note::
-    
+
     	Windows template should have "administrator" account.
 
 ``win_password``
     Specify windows vm administrator account password.
-    
+
     .. note::
 
-        During network configuration (if network specified), it is used to specify new administrator password for the machine. 
+        During network configuration (if network specified), it is used to specify new administrator password for the machine.
 
 ``win_organization_name``
     Specify windows vm user's organization. Default organization name is Organization
    	VMware vSphere documentation:
-	
+
     https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html
 
 ``win_user_fullname``
     Specify windows vm user's fullname. Default fullname is "Windows User"
    	VMware vSphere documentation:
-	
+
     https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html
 
-``plain_text``    	
+``plain_text``
 	Flag to specify whether or not the password is in plain text, rather than encrypted.
 	VMware vSphere documentation:
 
@@ -599,7 +600,7 @@ Example to reconfigure the memory and number of vCPUs:
       clonefrom: 'test-vm'
 
       memory: 16GB
-      num_cpus: 8 
+      num_cpus: 8
 
 
 Cloning a Template

doc/topics/cloud/windows.rst

@@ -69,7 +69,7 @@ If supported by the cloud provider, a PowerShell script may be used to open up
 this port automatically, using the cloud provider's `userdata`. The following
 script would open up port 445, and apply the changes:
 
-.. code-block:: powershell
+.. code-block:: text
 
     <powershell>
     New-NetFirewallRule -Name "SMB445" -DisplayName "SMB445" -Protocol TCP -LocalPort 445
@@ -122,7 +122,7 @@ enabled in your userdata. By default EC2 Windows images only have insecure HTTP
 enabled. To enable HTTPS and basic authentication required by pywinrm consider
 the following userdata example:
 
-.. code-block:: powershell
+.. code-block:: text
 
     <powershell>
     New-NetFirewallRule -Name "SMB445" -DisplayName "SMB445" -Protocol TCP -LocalPort 445

doc/topics/configuration/index.rst

@@ -7,6 +7,7 @@ secure and troubleshoot, and how to perform many other administrative tasks.
 
 .. toctree::
     :maxdepth: 1
+    :glob:
 
     ../../ref/configuration/master
     ../../ref/configuration/minion
@@ -18,6 +19,7 @@ secure and troubleshoot, and how to perform many other administrative tasks.
     ../jobs/job_cache
     ../jobs/external_cache
     ../../ref/configuration/logging/index
+    ../../ref/configuration/logging/handlers/*
     ../../ref/file_server/index
     ../tutorials/gitfs
     ../tutorials/minionfs

doc/topics/development/conventions/formulas.rst

@@ -250,7 +250,7 @@ Style
 Maintainability, readability, and reusability are all marks of a good Salt sls
 file. This section contains several suggestions and examples.
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     # Deploy the stable master branch unless version overridden by passing
     # Pillar at the CLI or via the Reactor.
@@ -472,7 +472,7 @@ lookups.
 
 Below is a simple example of a readable loop:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% for user in salt.pillar.get('list_of_users', []) %}
 
@@ -489,7 +489,7 @@ Readability suffers and the correct YAML indentation is difficult to see in the
 surrounding visual noise. Parametrization (discussed below) and variables are
 both useful techniques to avoid this. For example:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {# ---- Bad example ---- #}
 
@@ -530,7 +530,7 @@ easily combined and merged. And they can be directly serialized into YAML which
 is often easier than trying to create valid YAML through templating. For
 example:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {# ---- Bad example ---- #}
 
@@ -624,7 +624,10 @@ example is a state tree of two sls files, one simple and one complicated.
 
     common_users:
       user.present:
-        - names: [larry, curly, moe]
+        - names:
+          - larry
+          - curly
+          - moe
 
 ``/srv/salt/roles_configuration``:
 
@@ -676,7 +679,7 @@ above).
 
 Macros are useful for creating reusable, parameterized states. For example:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% macro user_state(state_id, user_name, shell='/bin/bash', groups=[]) %}
     {{ state_id }}:
@@ -696,7 +699,7 @@ example, the following macro could be used to write a php.ini config file:
 
 ``/srv/salt/php.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     php_ini:
       file.managed:
@@ -793,7 +796,7 @@ syntax for referencing a value is a normal dictionary lookup in Jinja, such as
 Values defined in the map file can be fetched for the current platform in any
 state file using the following syntax:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% from "mysql/map.jinja" import mysql with context %}
 
@@ -987,7 +990,7 @@ XML.)
 
 ``/srv/salt/tomcat/server_xml.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {% import_yaml 'tomcat/defaults.yaml' as server_xml_defaults %}
     {% set server_xml_final_values = salt.pillar.get(
@@ -1022,7 +1025,7 @@ example:
 
 ``/srv/salt/app/deploy.sls``:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {# Load the map file. #}
     {% import_yaml 'app/defaults.yaml' as app_defaults %}
@@ -1081,7 +1084,7 @@ The following is a best-practice example for a reusable Apache formula. (This
 skips platform-specific options for brevity. See the full
 :formula_url:`apache-formula` for more.)
 
-.. code-block:: yaml
+.. code-block:: text
 
     # apache/init.sls
     apache:

doc/topics/development/extend/index.rst

@@ -12,38 +12,38 @@ You can use Salt Extend to quickly create templated modules for adding new behav
 Salt Extend takes a template directory and merges it into a SaltStack source code directory.
 
 Command line usage
-~~~~~~~~~~~~~~~~~~
+------------------
 
 *See* :ref:`salt-extend <salt-extend>`
 
 Choosing a template
-~~~~~~~~~~~~~~~~~~~
+-------------------
 
 The following templates are available:
 
 module
-^^^^^^
+******
 
 Creates a new execution module within salt/modules/{{module_name}}.py
 
 module_unit
-^^^^^^^^^^^
+***********
 
 Creates a new execution module unit test suite within tests/unit/modules/test_{{module_name}}.py
 
 state
-^^^^^
+*****
 
 Creates a new state module within salt/states/{{module_name}}.py
 
 state_unit
-^^^^^^^^^^
+**********
 
 Creates a new state module unit test suite within tests/unit/states/test_{{module_name}}.py
 
 
 Adding templates
-~~~~~~~~~~~~~~~~
+----------------
 
 1. Create a directory under <src>/templates
 2. Create a file ``template.yml`` containing properties for
@@ -51,12 +51,12 @@ Adding templates
  * ``description`` - a description of the template
  * ``questions`` - a collection of additional questions to ask the user, the name of the item will
    be used as the key in the context dictionary within the jinja template.
-   
+
    * ``question`` - The question to ask the user, as a string
    * ``default`` - (optional) the default value, can contain Jinja2 template syntax and has access to the default context properties
 
 Example template.yml
-^^^^^^^^^^^^^^^^^^^^
+********************
 
 .. code-block:: yaml
 
@@ -71,19 +71,19 @@ Example template.yml
 3. Create the files within <src>/templates/<your template> to match the target
 
 .. note::
-    
+
     File names can contain Jinja 2 template syntax, e.g. *'{{module_name}}.py}}'*
 
 Example file in the template directory
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+**************************************
 
 .. code-block:: python
 
     print('Hello {{module_name}}')
     __virtual__ = '{{__virtual_name__}}'
-    
+
 Default context properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+**************************
 
 The default context provides the following properties
 
@@ -97,10 +97,10 @@ The default context provides the following properties
 As well as any additional properties entered from the questions section of ``template.yml``
 
 API
-~~~
+---
 
 salt.utils.extend module
-========================
+************************
 
 .. automodule:: salt.utils.extend
     :members:

doc/topics/development/index.rst

@@ -8,7 +8,7 @@ Developing Salt
 
     *
     extend/index
-    tests/index
+    tests/*
     raet/index
     git/index
     conventions/index

doc/topics/development/labels.rst

@@ -4,98 +4,105 @@
 GitHub Labels and Milestones
 ============================
 
-SaltStack uses several label categories, as well as milestones, to triage incoming issues and pull requests in the
+SaltStack uses several label categories, as well as milestones, to triage
-GitHub issue tracker.  Labels are used to sort issues by type, priority, severity, status, functional area, functional
+incoming issues and pull requests in the GitHub issue tracker.  Labels are used
-group, and targeted release and pull requests by status, functional area, functional group, type of change, and test
+to sort issues by type, priority, severity, status, functional area, functional
-status.  Milestones are used to indicate whether an issue is fully triaged or is scheduled to be fixed by SaltStack in
+group, and targeted release and pull requests by status, functional area,
-an upcoming sprint.
+functional group, type of change, and test status.  Milestones are used to
+indicate whether an issue is fully triaged or is scheduled to be fixed by
+SaltStack in an upcoming sprint.
 
 Milestones
 ==========
 
-All issues are assigned to a milestone, whereas pull requests are almost never assigned to a milestone as the mean
+All issues are assigned to a milestone, whereas pull requests are almost never
-lifetime of pull requests is short enough that there is no need to track them temporally.
+assigned to a milestone as the mean lifetime of pull requests is short enough
+that there is no need to track them temporally.
 
-SaltStack uses milestones to indicate which issues are blocked on submitter or upstream actions, are approved, or are
+SaltStack uses milestones to indicate which issues are blocked on submitter or
-scheduled to be fixed or implemented in an upcoming sprint.  If an issue is not attached to a sprint milestone, you are
+upstream actions, are approved, or are scheduled to be fixed or implemented in
-welcome to work on it at your own desire and convenience.  If it is attached to a sprint milestone and you have already
+an upcoming sprint.  If an issue is not attached to a sprint milestone, you are
-begun working on it or have a solution in mind or have other ideas related to the issue, you are encouraged to
+welcome to work on it at your own desire and convenience.  If it is attached to
-coordinate with the assignee via the GitHub issue tracker to create the best possible solution or implementation.
+a sprint milestone and you have already begun working on it or have a solution
+in mind or have other ideas related to the issue, you are encouraged to
+coordinate with the assignee via the GitHub issue tracker to create the best
+possible solution or implementation.
 
-``Approved``
+- ``Approved`` - The issue has been validated and has all necessary information.
-    The issue has been validated and has all necessary information.
 
-``Blocked``
+- ``Blocked`` - The issue is waiting on actions by parties outside of
-    The issue is waiting on actions by parties outside of SaltStack, such as receiving more information from the
+  SaltStack, such as receiving more information from the submitter or
-    submitter or resolution of an upstream issue.  This milestone is usually applied in conjunction with the labels
+  resolution of an upstream issue.  This milestone is usually applied in
-    ``Info Needed``, ``Question``, ``Expected Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``.
+  conjunction with the labels ``Info Needed``, ``Question``, ``Expected
+  Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``.
 
-``Under Review``
+- ``Under Review`` - The issue is having further validation done by a SaltStack
-    The issue is having further validation done by a SaltStack engineer.
+  engineer.
 
-``<Sprint>``
+- ``<Sprint>`` - The issue is being actively worked on by a SaltStack engineer.
-    The issue is being actively worked on by a SaltStack engineer.  Sprint milestones names are constructed from the
+  Sprint milestones names are constructed from the chemical symbol of the next
-    chemical symbol of the next release's codename and the number of sprints until that release is made.  For example,
+  release's codename and the number of sprints until that release is made.  For
-    if the next release codename is ``Neon`` and there are five sprints until that release, the corresponding sprint
+  example, if the next release codename is ``Neon`` and there are five sprints
-    milestone will be called ``Ne 5``.  See :ref:`<version-numbers>` for a discussion of Salt's release
+  until that release, the corresponding sprint milestone will be called ``Ne
-    codenames.
+  5``.  See :ref:`here <version-numbers>` for a discussion of Salt's release
+  codenames.
 
 Labels
 ======
 
-Labels are used to sort and describe issues and pull requests.  Some labels are usually reserved for one or the other,
+Labels are used to sort and describe issues and pull requests.  Some labels are
-though most labels may be applied to both.
+usually reserved for one or the other, though most labels may be applied to
+both.
 
-New issues will receive at least one label and a milestone, and new pull requests will receive at least one label.
+New issues will receive at least one label and a milestone, and new pull
-Except for the :ref:`functional area <functional-area-labels>` and :ref:`functional group <functional-group-labels>`
+requests will receive at least one label.  Except for the :ref:`functional area
-label categories, issues will generally receive only up to one label per category.
+<functional-area-labels>` and :ref:`functional group <functional-group-labels>`
+label categories, issues will generally receive only up to one label per
+category.
 
 Type
 ----
 
-Issues are categorized into one of several types.  Type labels are almost never used for pull requests.  GitHub treats
+Issues are categorized into one of several types.  Type labels are almost never
-pull requests like issues in many ways, so a pull request could be considered an issue with an implicit ``Pull Request``
+used for pull requests.  GitHub treats pull requests like issues in many ways,
-type label applied.
+so a pull request could be considered an issue with an implicit ``Pull
+Request`` type label applied.
 
-``Feature``
+- ``Feature`` - The issue is a request for new functionality including changes,
-    The issue is a request for new functionality including changes, enhancements, refactors, etc.
+  enhancements, refactors, etc.
 
-``Bug``
+- ``Bug`` - The issue documents broken, incorrect, or confusing behavior.  This
-    The issue documents broken, incorrect, or confusing behavior.  This label is always accompanied by a :ref:`severity
+  label is always accompanied by a :ref:`severity label <bug-severity-labels>`.
-    label <bug-severity-labels>`.
 
-``Duplicate``
+- ``Duplicate`` - The issue is a duplicate of another feature request or bug
-    The issue is a duplicate of another feature request or bug report.
+  report.
 
-``Upstream Bug``
+- ``Upstream Bug`` - The issue is a result of an upstream issue.
-    The issue is a result of an upstream issue.
 
-``Question``
+- ``Question`` - The issue is more of a question than a request for new
-    The issue is more of a question than a request for new features or a report of broken features, but can sometimes
+  features or a report of broken features, but can sometimes lead to further
-    lead to further discussion or changes of confusing or incongruous behavior or documentation.
+  discussion or changes of confusing or incongruous behavior or documentation.
 
-``Expected Behavior``
+- ``Expected Behavior`` - The issue is a bug report of intended functionality.
-    The issue is a bug report of intended functionality.
 
 Priority
 --------
 
-An issue's priority is relative to its :ref:`functional area <functional-area-labels>`.  If a bug report, for example,
+An issue's priority is relative to its :ref:`functional area
-about ``gitfs`` indicates that all users of ``gitfs`` will encounter this bug, then a ``P1`` label will be applied, even
+<functional-area-labels>`.  If a bug report, for example, about ``gitfs``
-though users who are not using ``gitfs`` will not encounter the bug.  If a feature is requested by many users, it may be
+indicates that all users of ``gitfs`` will encounter this bug, then a ``P1``
-given a high priority.
+label will be applied, even though users who are not using ``gitfs`` will not
+encounter the bug.  If a feature is requested by many users, it may be given a
+high priority.
 
-``P1``
+- ``P1`` - The issue will be seen by all users.
-    The issue will be seen by all users.
 
-``P2``
+- ``P2`` - The issue will be seen by most users.
-    The issue will be seen by most users.
 
-``P3``
+- ``P3`` - The issue will be seen by about half of users.
-    The issue will be seen by about half of users.
 
-``P4``
+- ``P4`` - The issue will not be seen by most users.  Usually the issue is a
-    The issue will not be seen by most users.  Usually the issue is a very specific use case or corner case.
+  very specific use case or corner case.
 
 .. _bug-severity-labels:
 
@@ -104,196 +111,219 @@ Severity
 
 Severity labels are almost always only applied to issues labeled ``Bug``.
 
-``Blocker``
+- ``Blocker`` - The issue is blocking an impending release.
-    The issue is blocking an impending release.
 
-``Critical``
+- ``Critical`` - The issue causes data loss, crashes or hangs salt processes,
-    The issue causes data loss, crashes or hangs salt processes, makes the system unresponsive, etc.
+  makes the system unresponsive, etc.
 
-``High Severity``
+- ``High Severity`` - The issue reports incorrect functionality, bad
-    The issue reports incorrect functionality, bad functionality, a confusing user experience, etc.
+  functionality, a confusing user experience, etc.
 
-``Medium Severity``
+- ``Medium Severity`` - The issue reports cosmetic items, formatting, spelling,
-    The issue reports cosmetic items, formatting, spelling, colors, etc.
+  colors, etc.
 
 .. _functional-area-labels:
 
 Functional Area
 ---------------
 
-Many major components of Salt have corresponding GitHub labels.  These labels are applied to all issues and pull
+Many major components of Salt have corresponding GitHub labels.  These labels
-requests as is reasonably appropriate.  They are useful in organizing issues and pull requests according to the source
+are applied to all issues and pull requests as is reasonably appropriate.  They
-code relevant to issues or the source code changed by pull requests.
+are useful in organizing issues and pull requests according to the source code
+relevant to issues or the source code changed by pull requests.
 
-* ``Execution Module``
+- ``Execution Module``
-* ``File Servers``
+- ``File Servers``
-* ``Grains``
+- ``Grains``
-* ``Multi-Master``
+- ``Multi-Master``
-* ``Packaging``  Related to packaging of Salt, not Salt's support for package management.
+- ``Packaging``  Related to packaging of Salt, not Salt's support for package management.
-* ``Pillar``
+- ``Pillar``
-* ``RAET``
+- ``RAET``
-* ``Returners``
+- ``Returners``
-* ``Runners``
+- ``Runners``
-* ``SPM``
+- ``SPM``
-* ``Salt-API``
+- ``Salt-API``
-* ``Salt-Cloud``
+- ``Salt-Cloud``
-* ``Salt-SSH``
+- ``Salt-SSH``
-* ``Salt-Syndic``
+- ``Salt-Syndic``
-* ``State Module``
+- ``State Module``
-* ``Tests``
+- ``Tests``
-* ``Transport``
+- ``Transport``
-* ``Windows``
+- ``Windows``
-* ``ZMQ``
+- ``ZMQ``
 
 .. _functional-group-labels:
 
 Functional Group
 ----------------
 
-These labels sort issues and pull requests according to the internal SaltStack engineering teams.
+These labels sort issues and pull requests according to the internal SaltStack
+engineering teams.
 
-``Core``
+- ``Core`` - The issue or pull request relates to code that is central or
-    The issue or pull request relates to code that is central or existential to Salt itself.
+  existential to Salt itself.
 
-``Platform``
+- ``Platform`` - The issue or pull request relates to support and integration
-    The issue or pull request relates to support and integration with various platforms like traditional operating
+  with various platforms like traditional operating systems as well as
-    systems as well as containers, platform-based utilities like filesystems, command schedulers, etc., and
+  containers, platform-based utilities like filesystems, command schedulers,
-    system-based applications like webservers, databases, etc.
+  etc., and system-based applications like webservers, databases, etc.
 
-``RIoT``
+- ``RIoT`` - The issue or pull request relates to support and integration with
-    The issue or pull request relates to support and integration with various abstract systems like cloud providers,
+  various abstract systems like cloud providers, hypervisors, API-based
-    hypervisors, API-based services, etc.
+  services, etc.
 
-``Console``
+- ``Console`` - The issue or pull request relates to the SaltStack enterprise
-    The issue or pull request relates to the SaltStack enterprise console.
+  console.
 
-``Documentation``
+- ``Documentation`` - The issue or pull request relates to documentation.
-    The issue or pull request relates to documentation.
 
 Status
 ------
 
-Status labels are used to define and track the state of issues and pull requests.  Not all potential statuses correspond
+Status labels are used to define and track the state of issues and pull
-to a label, but some statuses are common enough that labels have been created for them.  If an issue has not been moved
+requests.  Not all potential statuses correspond to a label, but some statuses
-beyond the ``Blocked`` milestone, it is very likely that it will only have a status label.
+are common enough that labels have been created for them.  If an issue has not
+been moved beyond the ``Blocked`` milestone, it is very likely that it will
+only have a status label.
 
-``Bugfix - back-port``
+- ``Bugfix - back-port`` The pull request needs to be back-ported to an older
-    The pull request needs to be back-ported to an older release branch.  This is done by :ref:`recreating the pull
+  release branch.  This is done by :ref:`recreating the pull request
-    request <backporting-pull-requests>` against that branch.  Once the back-port is completed, this label is replaced
+  <backporting-pull-requests>` against that branch.  Once the back-port is
-    with a ``Bugfix - [Done] back-ported`` label.  Normally, new features should go into the develop and bug fixes into
+  completed, this label is replaced with a ``Bugfix - [Done] back-ported``
-    the oldest supported release branch, see :ref:`<which-salt-branch>`.
+  label.  Normally, new features should go into the develop and bug fixes into
+  the oldest supported release branch, see :ref:`here <which-salt-branch>`.
 
-``Bugfix - [Done] back-ported``
+- ``Bugfix - [Done] back-ported`` - The pull request has been back-ported to an
-    The pull request has been back-ported to an older branch.
+  older branch.
 
-``Cannot Reproduce``
+- ``Cannot Reproduce`` - The issue is a bug and has been reviewed by a
-    The issue is a bug and has been reviewed by a SaltStack engineer, but it cannot be replicated with the provided
+  SaltStack engineer, but it cannot be replicated with the provided information
-    information and context.  Those involved with the bug will need to work through additional ideas until the bug can
+  and context.  Those involved with the bug will need to work through
-    be isolated and verified.
+  additional ideas until the bug can be isolated and verified.
 
-``Confirmed``
+- ``Confirmed`` - The issue is a bug and has been confirmed by a SaltStack
-    The issue is a bug and has been confirmed by a SaltStack engineer, who often documents a minimal working example
+  engineer, who often documents a minimal working example that reproduces the
-    that reproduces the bug.
+  bug.
 
-``Fixed Pending Verification``
+- ``Fixed Pending Verification`` - The issue is a bug and has been fixed by one
-    The issue is a bug and has been fixed by one or more pull requests, which should link to the issue.  Closure of the
+  or more pull requests, which should link to the issue.  Closure of the issue
-    issue is contingent upon confirmation of resolution from the submitter.  If the submitter reports a negative
+  is contingent upon confirmation of resolution from the submitter.  If the
-    confirmation, this label is removed.  If no response is given after a few weeks, then the issue will be assumed
+  submitter reports a negative confirmation, this label is removed.  If no
-    fixed and closed.
+  response is given after a few weeks, then the issue will be assumed fixed and
+  closed.
 
-``Info Needed``
+- ``Info Needed`` - The issue needs more information before it can be verified
-    The issue needs more information before it can be verified and resolved.  For a feature request this may include a
+  and resolved.  For a feature request this may include a description of the
-    description of the use cases.  Almost all bug reports need to include at least the versions of salt and its
+  use cases.  Almost all bug reports need to include at least the versions of
-    dependencies, the system type and version, commands used, debug logs, error messages, and relevant configs.
+  salt and its dependencies, the system type and version, commands used, debug
+  logs, error messages, and relevant configs.
 
-``Pending Changes``
+- ``Pending Changes`` - The pull request needs additional changes before it can
-    The pull request needs additional changes before it can be merged.
+  be merged.
 
-``Pending Discussion``
+- ``Pending Discussion`` - The issue or pull request needs more discussion
-    The issue or pull request needs more discussion before it can be closed or merged.  The status of the issue or pull
+  before it can be closed or merged.  The status of the issue or pull request
-    request is not clear or apparent enough for definite action to be taken, or additional input from SaltStack, the
+  is not clear or apparent enough for definite action to be taken, or
-    submitter, or another party has been requested.
+  additional input from SaltStack, the submitter, or another party has been
+  requested.
 
-    If the issue is not a pull request, once the discussion has arrived at a cogent conclusion, this label will be
+  If the issue is not a pull request, once the discussion has arrived at a
-    removed and the issue will be accepted.  If it is a pull request, the results of the discussion may require
+  cogent conclusion, this label will be removed and the issue will be accepted.
-    additional changes and thus, a ``Pending Changes`` label.
+  If it is a pull request, the results of the discussion may require additional
+  changes and thus, a ``Pending Changes`` label.
 
-``Won't Fix for Now``
+- ``Won't Fix for Now`` - The issue is legitimate, but it is not something the
-    The issue is legitimate, but it is not something the SaltStack team is currently able or willing to fix or
+  SaltStack team is currently able or willing to fix or implement.  Issues
-    implement.  Issues having this label may be revisited in the future.
+  having this label may be revisited in the future.
 
 Type of Change
 ~~~~~~~~~~~~~~
 
-Every pull request should receive a change label.  These labels measure the quantity of change as well as the
+Every pull request should receive a change label.  These labels measure the
-significance of the change.  The amount of change and the importance of the code area changed are considered, but often
+quantity of change as well as the significance of the change.  The amount of
-the depth of secondary code review required and the potential repercussions of the change may also advise the label
+change and the importance of the code area changed are considered, but often
-choice.
+the depth of secondary code review required and the potential repercussions of
+the change may also advise the label choice.
 
-Core code areas include: state compiler, crypto engine, master and minion and syndic daemons, transport, pillar
+Core code areas include: state compiler, crypto engine, master and minion and
-rendering, loader, transport layer, event system, salt.utils, client, cli, logging, netapi, runner engine, templating
+syndic daemons, transport, pillar rendering, loader, transport layer, event
-engine, top file compilation, file client, file server, mine, salt-ssh, test runner, etc.
+system, salt.utils, client, cli, logging, netapi, runner engine, templating
+engine, top file compilation, file client, file server, mine, salt-ssh, test
+runner, etc.
 
-Non-core code usually constitutes the specific set of plugins for each of the several plugin layers of Salt: execution
+Non-core code usually constitutes the specific set of plugins for each of the
-modules, states, runners, returners, clouds, etc.
+several plugin layers of Salt: execution modules, states, runners, returners,
+clouds, etc.
 
-``Minor Change``
+- ``Minor Change``
-    * Less than 64 lines changed, or
+
-    * Less than 8 core lines changed
+  * Less than 64 lines changed, or
-``Medium Change``
+
-    * Less than 256 lines changed, or
+  * Less than 8 core lines changed
-    * Less than 64 core lines changed
+
-``Master Change``
+- ``Medium Change``
-    * More than 256 lines changed, or
+
-    * More than 64 core lines changed
+  * Less than 256 lines changed, or
-``Expert Change``
+
-    * Needs specialized, in-depth review
+  * Less than 64 core lines changed
+
+- ``Master Change``
+
+  * More than 256 lines changed, or
+
+  * More than 64 core lines changed
+
+- ``Expert Change``
+
+  * Needs specialized, in-depth review
 
 Test Status
 -----------
 
-These labels relate to the status of the automated tests that run on pull requests.  If the tests on a pull request fail
+These labels relate to the status of the automated tests that run on pull
-and are not overridden by one of these labels, the pull request submitter needs to update the code and/or tests so that
+requests.  If the tests on a pull request fail and are not overridden by one of
-the tests pass and the pull request can be merged.
+these labels, the pull request submitter needs to update the code and/or tests
+so that the tests pass and the pull request can be merged.
 
-``Lint``
+- ``Lint`` - The pull request has passed all tests except for the code lint
-    The pull request has passed all tests except for the code lint checker.
+  checker.
 
-``Tests Passed``
+- ``Tests Passed`` - The pull request has passed all tests even though some
-    The pull request has passed all tests even though some test results are negative.  Sometimes the automated testing
+  test results are negative.  Sometimes the automated testing infrastructure
-    infrastructure will encounter internal errors unrelated to the code change in the pull request that cause test runs
+  will encounter internal errors unrelated to the code change in the pull
-    to fail.  These errors can be caused by cloud host and network issues and also Jenkins issues like erroneously
+  request that cause test runs to fail.  These errors can be caused by cloud
-    accumulating workspace artifacts, resource exhaustion, and bugs that arise from long running Jenkins processes.
+  host and network issues and also Jenkins issues like erroneously accumulating
+  workspace artifacts, resource exhaustion, and bugs that arise from long
+  running Jenkins processes.
 
 Other
 -----
 
-These labels indicate miscellaneous issue types or statuses that are common or important enough to be tracked and sorted
+These labels indicate miscellaneous issue types or statuses that are common or
-with labels.
+important enough to be tracked and sorted with labels.
 
-``Awesome``
+- ``Awesome`` - The pull request implements an especially well crafted
-    The pull request implements an especially well crafted solution, or a very difficult but necessary change.
+  solution, or a very difficult but necessary change.
 
-``Help Wanted``
+- ``Help Wanted`` - The issue appears to have a simple solution.  Issues having
-    The issue appears to have a simple solution.  Issues having this label
+  this label should be a good starting place for new contributors to Salt.
-    should be a good starting place for new contributors to Salt.
 
-``Needs Testcase``
+- ``Needs Testcase`` - The issue or pull request relates to a feature that
-    The issue or pull request relates to a feature that needs test coverage.  The pull request containing the tests
+  needs test coverage.  The pull request containing the tests should reference
-    should reference the issue or pull request having this label, whereupon the label should be removed.
+  the issue or pull request having this label, whereupon the label should be
+  removed.
 
-``Regression``
+- ``Regression`` - The issue is a bug that breaks functionality known to work
-    The issue is a bug that breaks functionality known to work in previous releases.
+  in previous releases.
 
-``Story``
+- ``Story`` - The issue is used by a SaltStack engineer to track progress on
-    The issue is used by a SaltStack engineer to track progress on multiple related issues in a single place.
+  multiple related issues in a single place.
 
-``Stretch``
+- ``Stretch`` - The issue is an optional goal for the current sprint but may
-    The issue is an optional goal for the current sprint but may not be delivered.
+  not be delivered.
 
-``ZD``
+- ``ZD`` - The issue is related to a Zendesk customer support ticket.
-    The issue is related to a Zendesk customer support ticket.
 
-``<Release>``
+- ``<Release>`` - The issue is scheduled to be implemented by ``<Release>``.
-    The issue is scheduled to be implemented by ``<Release>``.  See :ref:`<version-numbers>` for a
+  See :ref:`here <version-numbers>` for a discussion of Salt's release
-    discussion of Salt's release codenames.
+  codenames.

doc/topics/development/tutorial.rst

@@ -34,7 +34,7 @@ Clone
 In your CLI, navigate to the directory into which you want clone the Salt
 codebase and submit the following command:
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git clone https://github.com/<my_account>/salt.git
 
@@ -42,7 +42,7 @@ where ``<my_account>`` is the name of your GitHub account.  After the clone has
 completed, add SaltStack as a second remote and fetch any changes from
 ``upstream``.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ cd salt
     $ git remote add upstream https://github.com/saltstack/salt.git
@@ -53,7 +53,7 @@ the default branch for the SaltStack GitHub project.  This branch needs to
 track ``upstream/develop`` so that we will get all upstream changes when they
 happen.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git checkout develop
     $ git branch --set-upstream-to upstream/develop
@@ -65,7 +65,7 @@ Fetch
 Fetch any ``upstream`` changes on the ``develop`` branch and sync them to your
 local copy of the branch with a single command:
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git pull --rebase
 
@@ -87,7 +87,7 @@ updated.  I'll select the ``alternatives`` module.
 Create a new branch off from ``develop``.  Be sure to name it something short
 and descriptive.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git checkout -b virt_ret
 
@@ -97,10 +97,13 @@ Edit
 
 Edit the file you have selected, and verify that the changes are correct.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ vim salt/modules/alternatives.py
     $ git diff
+
+.. code-block:: diff
+
     diff --git a/salt/modules/alternatives.py b/salt/modules/alternatives.py
     index 1653e5f..30c0a59 100644
     --- a/salt/modules/alternatives.py
@@ -122,7 +125,7 @@ Commit
 Stage and commit the changes.  Write a descriptive commit summary, but try to
 keep it less than 50 characters.  Review your commit.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git add salt/modules/alternatives.py
     $ git commit -m 'modules.alternatives: __virtual__ return err msg'
@@ -143,7 +146,7 @@ Push
 Push your branch to your GitHub account.  You will likely need to enter your
 GitHub username and password.
 
-.. code-block:: shell
+.. code-block:: bash
 
     $ git push origin virt_ret
     Username for 'https://github.com': <my_account>
@@ -156,7 +159,7 @@ GitHub username and password.
     you have done this, you may need add the keys to your git repository
     configuration
 
-    .. code-block:: shell
+    .. code-block:: bash
 
         $ git config ssh.key ~/.ssh/<key_name>
 

doc/topics/grains/index.rst

@@ -124,9 +124,9 @@ Writing Grains
 The grains are derived by executing all of the "public" functions (i.e. those
 which do not begin with an underscore) found in the modules located in the
 Salt's core grains code, followed by those in any custom grains modules. The
-functions in a grains module must return a Python :ref:`dict
+functions in a grains module must return a :ref:`Python dictionary
-<python2:typesmapping>`, where the dictionary keys are the names of grains, and
+<typesmapping>`, where the dictionary keys are the names of grains, and each
-each key's value is that value for that grain.
+key's value is that value for that grain.
 
 Custom grains modules should be placed in a subdirectory named ``_grains``
 located under the :conf_master:`file_roots` specified by the master config

doc/topics/index.rst

@@ -119,9 +119,9 @@ can use the `Freenode webchat client`_ right from your browser.
 
 `Logs of the IRC channel activity`_ are being collected courtesy of Moritz Lenz.
 
-.. _Freenode:: http://freenode.net/irc_servers.shtml
+.. _Freenode: http://freenode.net/irc_servers.shtml
-.. _Freenode webchat client:: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
+.. _`Freenode webchat client`: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
-.. _Logs of the IRC channel activity:: http://irclog.perlgeek.de/salt/
+.. _`Logs of the IRC channel activity`: http://irclog.perlgeek.de/salt/
 
 If you wish to discuss the development of Salt itself join us in
 ``#salt-devel``.

doc/topics/installation/freebsd.rst

@@ -15,7 +15,7 @@ FreeBSD repo
 The FreeBSD pkgng repository is preconfigured on systems 10.x and above. No
 configuration is needed to pull from these repositories.
 
-.. code-block:: shell
+.. code-block:: bash
 
     pkg install py27-salt
 
@@ -32,7 +32,7 @@ following file to your system:
 
 **/usr/local/etc/pkg/repos/saltstack.conf:**
 
-.. code-block:: json
+.. code-block:: text
 
     saltstack: {
       url: "https://repo.saltstack.com/freebsd/${ABI}/",
@@ -41,7 +41,7 @@ following file to your system:
 
 You should now be able to install Salt from this new repository:
 
-.. code-block:: shell
+.. code-block:: bash
 
     pkg install py27-salt
 
@@ -56,7 +56,7 @@ Post-installation tasks
 
 Copy the sample configuration file:
 
-.. code-block:: shell
+.. code-block:: bash
 
    cp /usr/local/etc/salt/master.sample /usr/local/etc/salt/master
 
@@ -64,7 +64,7 @@ Copy the sample configuration file:
 
 Activate the Salt Master in ``/etc/rc.conf``:
 
-.. code-block:: shell
+.. code-block:: bash
 
    sysrc salt_master_enable="YES"
 
@@ -72,7 +72,7 @@ Activate the Salt Master in ``/etc/rc.conf``:
 
 Start the Salt Master as follows:
 
-.. code-block:: shell
+.. code-block:: bash
 
    service salt_master start
 
@@ -80,7 +80,7 @@ Start the Salt Master as follows:
 
 Copy the sample configuration file:
 
-.. code-block:: shell
+.. code-block:: bash
 
    cp /usr/local/etc/salt/minion.sample /usr/local/etc/salt/minion
 
@@ -88,7 +88,7 @@ Copy the sample configuration file:
 
 Activate the Salt Minion in ``/etc/rc.conf``:
 
-.. code-block:: shell
+.. code-block:: bash
 
    sysrc salt_minion_enable="YES"
 
@@ -96,7 +96,7 @@ Activate the Salt Minion in ``/etc/rc.conf``:
 
 Start the Salt Minion as follows:
 
-.. code-block:: shell
+.. code-block:: bash
 
    service salt_minion start
 

doc/topics/installation/index.rst

@@ -142,7 +142,7 @@ Optional Dependencies
   settings)
 * gcc - dynamic `Cython`_ module compiling
 
-.. _`Python 2.6`: http://python.org/download/
+.. _`Python 2.7`: http://python.org/download/
 .. _`ZeroMQ`: http://zeromq.org/
 .. _`pyzmq`: https://github.com/zeromq/pyzmq
 .. _`msgpack-python`:  https://pypi.python.org/pypi/msgpack-python/

doc/topics/jinja/index.rst

@@ -4,14 +4,13 @@
 Understanding Jinja
 ===================
 
-`Jinja <http://jinja.pocoo.org/docs/>`_ is the default templating language
+`Jinja`_ is the default templating language in SLS files.
-in SLS files.
+
+.. _Jinja: http://jinja.pocoo.org/docs/templates/
 
 Jinja in States
 ===============
 
-.. _Jinja: http://jinja.pocoo.org/docs/templates/
-
 Jinja is evaluated before YAML, which means it is evaluated before the States
 are run.
 
@@ -176,10 +175,9 @@ Saltstack extends `builtin filters`_ with these custom filters:
 ``strftime``
 ------------
 
-Converts any time related object into a time based string. It requires a
+Converts any time related object into a time based string. It requires valid
-valid :ref:`strftime directives <python2:strftime-strptime-behavior>`. An
+strftime directives. An exhaustive list can be found :ref:`here
-:ref:`exhaustive list <python2:strftime-strptime-behavior>` can be found in
+<strftime-strptime-behavior>` in the Python documentation.
-the official Python documentation.
 
 .. code-block:: jinja
 
@@ -1805,7 +1803,7 @@ Logs
 Yes, in Salt, one is able to debug a complex Jinja template using the logs.
 For example, making the call:
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     {%- do salt.log.error('testing jinja logging') -%}
 

doc/topics/netapi/index.rst

@@ -38,8 +38,8 @@ simply by creating a data structure. (And this is exactly how much of Salt's
 own internals work!)
 
 .. autoclass:: salt.netapi.NetapiClient
-    :members: local, local_async, local_subset, ssh, ssh_async, 
+    :members: local, local_async, local_subset, ssh, runner, runner_async,
-        runner, runner_async, wheel, wheel_async
+        wheel, wheel_async
 
 .. toctree::
 

doc/topics/orchestrate/orchestrate_runner.rst

@@ -235,7 +235,7 @@ To get a more dynamic state, use jinja variables together with
 Using the same example but passing on pillar data, the state would be like
 this.
 
-.. code-block:: yaml
+.. code-block:: jinja
 
     # /srv/salt/orch/deploy.sls
     {% set servers = salt['pillar.get']('servers', 'test') %}

doc/topics/pillar/index.rst

@@ -114,7 +114,7 @@ targeting to them via a top file will have the key of ``company`` with a value
 of ``Foo Industries``.
 
 Consequently this data can be used from within modules, renderers, State SLS
-files, and more via the shared pillar :ref:`dict <python2:typesmapping>`:
+files, and more via the shared pillar dictionary:
 
 .. code-block:: jinja
 

doc/topics/proxyminion/index.rst

@@ -54,7 +54,7 @@ connection with the remote device only when required.
 New in 2016.11.0
 ----------------
 
-Proxy minions now support configuration files with names ending in '*.conf'
+Proxy minions now support configuration files with names ending in '\*.conf'
 and placed in /etc/salt/proxy.d.
 
 Proxy minions can now be configured in /etc/salt/proxy or /etc/salt/proxy.d
@@ -387,8 +387,9 @@ Pre 2015.8 the proxymodule also must have an ``id()`` function.  2015.8 and foll
 this function because the proxy's id is required on the command line.
 
 Here is an example proxymodule used to interface to a *very* simple REST
-server.  Code for the server is in the `salt-contrib GitHub repository
+server. Code for the server is in the `salt-contrib GitHub repository`_.
-<https://github.com/saltstack/salt-contrib/tree/master/proxyminion_rest_example>`_
+
+.. _`salt-contrib GitHub repository`: https://github.com/saltstack/salt-contrib/tree/master/proxyminion_rest_example
 
 This proxymodule enables "service" enumeration, starting, stopping, restarting,
 and status; "package" installation, and a ping.
@@ -738,7 +739,7 @@ This sections specifically talks about the SSH proxy module and
 explains the working of the example proxy module ``ssh_sample``.
 
 Here is a simple example proxymodule used to interface to a device over SSH.
-Code for the SSH shell is in the `salt-contrib GitHub repository <https://github.com/saltstack/salt-contrib/proxyminion_ssh_example>`_
+Code for the SSH shell is in the `salt-contrib GitHub repository`_.
 
 This proxymodule enables "package" installation.
 

doc/topics/releases/0.6.0.rst

@@ -47,8 +47,6 @@ You can find the source code for Salt on my GitHub page, I have also set up a
 few wiki pages explaining how to use and set up Salt. If you are using Arch
 Linux there is a package available in the Arch Linux AUR.
 
-Salt 0.6.0 Source: :download:`salt-0.6.0.tar.gz`
-
 GitHub page: |saltrepo|
 
 Wiki: https://github.com/saltstack/salt/wiki

doc/topics/releases/0.7.0.rst

@@ -50,12 +50,8 @@ to Matthias Teege for tracking down some configuration bugs!
 
 Salt can be downloaded from the following locations;
 
-Source Tarball:
-
-:download:`salt-0.7.0.tar.gz`
-
 Arch Linux Package:
 
 https://aur.archlinux.org/packages/salt-git/
 
-Please enjoy the latest Salt release!
+Please enjoy the latest Salt release!

doc/topics/releases/0.8.0.rst

@@ -5,8 +5,6 @@ Salt 0.8.0 release notes
 Salt 0.8.0 is ready for general consumption!
 The source tarball is available on GitHub for download:
 
-:download:`salt-0.8.0.tar.gz`
-
 A lot of work has gone into salt since the last release just 2 weeks ago, and
 salt has improved a great deal. A swath of new features are here along with
 performance and threading improvements!

doc/topics/releases/0.8.7.rst

@@ -13,7 +13,6 @@ but the back end to support expansion is in place.
 
 I also recently gave a presentation to the Utah Python users group in Salt Lake
 City, the slides from this presentation are available here:
-:download:`Salt.pdf`
 
 The video from this presentation will be available shortly.
 
@@ -74,7 +73,5 @@ making debugging of minion modules MUCH easier.
 Salt is nearing the goal of 1.0, where the core feature set and capability is
 complete!
 
-Salt 0.8.7 can be downloaded from GitHub here:
-:download:`salt-0.8.7.tar.gz`
 
--Thomas S Hatch
+-Thomas S Hatch

doc/topics/releases/0.8.8.rst

@@ -3,8 +3,7 @@ Salt 0.8.8 release notes
 ========================
 
 Salt 0.8.8 is here! This release adds a great deal of code and some serious new
-features. The latest release can be downloaded here:
+features.
-:download:`salt-0.8.8.tar.gz`
 
 Improved Documentation has been set up for salt using sphinx thanks to the
 efforts of Seth House. This new documentation system will act as the back end
@@ -73,6 +72,5 @@ maintaining supreme usability and simplicity.
 If you would like a more complete overview of Salt please watch the Salt
 presentation:
 Slides:
-:download:`Salt.pdf`
 
--Thomas S Hatch
+-Thomas S Hatch

doc/topics/releases/0.8.9.rst

@@ -17,11 +17,7 @@ date has been filled in.
 Download!
 ---------
 
-The Salt source can be downloaded from the salt GitHub site:
+The Salt source can be downloaded from PyPI:
-
-:download:`salt-0.8.9.tar.gz`
-
-Or from PyPI:
 
 https://pypi.python.org/packages/source/s/salt/salt-0.8.9.tar.gz
 

doc/topics/releases/0.9.0.rst

@@ -14,11 +14,7 @@ improvements to the ZeroMQ systems.
 Download!
 ---------
 
-The Salt source can be downloaded from the salt GitHub site:
+The Salt source can be downloaded from PyPI:
-
-:download:`salt-0.9.0.tar.gz`
-
-Or from PyPI:
 
 https://pypi.python.org/packages/source/s/salt/salt-0.9.0.tar.gz
 
@@ -124,4 +120,4 @@ Extensive utilities for managing processes
 publish
 ~~~~~~~
 
-Used by the peer interface to allow minions to make publications
+Used by the peer interface to allow minions to make publications

doc/topics/releases/0.9.2.rst

@@ -17,11 +17,7 @@ helping us clean up the states interface and make it ready for the world!
 Download!
 ---------
 
-The Salt source can be downloaded from the salt GitHub site:
+The Salt source can be downloaded from PyPI:
-
-:download:`salt-0.9.2.tar.gz`
-
-Or from PyPI:
 
 https://pypi.python.org/packages/source/s/salt/salt-0.9.2.tar.gz
 
@@ -77,4 +73,4 @@ Cython Loading Disabled by Default
 Cython loading requires a development tool chain to be installed on the minion,
 requiring this by default can cause problems for most Salt deployments. If
 Cython auto loading is desired it will need to be turned on in the minion
-config.
+config.

doc/topics/releases/0.9.3.rst

@@ -16,11 +16,7 @@ system has been greatly refined and many new features are available.
 Download!
 ---------
 
-The Salt source can be downloaded from the salt GitHub site:
+The Salt source can be downloaded from PyPI:
-
-:download:`salt-0.9.3.tar.gz`
-
-Or from PyPI:
 
 https://pypi.python.org/packages/source/s/salt/salt-0.9.3.tar.gz
 

doc/topics/releases/0.9.4.rst

@@ -18,11 +18,7 @@ our new and existing contributors.
 Download!
 =========
 
-The Salt source can be downloaded from the salt GitHub site:
+The Salt source can be downloaded from PyPI:
-
-:download:`salt-0.9.4.tar.gz`
-
-Or from PyPI:
 
 https://pypi.python.org/packages/source/s/salt/salt-0.9.4.tar.gz
 
@@ -145,4 +141,4 @@ Gentoo Support
 --------------
 
 Additional experimental support has been added for Gentoo. This is found in
-the contribution from Doug Renn, aka nestegg.
+the contribution from Doug Renn, aka nestegg.

doc/topics/releases/2014.7.1.rst

@@ -4,7 +4,7 @@ Salt 2014.7.1 Release Notes
 
 :release: 2015-01-12
 
-Version 2014.7.1 is a bugfix release for :ref:`2014.7.0<release-2014-7-0>`.
+Version 2014.7.1 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
 
 The changes include:
 

doc/topics/releases/2014.7.3.rst

@@ -2,9 +2,9 @@
 Salt 2014.7.3 Release Notes
 ===========================
 
-:release: TBA
+:release: 2015-03-25
 
-Version 2014.7.3 is a bugfix release for :ref:`2014.7.0<release-2014-7-0>`.
+Version 2014.7.3 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
 
 Changes:
 

doc/topics/releases/2014.7.4.rst

@@ -4,7 +4,7 @@ Salt 2014.7.4 Release Notes
 
 :release: 2015-03-30
 
-Version 2014.7.4 is a bugfix release for :ref:`2014.7.0<release-2014-7-0>`.
+Version 2014.7.4 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
 
 This is a security release. The security issues fixed have only been present
 since 2014.7.0, and only users of the two listed modules are vulnerable. The

doc/topics/releases/2014.7.5.rst

@@ -4,7 +4,7 @@ Salt 2014.7.5 Release Notes
 
 :release: 2015-04-16
 
-Version 2014.7.5 is a bugfix release for :ref:`2014.7.0<release-2014-7-0>`.
+Version 2014.7.5 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
 
 Changes:
 

doc/topics/releases/2014.7.7.rst

@@ -0,0 +1,624 @@
+===========================
+Salt 2014.7.7 Release Notes
+===========================
+
+:release: 2015-10-13
+
+Version 2014.7.7 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
+
+Statistics
+==========
+
+- Total Merges: **54**
+- Total Issue References: **20**
+- Total PR References: **60**
+
+- Contributors: **28** (`AkhterAli`_, `BretFisher`_, `MrCitron`_, `alekti`_, `basepi`_, `bersace`_, `cachedout`_, `corux`_, `cro`_, `davidjb`_, `dumol`_, `efficks`_, `garethgreenaway`_, `hvnsweeting`_, `jacksontj`_, `jacobhammons`_, `jaybocc2`_, `jfindlay`_, `jquast`_, `justinta`_, `msteed`_, `nmadhok`_, `notpeter`_, `puneetk`_, `rallytime`_, `techhat`_, `trevor-h`_, `twangboy`_)
+
+
+Changelog for v2014.7.6..v2014.7.7
+==================================
+
+*Generated at: 2018-05-27 20:45:04 UTC*
+
+* **PR** `#27335`_: (`rallytime`_) [2014.7] Fixup salt-cloud logging
+  @ *2015-09-24 20:33:53 UTC*
+
+  * 5262f01325 Merge pull request `#27335`_ from rallytime/cloud-logging-7
+
+  * adeb1dcad4 Pylint Fix
+
+  * 588c13783c Salt-cloud logging clean up for windows functions
+
+  * 9b6000135c [2014.7] Fixup salt-cloud logging
+
+* **PR** `#27252`_: (`jfindlay`_) 2014.7 -> 2014.7.0
+  @ *2015-09-18 23:44:39 UTC*
+
+  * e90412d3b8 Merge pull request `#27252`_ from jfindlay/version.2014.7
+
+  * 3d28307a00 2014.7 -> 2014.7.0
+
+* **PR** `#27117`_: (`jacobhammons`_) made 2014.7 an archived release
+  @ *2015-09-15 07:35:12 UTC*
+
+  * c186e51764 Merge pull request `#27117`_ from jacobhammons/release-docs-2014.7
+
+  * b69e11e0a4 made 2014.7 an archived release minor doc site updates
+
+* **PR** `#27114`_: (`cachedout`_) Issue warning that some log levels may contain sensitive data
+  @ *2015-09-15 07:30:43 UTC*
+
+  * 69d758ee2b Merge pull request `#27114`_ from cachedout/warn_on_insecure_log
+
+  * 507fb04683 Issue warning that some log levels may contain sensitive data
+
+* **PR** `#27075`_: (`twangboy`_) Replaced password with redacted when displayed
+  @ *2015-09-14 18:36:10 UTC*
+
+  * aa71bae8aa Merge pull request `#27075`_ from twangboy/fix_password_2014.7
+
+  * c0689e3215 Replaced password with redacted when displayed
+
+* **ISSUE** `#26656`_: (`ari`_) [documentation] error in example for salt.runner.pillar (refs: `#26667`_)
+
+* **PR** `#26667`_: (`nmadhok`_) [doc-fix] Removing special character from salt.runners.pillar and other changes
+  @ *2015-08-26 18:24:37 UTC*
+
+  * c2c7fe06c8 Merge pull request `#26667`_ from nmadhok/doc-fix-2014.7
+
+  * 26be189689 Doc fix. Fixes `#26656`_
+
+* **PR** `#26663`_: (`jacobhammons`_) version change for latest branch
+  @ *2015-08-26 14:03:35 UTC*
+
+  * 6bd3dccae8 Merge pull request `#26663`_ from jacobhammons/2014.7-version
+
+  * b6af538070 version change for latest branch
+
+* **PR** `#26636`_: (`rallytime`_) Refactor cloud provider tests to be more accurate
+  @ *2015-08-25 21:28:34 UTC*
+
+  * 071a6112e5 Merge pull request `#26636`_ from rallytime/cloud-test-fixes
+
+  * c0d83d558d Don't use id as variable
+
+  * 2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output
+
+  * b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests
+
+  * 9ae1539c62 Update cloud tests to be more efficient and accurate
+
+* **ISSUE** `#26630`_: (`efficks`_) win_service: Function has_powershell does not works on Windows XP (refs: `#26640`_)
+
+* **PR** `#26640`_: (`efficks`_) Fix function spacing
+  @ *2015-08-25 20:01:39 UTC*
+
+  * 304542b4c6 Merge pull request `#26640`_ from efficks/fixws2014
+
+  * ebe5d9d85c Fix function spacing
+
+* **PR** `#26515`_: (`bersace`_) Defaults to current saltenv in state.sls
+  @ *2015-08-25 16:35:50 UTC*
+
+  * 4532f98a76 Merge pull request `#26515`_ from bersace/salt-env-local-sls
+
+  * 0727af9e3d Defaults to current saltenv in state.sls
+
+* **PR** `#26242`_: (`cro`_) Remove dead code
+  @ *2015-08-12 15:14:20 UTC*
+
+  * da8bca09aa Merge pull request `#26242`_ from cro/anonldap4
+
+  * a0d2ab1eed Remove dead code
+
+* **PR** `#26216`_: (`cro`_) Fix LDAP configuration issue.
+  @ *2015-08-11 18:33:43 UTC*
+
+  * 1ecf23773e Merge pull request `#26216`_ from cro/anonldap3
+
+  * af132d7b89 Documentation update for anonymous bind issue.
+
+  * 2ef54b6b13 Documentation update for anonymous bind issue.
+
+  * 5b1836bb00 Fix issue with LDAP anonymous binds.
+
+* **PR** `#26116`_: (`corux`_) file.replace fails if repl string is an invalid regex and append/prepend is used
+  @ *2015-08-10 16:44:12 UTC*
+
+  * abdf2935c4 Merge pull request `#26116`_ from corux/fix-escape-content
+
+  * fd913ddc36 Append/prepend: search for full line with escaped content
+
+* **ISSUE** `#25751`_: (`basepi`_) Document `master_finger` more prominently (refs: `#26088`_)
+
+* **PR** `#26088`_: (`jacobhammons`_) Master finger
+  @ *2015-08-07 14:31:33 UTC*
+
+  * 106356d98d Merge pull request `#26088`_ from jacobhammons/master-finger
+
+  * 133d5f7885 some small changes
+
+  * d220c83f77 master_finger configuration docs switch a script to use https:// instead of http:// Refs `#25751`_
+
+* **ISSUE** `#25961`_: (`getabc`_) [2015.5.3-2] salt-winrepo.git/salt-minion.sls fails certificate '\*.wpengine.com' or 'wpengine.com' (refs: `#26047`_)
+
+* **PR** `#26047`_: (`jacobhammons`_) Updated windows download links in the docs to https://repo.saltstack.com
+  @ *2015-08-05 22:59:44 UTC*
+
+  * 4bd4bc41f2 Merge pull request `#26047`_ from jacobhammons/win-downloads
+
+  * 7c162d181c Updated windows download links in the docs to https://repo.saltstack.com Refs `#25961`_
+
+* **ISSUE** `#25701`_: (`alekti`_) Issue `#23764`_ regression (refs: `#25750`_)
+
+* **ISSUE** `#23764`_: (`es1o`_) source_hash from local file is not supported. (refs: `#25750`_)
+
+* **PR** `#25750`_: (`alekti`_) Add file as supported protocol for file source_hash. Fixes `#25701`_.
+  @ *2015-07-29 02:31:27 UTC*
+
+  * d93eb87c16 Merge pull request `#25750`_ from alekti/2014.7
+
+  * 9ec3ae96d4 Add file as supported protocol for file source_hash. Fixes `#23764`_.
+
+* **PR** `#25704`_: (`cachedout`_) Ensure prior alignment with master_type in 2014.7
+  @ *2015-07-27 16:06:35 UTC*
+
+  * 3a15df22ac Merge pull request `#25704`_ from cachedout/master_type_2014_7
+
+  * c95886c9a7 Ensure prior alignment with master_type in 2014.7
+
+* **PR** `#25657`_: (`MrCitron`_) Add the ability to specify a base pattern for carbon returner
+  @ *2015-07-24 16:32:58 UTC*
+
+  * d1b9362a73 Merge pull request `#25657`_ from MrCitron/pattern-carbon-returner-2014.7
+
+  * f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner
+
+* **PR** `#25633`_: (`AkhterAli`_) Update loader.py
+  @ *2015-07-22 20:02:41 UTC*
+
+  * 9634351fc2 Merge pull request `#25633`_ from AkhterAli/2014.7
+
+  * 29be4bbe11 Update loader.py
+
+* **PR** `#25416`_: (`cachedout`_) Fix broken keyword
+  @ *2015-07-14 19:47:10 UTC*
+
+  * 09ebaceca8 Merge pull request `#25416`_ from cachedout/str_2014_7
+
+  * cc514938a8 Fix broken keyword
+
+* **PR** `#25375`_: (`cachedout`_) Fix error in config.py for master_type
+  @ *2015-07-13 16:49:27 UTC*
+
+  * 2a1dd1113f Merge pull request `#25375`_ from cachedout/config_fix_2014_7
+
+  * c041f2905f Fix error in config.py for master_type
+
+* **PR** `#25324`_: (`jacobhammons`_) Latest help theme updates
+  @ *2015-07-10 16:11:31 UTC*
+
+  * 2590e23d48 Merge pull request `#25324`_ from jacobhammons/doc-theme-updates
+
+  * 88f5fcf58d Latest help theme updates
+
+* **ISSUE** `#18447`_: (`ryan-lane`_) Can't install salt with raet using pip -e git (refs: `#25093`_)
+
+* **PR** `#25093`_: (`jaybocc2`_) quick fix for issue `#18447`_
+  @ *2015-07-01 15:56:53 UTC*
+
+  * 36d53ef59e Merge pull request `#25093`_ from jaybocc2/2014.7
+
+  * c6a501ebda quick fix for issue `#18447`_
+
+* **PR** `#25069`_: (`puneetk`_) Add a helper module function called list_enabled
+  @ *2015-06-30 20:53:51 UTC*
+
+  * 38903a94a1 Merge pull request `#25069`_ from puneetk/patch-1
+
+  * f0b4e600e6 Update Documentation to clarify version added
+
+  * f8dc6030e7 Pylint updates , removing whitespace
+
+  * 532d315dd1 [Code Review update] renamed function to is_enaled from list_enabled
+
+  * 20b0462289 Update schedule.py
+
+  * 4f1471d7fb Add a helper module function called list_enabled
+
+* **ISSUE** `#15209`_: (`hubez`_) file.manage: source_hash not working with s3:// (2014.7.0rc1) (refs: `#25011`_)
+
+* **PR** `#25011`_: (`notpeter`_) Add s3 to protocols for remote source_hash (2014.7 backport)
+  @ *2015-06-27 22:35:44 UTC*
+
+  * a7154e7471 Merge pull request `#25011`_ from notpeter/s3_2014.7_backport
+
+  * 8b8af640f6 Add s3 to protocols for remote source_hash
+
+* **ISSUE** `#24915`_: (`justinta`_) Salt-cloud not working in 2014.7.6 (refs: `#24944`_)
+
+* **PR** `#24944`_: (`techhat`_) Double-check main_cloud_config
+  @ *2015-06-25 12:29:55 UTC*
+
+  * a11e4c6eea Merge pull request `#24944`_ from techhat/issue24915
+
+  * 59c3081e49 Double-check main_cloud_config
+
+* **PR** `#24936`_: (`justinta`_) Fixed ps module to not use depreciated psutil commands
+  @ *2015-06-24 22:38:19 UTC*
+
+  * d26a5447ba Merge pull request `#24936`_ from jtand/psutil
+
+  * bdb7a19c36 Fixed ps module to not use depreciated psutil commands
+
+* **ISSUE** `saltstack/salt-bootstrap#473`_: (`s1kbr0`_) salt-bootstrap.sh [...] git v2014.1.11 on SmartOS base64 is broken (refs: `#24918`_)
+
+* **PR** `#24918`_: (`BretFisher`_) SmartOS SMF minion startup fix
+  @ *2015-06-24 15:44:26 UTC*
+
+  * eeb05a1b10 Merge pull request `#24918`_ from BretFisher/minion-start-smartos-smf-fix
+
+  * d7bfb0c7fd Smartos smf minion fix
+
+* **ISSUE** `#24776`_: (`nmadhok`_) --static option in salt raises ValueError and has been broken for a very long time (refs: `#24777`_)
+
+* **PR** `#24780`_: (`nmadhok`_) Backporting PR `#24777`_ to 2014.7 branch
+  @ *2015-06-18 14:52:56 UTC*
+
+  * **PR** `#24779`_: (`nmadhok`_) Backporting Changes to 2014.7 branch (refs: `#24777`_)
+
+  * **PR** `#24778`_: (`nmadhok`_) Backporting PR `#24777`_ to 2015.2 branch (refs: `#24777`_)
+
+  * **PR** `#24777`_: (`nmadhok`_) Fixing issue where --static option fails with ValueError Fixes `#24776`_ (refs: `#24778`_, `#24780`_)
+
+  * 4281dfff0b Merge pull request `#24780`_ from nmadhok/backport-2014.7-24777
+
+  * c53b0d9a22 Backporting PR `#24777`_ to 2014.7 branch
+
+* **ISSUE** `#21318`_: (`thanatos`_) get_full_returns raises KeyError (refs: `#24769`_)
+
+* **ISSUE** `#18994`_: (`njhartwell`_) salt.client.get_cli_returns errors when called immediately after run_job (refs: `#24769`_)
+
+* **PR** `#24769`_: (`msteed`_) Fix stacktrace in get_cli_returns()
+  @ *2015-06-18 14:31:46 UTC*
+
+  * f3c5cb2d41 Merge pull request `#24769`_ from msteed/issue-21318
+
+  * f40a9d5cc0 Fix stacktrace in get_cli_returns()
+
+* **ISSUE** `#17041`_: (`xenophonf`_) Confusing Salt error messages due to limited/incomplete PowerShell command error handling (refs: `#24690`_)
+
+* **PR** `#24690`_: (`twangboy`_) Report powershell output instead of error
+  @ *2015-06-17 16:33:49 UTC*
+
+  * 59db24602f Merge pull request `#24690`_ from twangboy/fix_17041
+
+  * 7a015389af Added additional reporting
+
+  * d84ad5d519 Fixed capitalization... Failed and Already
+
+  * e9552455c4 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041
+
+* **ISSUE** `#24196`_: (`johnccfm`_) Exception when using user.present with Windows (refs: `#24646`_)
+
+* **PR** `#24646`_: (`twangboy`_) Fixed user.present on existing user
+  @ *2015-06-15 15:04:43 UTC*
+
+  * a18dadad71 Merge pull request `#24646`_ from twangboy/fix_24196
+
+  * a208e1d60f Fixed user.present on existing user
+
+  * 144bff2f67 Report powershell output instead of error
+
+* **PR** `#24643`_: (`cro`_) Add reference to salt-announce mailing list
+  @ *2015-06-12 20:21:15 UTC*
+
+  * b99484fde2 Merge pull request `#24643`_ from cro/saltannounce
+
+  * ecb0623d7f Add salt-announce mailing list.
+
+* **PR** `#24620`_: (`twangboy`_) Fixed comment and uncomment functions in file.py
+  @ *2015-06-12 19:36:26 UTC*
+
+  * 635121e85d Merge pull request `#24620`_ from twangboy/fix_24215
+
+  * d7a9999be1 Fixed comment and uncomment functions in file.py
+
+* **PR** `#24589`_: (`BretFisher`_) Fixed Mine example for jinja code block
+  @ *2015-06-11 15:48:02 UTC*
+
+  * d83928a7f9 Merge pull request `#24589`_ from BretFisher/patch-1
+
+  * 65a11336dc Fixed Mine example for jinja code block
+
+* **ISSUE** `#24427`_: (`fayetted`_) 2015.5.1-3 Windows 64Bit Minion fails to start after install (refs: `#24530`_)
+
+* **PR** `#24530`_: (`twangboy`_) Start Minion Service on Silent Install
+  @ *2015-06-09 21:30:08 UTC*
+
+  * d376390f76 Merge pull request `#24530`_ from twangboy/fix_24427
+
+  * 673e1d809e Added missing panel.bmp for installer
+
+  * cc50218b01 Start Minion Service on Silent Install
+
+* **PR** `#24513`_: (`jquast`_) bugfix use of 'iteritem' in 2014.7 branch
+  @ *2015-06-09 04:06:36 UTC*
+
+  * **PR** `#24511`_: (`jquast`_) bugfix: trailing "...done" in rabbitmq output (refs: `#24513`_)
+
+  * 6ebc476bb3 Merge pull request `#24513`_ from jquast/2014.7-bugfix-iteritem
+
+  * 2be0180e5e bugfix use of 'iteritem' in 2014.7 branch
+
+* **ISSUE** `#24276`_: (`markuskramerIgitt`_) Live salt-master Profiling with SIGUSR2 fails  (refs: `#24405`_)
+
+* **PR** `#24405`_: (`jacksontj`_) Fix for `#24276`_
+  @ *2015-06-04 20:50:42 UTC*
+
+  * 83f853b6ea Merge pull request `#24405`_ from jacksontj/2014.7
+
+  * 2c7afaeebf Fix for `#24276`_
+
+* **PR** `#24395`_: (`hvnsweeting`_) handle exceptions when received data is not in good shape
+  @ *2015-06-04 20:08:22 UTC*
+
+  * cef919c602 Merge pull request `#24395`_ from hvnsweeting/handle-exception-get-file
+
+  * bb798a0224 handle exceptions when received data is not in good shape
+
+* **PR** `#24305`_: (`twangboy`_) Added documentation, fixed formatting
+  @ *2015-06-04 19:40:54 UTC*
+
+  * efba1a94b4 Merge pull request `#24305`_ from twangboy/win_path_docs
+
+  * 36804253e6 Fixed pylint error caused by \P... added r
+
+  * bc42a4bb11 triple double quotes to triple single quotes
+
+  * 77cd930bba Added documentation, fixed formatting
+
+* **PR** `#24178`_: (`rallytime`_) Backport `#24118`_ to 2014.7, too.
+  @ *2015-05-27 17:49:45 UTC*
+
+  * **PR** `#24118`_: (`trevor-h`_) removed deprecated pymongo usage (refs: `#24178`_)
+
+  * 9d7331c87d Merge pull request `#24178`_ from rallytime/bp-24118
+
+  * e2217a09e8 removed deprecated pymongo usage as no longer functional with pymongo > 3.x
+
+* **PR** `#24159`_: (`rallytime`_) Fill out modules/keystone.py CLI Examples
+  @ *2015-05-27 15:07:11 UTC*
+
+  * 4e8c5031b0 Merge pull request `#24159`_ from rallytime/keystone_doc_examples
+
+  * dadac8d076 Fill out modules/keystone.py CLI Examples
+
+* **PR** `#24158`_: (`rallytime`_) Fix test_valid_docs test for tls module
+  @ *2015-05-27 15:06:05 UTC*
+
+  * fc10ee8ed5 Merge pull request `#24158`_ from rallytime/fix_doc_error
+
+  * 49a517e2ca Fix test_valid_docs test for tls module
+
+* **PR** `#24125`_: (`hvnsweeting`_) Fix rabbitmq test mode
+  @ *2015-05-26 15:40:18 UTC*
+
+  * c0d32e0b5e Merge pull request `#24125`_ from hvnsweeting/fix-rabbitmq-test-mode
+
+  * 71862c69b9 enhance log
+
+  * 28e2594162 change according to new output of rabbitmq module functions
+
+  * cd0212e8ed processes and returns better output for rabbitmq module
+
+* **ISSUE** `#23464`_: (`tibold`_) cmd_iter_no_block() blocks (refs: `#24093`_)
+
+* **PR** `#24093`_: (`msteed`_) Make LocalClient.cmd_iter_no_block() not block
+  @ *2015-05-25 15:56:42 UTC*
+
+  * 39a8f30f06 Merge pull request `#24093`_ from msteed/issue-23464
+
+  * fd35903d75 Fix failing test
+
+  * 41b344c7d3 Make LocalClient.cmd_iter_no_block() not block
+
+* **PR** `#24008`_: (`davidjb`_) Correct reST formatting for states.cmd documentation
+  @ *2015-05-21 04:19:01 UTC*
+
+  * 5bffd3045e Merge pull request `#24008`_ from davidjb/2014.7
+
+  * 8b8d0293d4 Correct reST formatting for documentation
+
+* **PR** `#23933`_: (`jacobhammons`_) sphinx saltstack2 doc theme
+  @ *2015-05-20 18:19:19 UTC*
+
+  * 1aa0420040 Merge pull request `#23933`_ from jacobhammons/2014.7
+
+  * a3613e68e4 removed numbering from doc TOC
+
+  * 78b737c5e6 removed 2015.* release from release notes, updated index page to remove PDF/epub links
+
+  * e867f7df77 Changed build settings to use saltstack2 theme and update release versions.
+
+  * 81ed9c9f59 sphinx saltstack2 doc theme
+
+* **PR** `#23965`_: (`hvnsweeting`_) handle all exceptions gitpython can raise
+  @ *2015-05-20 15:08:03 UTC*
+
+  * 314e4db512 Merge pull request `#23965`_ from hvnsweeting/20147-fix-gitfs-gitpython-exception
+
+  * 2576301631 handle all exception gitpython can raise
+
+* **PR** `#23939`_: (`basepi`_) Add extended changelog to 2014.7.6 release notes
+  @ *2015-05-19 21:21:00 UTC*
+
+  * 913391207a Merge pull request `#23939`_ from basepi/v2014.7.6release
+
+  * 32b65dc2a9 Add extended changelog to 2014.7.6 release notes
+
+* **ISSUE** `#23820`_: (`UtahDave`_) 2014.7.5 schedule error (refs: `#23881`_)
+
+* **PR** `#23881`_: (`garethgreenaway`_) Fixes to schedule module in 2014.7
+  @ *2015-05-19 15:46:30 UTC*
+
+  * 0031ca2631 Merge pull request `#23881`_ from garethgreenaway/23820_2014_7_schedule_list_issue
+
+  * b207f2a433 Missing continue in the list function when deleting unused attributes.
+
+* **ISSUE** `#22131`_: (`quixoten`_) "unexpected keyword argument 'merge'" on 2014.7.2 (salt-ssh) (refs: `#23887`_)
+
+* **PR** `#23887`_: (`basepi`_) [2014.7] Bring salt-ssh pillar.get in line with mainline pillar.get
+  @ *2015-05-18 23:11:34 UTC*
+
+  * 63bd21ecd2 Merge pull request `#23887`_ from basepi/salt-ssh.pillar.get.22131
+
+  * bc84502f46 Bring salt-ssh pillar.get in line with mainline pillar.get
+
+* **PR** `#23891`_: (`basepi`_) Update the release notes index page
+  @ *2015-05-18 23:06:52 UTC*
+
+  * 17c5810c04 Merge pull request `#23891`_ from basepi/releasenotes
+
+  * dec153bcea Update the release notes index page
+
+* **PR** `#23888`_: (`basepi`_) Update the 2014.7.6 release notes with CVE details
+  @ *2015-05-18 22:35:51 UTC*
+
+  * a93e58f80f Merge pull request `#23888`_ from basepi/v2014.7.6release
+
+  * 49921b6cb2 Update the 2014.7.6 release notes with CVE details
+
+* **PR** `#23871`_: (`rallytime`_) Backport `#23848`_ to 2014.7
+  @ *2015-05-18 20:34:04 UTC*
+
+  * **PR** `#23848`_: (`dumol`_) Updated installation docs for SLES 12. (refs: `#23871`_)
+
+  * 50730287bb Merge pull request `#23871`_ from rallytime/bp-23848
+
+  * 379c09c3a5 Updated for SLES 12.
+
+.. _`#15209`: https://github.com/saltstack/salt/issues/15209
+.. _`#17041`: https://github.com/saltstack/salt/issues/17041
+.. _`#18447`: https://github.com/saltstack/salt/issues/18447
+.. _`#18994`: https://github.com/saltstack/salt/issues/18994
+.. _`#21318`: https://github.com/saltstack/salt/issues/21318
+.. _`#22131`: https://github.com/saltstack/salt/issues/22131
+.. _`#23464`: https://github.com/saltstack/salt/issues/23464
+.. _`#23764`: https://github.com/saltstack/salt/issues/23764
+.. _`#23820`: https://github.com/saltstack/salt/issues/23820
+.. _`#23848`: https://github.com/saltstack/salt/pull/23848
+.. _`#23871`: https://github.com/saltstack/salt/pull/23871
+.. _`#23881`: https://github.com/saltstack/salt/pull/23881
+.. _`#23887`: https://github.com/saltstack/salt/pull/23887
+.. _`#23888`: https://github.com/saltstack/salt/pull/23888
+.. _`#23891`: https://github.com/saltstack/salt/pull/23891
+.. _`#23933`: https://github.com/saltstack/salt/pull/23933
+.. _`#23939`: https://github.com/saltstack/salt/pull/23939
+.. _`#23965`: https://github.com/saltstack/salt/pull/23965
+.. _`#24008`: https://github.com/saltstack/salt/pull/24008
+.. _`#24093`: https://github.com/saltstack/salt/pull/24093
+.. _`#24118`: https://github.com/saltstack/salt/pull/24118
+.. _`#24125`: https://github.com/saltstack/salt/pull/24125
+.. _`#24158`: https://github.com/saltstack/salt/pull/24158
+.. _`#24159`: https://github.com/saltstack/salt/pull/24159
+.. _`#24178`: https://github.com/saltstack/salt/pull/24178
+.. _`#24196`: https://github.com/saltstack/salt/issues/24196
+.. _`#24276`: https://github.com/saltstack/salt/issues/24276
+.. _`#24305`: https://github.com/saltstack/salt/pull/24305
+.. _`#24395`: https://github.com/saltstack/salt/pull/24395
+.. _`#24405`: https://github.com/saltstack/salt/pull/24405
+.. _`#24427`: https://github.com/saltstack/salt/issues/24427
+.. _`#24511`: https://github.com/saltstack/salt/pull/24511
+.. _`#24513`: https://github.com/saltstack/salt/pull/24513
+.. _`#24530`: https://github.com/saltstack/salt/pull/24530
+.. _`#24589`: https://github.com/saltstack/salt/pull/24589
+.. _`#24620`: https://github.com/saltstack/salt/pull/24620
+.. _`#24643`: https://github.com/saltstack/salt/pull/24643
+.. _`#24646`: https://github.com/saltstack/salt/pull/24646
+.. _`#24690`: https://github.com/saltstack/salt/pull/24690
+.. _`#24769`: https://github.com/saltstack/salt/pull/24769
+.. _`#24776`: https://github.com/saltstack/salt/issues/24776
+.. _`#24777`: https://github.com/saltstack/salt/pull/24777
+.. _`#24778`: https://github.com/saltstack/salt/pull/24778
+.. _`#24779`: https://github.com/saltstack/salt/pull/24779
+.. _`#24780`: https://github.com/saltstack/salt/pull/24780
+.. _`#24915`: https://github.com/saltstack/salt/issues/24915
+.. _`#24918`: https://github.com/saltstack/salt/pull/24918
+.. _`#24936`: https://github.com/saltstack/salt/pull/24936
+.. _`#24944`: https://github.com/saltstack/salt/pull/24944
+.. _`#25011`: https://github.com/saltstack/salt/pull/25011
+.. _`#25069`: https://github.com/saltstack/salt/pull/25069
+.. _`#25093`: https://github.com/saltstack/salt/pull/25093
+.. _`#25324`: https://github.com/saltstack/salt/pull/25324
+.. _`#25375`: https://github.com/saltstack/salt/pull/25375
+.. _`#25416`: https://github.com/saltstack/salt/pull/25416
+.. _`#25633`: https://github.com/saltstack/salt/pull/25633
+.. _`#25657`: https://github.com/saltstack/salt/pull/25657
+.. _`#25701`: https://github.com/saltstack/salt/issues/25701
+.. _`#25704`: https://github.com/saltstack/salt/pull/25704
+.. _`#25750`: https://github.com/saltstack/salt/pull/25750
+.. _`#25751`: https://github.com/saltstack/salt/issues/25751
+.. _`#25961`: https://github.com/saltstack/salt/issues/25961
+.. _`#26047`: https://github.com/saltstack/salt/pull/26047
+.. _`#26088`: https://github.com/saltstack/salt/pull/26088
+.. _`#26116`: https://github.com/saltstack/salt/pull/26116
+.. _`#26216`: https://github.com/saltstack/salt/pull/26216
+.. _`#26242`: https://github.com/saltstack/salt/pull/26242
+.. _`#26515`: https://github.com/saltstack/salt/pull/26515
+.. _`#26630`: https://github.com/saltstack/salt/issues/26630
+.. _`#26636`: https://github.com/saltstack/salt/pull/26636
+.. _`#26640`: https://github.com/saltstack/salt/pull/26640
+.. _`#26656`: https://github.com/saltstack/salt/issues/26656
+.. _`#26663`: https://github.com/saltstack/salt/pull/26663
+.. _`#26667`: https://github.com/saltstack/salt/pull/26667
+.. _`#27075`: https://github.com/saltstack/salt/pull/27075
+.. _`#27114`: https://github.com/saltstack/salt/pull/27114
+.. _`#27117`: https://github.com/saltstack/salt/pull/27117
+.. _`#27252`: https://github.com/saltstack/salt/pull/27252
+.. _`#27335`: https://github.com/saltstack/salt/pull/27335
+.. _`AkhterAli`: https://github.com/AkhterAli
+.. _`BretFisher`: https://github.com/BretFisher
+.. _`MrCitron`: https://github.com/MrCitron
+.. _`UtahDave`: https://github.com/UtahDave
+.. _`alekti`: https://github.com/alekti
+.. _`ari`: https://github.com/ari
+.. _`basepi`: https://github.com/basepi
+.. _`bersace`: https://github.com/bersace
+.. _`cachedout`: https://github.com/cachedout
+.. _`corux`: https://github.com/corux
+.. _`cro`: https://github.com/cro
+.. _`davidjb`: https://github.com/davidjb
+.. _`dumol`: https://github.com/dumol
+.. _`efficks`: https://github.com/efficks
+.. _`es1o`: https://github.com/es1o
+.. _`fayetted`: https://github.com/fayetted
+.. _`garethgreenaway`: https://github.com/garethgreenaway
+.. _`getabc`: https://github.com/getabc
+.. _`hubez`: https://github.com/hubez
+.. _`hvnsweeting`: https://github.com/hvnsweeting
+.. _`jacksontj`: https://github.com/jacksontj
+.. _`jacobhammons`: https://github.com/jacobhammons
+.. _`jaybocc2`: https://github.com/jaybocc2
+.. _`jfindlay`: https://github.com/jfindlay
+.. _`johnccfm`: https://github.com/johnccfm
+.. _`jquast`: https://github.com/jquast
+.. _`justinta`: https://github.com/justinta
+.. _`markuskramerIgitt`: https://github.com/markuskramerIgitt
+.. _`msteed`: https://github.com/msteed
+.. _`njhartwell`: https://github.com/njhartwell
+.. _`nmadhok`: https://github.com/nmadhok
+.. _`notpeter`: https://github.com/notpeter
+.. _`puneetk`: https://github.com/puneetk
+.. _`quixoten`: https://github.com/quixoten
+.. _`rallytime`: https://github.com/rallytime
+.. _`ryan-lane`: https://github.com/ryan-lane
+.. _`s1kbr0`: https://github.com/s1kbr0
+.. _`saltstack/salt-bootstrap#473`: https://github.com/saltstack/salt-bootstrap/issues/473
+.. _`techhat`: https://github.com/techhat
+.. _`thanatos`: https://github.com/thanatos
+.. _`tibold`: https://github.com/tibold
+.. _`trevor-h`: https://github.com/trevor-h
+.. _`twangboy`: https://github.com/twangboy
+.. _`xenophonf`: https://github.com/xenophonf

doc/topics/releases/2014.7.8.rst

@@ -2,76 +2,86 @@
 Salt 2014.7.8 Release Notes
 ===========================
 
-Changes for v2014.7.7..v2014.7.8
+:release: 2015-11-13
---------------------------------
 
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+Version 2014.7.8 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
 
-*Generated at: 2016-03-11T21:18:48Z*
 
-Statistics:
+Statistics
+==========
 
 - Total Merges: **7**
-- Total Issue references: **3**
+- Total Issue References: **3**
-- Total PR references: **10**
+- Total PR References: **10**
 
-Changes:
+- Contributors: **5** (`DmitryKuzmenko`_, `JaseFace`_, `MasterNayru`_, `cachedout`_, `rallytime`_)
 
 
-- **PR** `#28839`_: (*cachedout*) Revert `#28740`_
+Changelog for v2014.7.7..v2014.7.8
-  @ *2015-11-12T22:54:28Z*
+==================================
 
-  - **PR** `#28740`_: (*MasterNayru*) Add missing S3 module import
+*Generated at: 2018-05-27 20:47:34 UTC*
-    | refs: `#28777`_
-  * 4b8bdd0 Merge pull request `#28839`_ from cachedout/revert_28740
-  * 215b26c Revert `#28740`_
 
-- **PR** `#28777`_: (*rallytime*) Back-port `#28740`_ to 2014.7
+* **PR** `#28839`_: (`cachedout`_) Revert `#28740`_
-  @ *2015-11-11T18:00:00Z*
+  @ *2015-11-12 22:54:28 UTC*
 
-  - **PR** `#28740`_: (*MasterNayru*) Add missing S3 module import
+  * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28777`_, `#28839`_)
-    | refs: `#28777`_
-  * 76e69b4 Merge pull request `#28777`_ from rallytime/`bp-28740`_-2014.7
-  * da5fac2 Back-port `#28740`_ to 2014.7
 
-- **PR** `#28716`_: (*rallytime*) Back-port `#28705`_ to 2014.7
+  * 4b8bdd0afb Merge pull request `#28839`_ from cachedout/revert_28740
-  @ *2015-11-10T16:15:03Z*
 
-  - **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3
+  * 215b26c06f Revert `#28740`_
-    | refs: `#28716`_
-  * 45c73eb Merge pull request `#28716`_ from rallytime/`bp-28705`_
-  * 32e7bd3 Account for new headers class in tornado 4.3
 
-- **PR** `#28717`_: (*cachedout*) Add note about recommended umask
+* **PR** `#28777`_: (`rallytime`_) Back-port `#28740`_ to 2014.7
-  @ *2015-11-09T23:26:20Z*
+  @ *2015-11-11 18:00:00 UTC*
 
-  - **ISSUE** `#28199`_: (*felskrone*) Non-standard umasks might break the master
+  * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28777`_, `#28839`_)
-    | refs: `#28717`_
-  * f4fe921 Merge pull request `#28717`_ from cachedout/umask_note
-  * 1874300 Add note about recommended umask
 
-- **PR** `#28461`_: (*cachedout*) Wrap all cache calls in state.sls in correct umask
+  * 76e69b4bff Merge pull request `#28777`_ from rallytime/bp-28740-2014.7
-  @ *2015-11-02T17:11:02Z*
 
-  - **ISSUE** `#28455`_: (*zmalone*) highstate.cache is world readable, and contains secrets
+  * da5fac2b36 Back-port `#28740`_ to 2014.7
-    | refs: `#28461`_
-  * 4bf56ca Merge pull request `#28461`_ from cachedout/issue_28455
-  * 097838e Wrap all cache calls in state.sls in correct umask
 
-- **PR** `#28407`_: (*DmitryKuzmenko*) Don't request creds if auth with key.
+* **PR** `#28716`_: (`rallytime`_) Back-port `#28705`_ to 2014.7
-  @ *2015-10-29T16:12:30Z*
+  @ *2015-11-10 16:15:03 UTC*
 
-  - **ISSUE** `#24910`_: (*bocig*) -T, --make-token flag does NOT work- LDAP Groups
+  * **PR** `#28705`_: (`cachedout`_) Account for new headers class in tornado 4.3 (refs: `#28716`_)
-    | refs: `#28407`_
-  * f3e61db Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014
-  * b7b5bec Don't request creds if auth with key.
 
-- **PR** `#27390`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
+  * 45c73ebf2f Merge pull request `#28716`_ from rallytime/bp-28705
-  @ *2015-10-05T18:09:33Z*
 
-  * d284eb1 Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled
+  * 32e7bd3ea0 Account for new headers class in tornado 4.3
-  * 563db71 Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run.  schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
 
+* **ISSUE** `#28199`_: (`felskrone`_) Non-standard umasks might break the master (refs: `#28717`_)
+
+* **PR** `#28717`_: (`cachedout`_) Add note about recommended umask
+  @ *2015-11-09 23:26:20 UTC*
+
+  * f4fe921965 Merge pull request `#28717`_ from cachedout/umask_note
+
+  * 1874300e08 Add note about recommended umask
+
+* **ISSUE** `#28455`_: (`zmalone`_) highstate.cache is world readable, and contains secrets (refs: `#28461`_)
+
+* **PR** `#28461`_: (`cachedout`_) Wrap all cache calls in state.sls in correct umask
+  @ *2015-11-02 17:11:02 UTC*
+
+  * 4bf56cad3f Merge pull request `#28461`_ from cachedout/issue_28455
+
+  * 097838ec0c Wrap all cache calls in state.sls in correct umask
+
+* **ISSUE** `#24910`_: (`bocig`_) -T, --make-token flag does NOT work- LDAP Groups (refs: `#28407`_)
+
+* **PR** `#28407`_: (`DmitryKuzmenko`_) Don't request creds if auth with key.
+  @ *2015-10-29 16:12:30 UTC*
+
+  * f3e61db045 Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014
+
+  * b7b5bec309 Don't request creds if auth with key.
+
+* **PR** `#27390`_: (`JaseFace`_) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
+  @ *2015-10-05 18:09:33 UTC*
+
+  * d284eb165b Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled
+
+  * 563db71bfd Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run.  schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
 
 .. _`#24910`: https://github.com/saltstack/salt/issues/24910
 .. _`#27390`: https://github.com/saltstack/salt/pull/27390
@@ -85,6 +95,11 @@ Changes:
 .. _`#28740`: https://github.com/saltstack/salt/pull/28740
 .. _`#28777`: https://github.com/saltstack/salt/pull/28777
 .. _`#28839`: https://github.com/saltstack/salt/pull/28839
-.. _`bp-28705`: https://github.com/saltstack/salt/pull/28705
+.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko
-.. _`bp-28740`: https://github.com/saltstack/salt/pull/28740
+.. _`JaseFace`: https://github.com/JaseFace
-
+.. _`MasterNayru`: https://github.com/MasterNayru
+.. _`bocig`: https://github.com/bocig
+.. _`cachedout`: https://github.com/cachedout
+.. _`felskrone`: https://github.com/felskrone
+.. _`rallytime`: https://github.com/rallytime
+.. _`zmalone`: https://github.com/zmalone

doc/topics/releases/2014.7.9.rst

@@ -2,44 +2,70 @@
 Salt 2014.7.9 Release Notes
 ===========================
 
-Changes for v2014.7.8..v2014.7.9
+:release: 2016-03-11
---------------------------------
 
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+Version 2014.7.9 is a bugfix release for :ref:`2014.7.0 <release-2014-7-0>`.
-
-*Generated at: 2016-03-11T20:58:58Z*
-
-Statistics:
-
-- Total Merges: **3**
-- Total Issue references: **1**
-- Total PR references: **3**
-
-Changes:
 
 
-- **PR** `#31826`_: (*gtmanfred*) Remove ability of authenticating user to specify pam service
+Statistics
-  @ *2016-03-11T20:41:01Z*
+==========
 
-  * c5e7c03 Merge pull request `#31826`_ from gtmanfred/2014.7
+- Total Merges: **5**
-  * d73f70e Remove ability of authenticating user to specify pam service
+- Total Issue References: **1**
+- Total PR References: **5**
 
-- **PR** `#29392`_: (*jacobhammons*) updated version number to not reference a specific build from the lat…
+- Contributors: **4** (`douardda`_, `gtmanfred`_, `jacobhammons`_, `jfindlay`_)
-  @ *2015-12-03T15:54:31Z*
 
-  * 85aa70a Merge pull request `#29392`_ from jacobhammons/2014.7
-  * d7f0db1 updated version number to not reference a specific build from the latest branch
 
-- **PR** `#29296`_: (*douardda*) Use process KillMode on Debian systems also
+Changelog for v2014.7.8..v2014.7.9
-  @ *2015-12-01T16:00:16Z*
+==================================
 
-  - **ISSUE** `#29295`_: (*douardda*) systemd's service file should use the 'process' KillMode option on Debian also
+*Generated at: 2018-05-27 20:55:35 UTC*
-    | refs: `#29296`_
-  * d2fb210 Merge pull request `#29296`_ from douardda/patch-3
-  * d288539 Use process KillMode on Debian systems also
 
+* **PR** `#31834`_: (`jfindlay`_) add 2014.7.8 release notes
+  @ *2016-03-11 21:35:42 UTC*
+
+  * 218c902091 Merge pull request `#31834`_ from jfindlay/2014.7
+
+  * 358fdad0c8 add 2014.7.8 release notes
+
+* **PR** `#31833`_: (`jfindlay`_) add 2014.7.9 release notes
+  @ *2016-03-11 21:19:55 UTC*
+
+  * a423c6cd04 Merge pull request `#31833`_ from jfindlay/2014.7
+
+  * 6910fcc584 add 2014.7.9 release notes
+
+* **PR** `#31826`_: (`gtmanfred`_) Remove ability of authenticating user to specify pam service
+  @ *2016-03-11 20:41:01 UTC*
+
+  * c5e7c03953 Merge pull request `#31826`_ from gtmanfred/2014.7
+
+  * d73f70ebb2 Remove ability of authenticating user to specify pam service
+
+* **PR** `#29392`_: (`jacobhammons`_) updated version number to not reference a specific build from the lat…
+  @ *2015-12-03 15:54:31 UTC*
+
+  * 85aa70a6cb Merge pull request `#29392`_ from jacobhammons/2014.7
+
+  * d7f0db1dd8 updated version number to not reference a specific build from the latest branch
+
+* **ISSUE** `#29295`_: (`douardda`_) systemd's service file should use the 'process' KillMode option on Debian also (refs: `#29296`_)
+
+* **PR** `#29296`_: (`douardda`_) Use process KillMode on Debian systems also
+  @ *2015-12-01 16:00:16 UTC*
+
+  * d2fb2109a3 Merge pull request `#29296`_ from douardda/patch-3
+
+  * d2885390f4 Use process KillMode on Debian systems also
 
 .. _`#29295`: https://github.com/saltstack/salt/issues/29295
 .. _`#29296`: https://github.com/saltstack/salt/pull/29296
 .. _`#29392`: https://github.com/saltstack/salt/pull/29392
 .. _`#31826`: https://github.com/saltstack/salt/pull/31826
+.. _`#31833`: https://github.com/saltstack/salt/pull/31833
+.. _`#31834`: https://github.com/saltstack/salt/pull/31834
+.. _`douardda`: https://github.com/douardda
+.. _`gtmanfred`: https://github.com/gtmanfred
+.. _`jacobhammons`: https://github.com/jacobhammons
+.. _`jfindlay`: https://github.com/jfindlay

doc/topics/releases/2015.5.10.rst

@@ -2,10 +2,15 @@
 Salt 2015.5.10 Release Notes
 ============================
 
+:release: 2015-03-22
+
+Version 2015.5.10 is a bugfix release for :ref:`2015.5.0 <release-2015-5-0>`.
+
+
 Security Fix
 ============
 
-CVE-2016-3176: Insecure configuration of PAM external authentication service
+**CVE-2016-3176** Insecure configuration of PAM external authentication service
 
 This issue affects all Salt versions prior to 2015.8.8/2015.5.10 when PAM
 :ref:`external authentication <acl-eauth>` is enabled. This issue involves
@@ -17,7 +22,7 @@ for bringing this issue to our attention.
 This update defines the PAM eAuth ``service`` that users authenticate against
 in the Salt Master configuration.
 
-(No additional fixes are contained in this release).
+No additional fixes are included in this release.
 
 Read Before Upgrading Debian 8 (Jessie) from Salt Versions Earlier than 2015.5.9
 ================================================================================
@@ -32,3 +37,10 @@ Salt ``systemd`` service files are missing the following statement in these vers
 This statement must be added to successfully upgrade on these earlier versions
 of Salt.
 
+
+Changelog for v2015.5.9..v2015.5.10
+===================================
+
+*Generated at: 2018-05-27 22:39:26 UTC*
+
+* 69ba1de71d Remove ability of authenticating user to specify pam service

doc/topics/releases/2015.5.8.rst

@@ -1,393 +1,232 @@
+.. _release-2015-5-8:
+
 ===========================
 Salt 2015.5.8 Release Notes
 ===========================
 
+:release: 2015-12-01
+
+Version 2015.5.8 is a bugfix release for :ref:`2015.5.0 <release-2015-5-0>`.
+
+
+Statistics
+==========
+
+- Total Merges: **17**
+- Total Issue References: **12**
+- Total PR References: **27**
+
+- Contributors: **12** (`MasterNayru`_, `TronPaul`_, `basepi`_, `cachedout`_, `cxmcc`_, `jfindlay`_, `kevinlondon`_, `messa`_, `rallytime`_, `tehmaspc`_, `twangboy`_, `whiteinge`_)
+
+
 Security Fix
 ============
 
-CVE-2015-8034: Saving ``state.sls`` cache data to disk with insecure permissions
+**CVE-2015-8034** Saving :py:func:`state.sls <salt.modules.state.sls>` cache
+data to disk with insecure permissions
 
-This affects users of the ``state.sls`` function. The state run cache on the minion was being created with incorrect permissions. This file could potentially contain sensitive data that was inserted via jinja into the state SLS files. The permissions for this file are now being set correctly. Thanks to @zmalone for bringing this issue to our attention.
+This affects users of the :py:func:`state.sls <salt.modules.state.sls>`
+function. The state run cache on the minion was being created with incorrect
+permissions. This file could potentially contain sensitive data that was
+inserted via jinja into the state SLS files. The permissions for this file are
+now being set correctly. Thanks to `zmalone`_ for bringing this issue to our
+attention.
 
-Changes
-=======
 
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+Changelog for v2015.5.7..v2015.5.8
+==================================
 
-*Generated at: 2015-11-23T23:16:23Z*
+*Generated at: 2018-05-27 22:25:07 UTC*
 
-Total Merges: **118**
+* **ISSUE** `#28883`_: (`ldelossa`_) Issues running select states -  local variable 'salt' referenced before assignment (refs: `#29113`_)
 
-Changes:
+* **PR** `#29164`_: (`jfindlay`_) Backport `#29113`_
+  @ *2015-11-24 21:26:17 UTC*
 
-- **PR** `#29128`_: (*cachedout*) Set a safer default value for ret in saltmod
+  * **PR** `#29113`_: (`TronPaul`_) Kill unneeded import (refs: `#29164`_)
 
-- **PR** `#29122`_: (*cachedout*) Fix broken state orchestration
+  * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28839`_, `#29113`_)
 
-- **PR** `#29096`_: (*rallytime*) Back-port `#29093`_ to 2015.5
+  * a26c10a811 Merge pull request `#29164`_ from jfindlay/bp-29113
 
-- **PR** `#29084`_: (*rallytime*) Back-port `#29055`_ to 2015.5
+  * 50fab35188 kill unneeded import
 
-- **PR** `#29083`_: (*rallytime*) Back-port `#29053`_ to 2015.5
+* **PR** `#29138`_: (`jfindlay`_) add 2015.5.8 release notes
+  @ *2015-11-23 23:22:48 UTC*
 
-- **PR** `#28932`_: (*twangboy*) Fixed user.present / user.absent in windows
+  * 4f03196e7d Merge pull request `#29138`_ from jfindlay/2015.5
 
-- **PR** `#29011`_: (*rallytime*) Back-port `#28630`_ to 2015.5
+  * be045f5cb1 add 2015.5.8 release notes
 
-- **PR** `#28982`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+* **ISSUE** `#29110`_: (`mohshami`_) 2015.8.2 broke orchestration (refs: `#29122`_)
 
-- **PR** `#28949`_: (*whiteinge*) Add sync_sdb execution function
+* **ISSUE** `#28010`_: (`vakulich`_) Error "KeyError: 'ret'" appeared during salt.state run in orchestrate module if minion had an exception (refs: `#28012`_)
 
-- **PR** `#28930`_: (*twangboy*) Added missing import mmap required by file.py
+* **PR** `#29128`_: (`cachedout`_) Set a safer default value for ret in saltmod
+  @ *2015-11-23 17:07:40 UTC*
 
-- **PR** `#28908`_: (*rallytime*) A couple of spelling fixes for doc conventions page.
+  * **PR** `#29122`_: (`cachedout`_) Fix broken state orchestration (refs: `#29128`_)
 
-- **PR** `#28902`_: (*whiteinge*) Fix missing JSON support for /keys endpoint
+  * **PR** `#28012`_: (`rallytime`_) Clean up stack trace when something goes wrong with minion output (refs: `#29122`_)
 
-- **PR** `#28897`_: (*rallytime*) Back-port `#28873`_ to 2015.5
+  * 219367a23d Merge pull request `#29128`_ from cachedout/tweak_29122
 
-- **PR** `#28871`_: (*basepi*) [2015.5] Fix command generation for mdadm.assemble
+  * b08858b040 Missed check
 
-- **PR** `#28864`_: (*jfindlay*) add 2015.5.7 release notes
+  * 584efe81ee Set a safer default value for ret in saltmod
 
-- **PR** `#28731`_: (*garethgreenaway*) Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler
+* **ISSUE** `#29110`_: (`mohshami`_) 2015.8.2 broke orchestration (refs: `#29122`_)
 
-- **PR** `#28857`_: (*rallytime*) Back-port `#28851`_ to 2015.5
+* **ISSUE** `#28010`_: (`vakulich`_) Error "KeyError: 'ret'" appeared during salt.state run in orchestrate module if minion had an exception (refs: `#28012`_)
 
-- **PR** `#28856`_: (*rallytime*) Back-port `#28853`_ to 2015.5
+* **PR** `#29122`_: (`cachedout`_) Fix broken state orchestration (refs: `#29128`_)
+  @ *2015-11-23 16:24:18 UTC*
 
-- **PR** `#28832`_: (*basepi*) [2015.5] Backport `#28826`_
+  * **PR** `#28012`_: (`rallytime`_) Clean up stack trace when something goes wrong with minion output (refs: `#29122`_)
 
-- **PR** `#28833`_: (*basepi*) [2015.5] Increase the default gather_job_timeout
+  * 2250a36647 Merge pull request `#29122`_ from cachedout/issue_29110
 
-- **PR** `#28829`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+  * 4b9302d794 Fix broken state orchestration
 
-- **PR** `#28756`_: (*MrCitron*) Fix `#25775`_
+* **PR** `#29096`_: (`rallytime`_) Back-port `#29093`_ to 2015.5
+  @ *2015-11-22 17:02:51 UTC*
 
-- **PR** `#28786`_: (*chrigl*) closes `#28783`_
+  * **PR** `#29093`_: (`cxmcc`_) Compare gem versions as a string. (refs: `#29096`_)
 
-- **PR** `#28776`_: (*rallytime*) Back-port `#28740`_ to 2015.5
+  * 200e771efb Merge pull request `#29096`_ from rallytime/bp-29093
 
-- **PR** `#28760`_: (*dmyerscough*) Fixing CherryPy key bug
+  * f5734423a4 Compare gem versions as a string.
 
-- **PR** `#28746`_: (*rallytime*) Back-port `#28718`_ to 2015.5
+* **PR** `#29084`_: (`rallytime`_) Back-port `#29055`_ to 2015.5
+  @ *2015-11-20 20:57:54 UTC*
 
-- **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3
+  * **PR** `#29055`_: (`cachedout`_) Add section to style guide (refs: `#29084`_)
 
-- **PR** `#28699`_: (*rallytime*) Back-port `#28670`_ to 2015.5
+  * d8a2018bc8 Merge pull request `#29084`_ from rallytime/bp-29055
 
-- **PR** `#28703`_: (*rallytime*) Back-port `#28690`_ to 2015.5
+  * 52e650aed9 Add section to style guide
 
-- **PR** `#28694`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.09
+* **PR** `#29083`_: (`rallytime`_) Back-port `#29053`_ to 2015.5
+  @ *2015-11-20 20:57:38 UTC*
 
-- **PR** `#28669`_: (*rallytime*) Use the -q argument to strip extraneous messages from rabbitmq
+  * **PR** `#29053`_: (`kevinlondon`_) Update rabbitmq_user.py (refs: `#29083`_)
 
-- **PR** `#28645`_: (*jacksontj*) Rework minion return_retry_timer
+  * b5cff1a351 Merge pull request `#29083`_ from rallytime/bp-29053
 
-- **PR** `#28668`_: (*twangboy*) Fixed join_domain and unjoin_domain for Windows
+  * f1884de0e7 Update rabbitmq_user.py
 
-- **PR** `#28666`_: (*jfindlay*) define r_data before using it in file module
+* **ISSUE** `#28928`_: (`twangboy`_) Fix user.present 2015.5 (refs: `#28932`_)
 
-- **PR** `#28662`_: (*cachedout*) Add note about disabling master_alive_interval
+* **PR** `#28932`_: (`twangboy`_) Fixed user.present / user.absent in windows
+  @ *2015-11-18 21:45:53 UTC*
 
-- **PR** `#28627`_: (*twangboy*) Backport win_useradd
+  * **PR** `#28627`_: (`twangboy`_) Backport win_useradd (refs: `#28932`_)
 
-- **PR** `#28617`_: (*cachedout*) Set restrictive umask on module sync
+  * b3e3bebef0 Merge pull request `#28932`_ from twangboy/fix_28928
 
-- **PR** `#28622`_: (*gravyboat*) Update puppet module wording
+  * 0653a04887 Fixed user.present / user.absent in windows
 
-- **PR** `#28563`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.04
+* **ISSUE** `#26911`_: (`dsumsky`_) file.manage state does not work with Amazon S3 URLs on Windows (refs: `#28630`_)
 
-- **PR** `#28541`_: (*twangboy*) Fixed problem with system.set_computer_name
+* **ISSUE** `#13850`_: (`ryan-lane`_) s3:// urls in file.managed (and likely elsewhere) require s3.key and s3.keyid to be in minion config (refs: `#28630`_)
 
-- **PR** `#28537`_: (*jfindlay*) decode filename to utf-8 in file.recurse state
+* **PR** `#29011`_: (`rallytime`_) Back-port `#28630`_ to 2015.5
+  @ *2015-11-18 17:50:05 UTC*
 
-- **PR** `#28529`_: (*rallytime*) Update contributing and documentation pages to recommend submitting against branches
+  * **PR** `#28630`_: (`messa`_) Use S3 credentials from Pillar (refs: `#29011`_)
 
-- **PR** `#28548`_: (*nmadhok*) [Backport] [2015.5] Tasks can be in queued state instead of running
+  * a2e4a227e0 Merge pull request `#29011`_ from rallytime/bp-28630
 
-- **PR** `#28531`_: (*rallytime*) Add versionadded directives to virtualenv_mod state/module
+  * 7baccc1b05 Lint - newline before def
 
-- **PR** `#28508`_: (*twangboy*) Fixed windows tests
+  * 9e5c16d4da Reading S3 credentials from Pillar
 
-- **PR** `#28525`_: (*rallytime*) Fix spacing in doc examples for boto_route53 state and module
+  * a3216f813d Fixed requests HTTPError handler, it was still in urllib2 style
 
-- **PR** `#28517`_: (*rallytime*) Add state_auto_order defaults to True note to ordering docs
+* **PR** `#28982`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5
+  @ *2015-11-18 00:49:32 UTC*
 
-- **PR** `#28512`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+  * 1a4cd6002f Merge pull request `#28982`_ from basepi/merge-forward-2015.5
 
-- **PR** `#28448`_: (*gwaters*) added a note to the tutorial for redhat derivatives
+  * bfbb109fbd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
 
-- **PR** `#28406`_: (*rallytime*) Back-port `#28381`_ to 2015.5
+  * 4b8bdd0afb Merge pull request `#28839`_ from cachedout/revert_28740
 
-- **PR** `#28413`_: (*rallytime*) Back-port `#28400`_ to 2015.5
+  * 215b26c06f Revert `#28740`_
 
-- **PR** `#28366`_: (*erchn*) mark repo not enabled when pkgrepo state passes in disable: True
+* **ISSUE** `#28947`_: (`dmyerscough`_) sdb modules are not synced out (refs: `#28949`_)
 
-- **PR** `#28373`_: (*beverlcl*) Fixing bug `#28372`_ for use_carrier option on bonding network interfaces.
+* **PR** `#28949`_: (`whiteinge`_) Add sync_sdb execution function
+  @ *2015-11-17 15:35:38 UTC*
 
-- **PR** `#28359`_: (*rallytime*) Back-port `#28358`_ to 2015.5
+  * edd26d763a Merge pull request `#28949`_ from whiteinge/sync-sdb
 
-- **PR** `#28346`_: (*twangboy*) Fix installer
+  * b0ec9ab25b Add sync_sdb execution function
 
-- **PR** `#28315`_: (*gwaters*) Adding a working example of setting pillar data on the cli
+* **ISSUE** `#28888`_: (`twangboy`_) Fix file.comment (refs: `#28930`_)
 
-- **PR** `#28211`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
+* **PR** `#28930`_: (`twangboy`_) Added missing import mmap required by file.py
+  @ *2015-11-16 23:17:23 UTC*
 
-- **PR** `#28263`_: (*cachedout*) New channel for event.send
+  * 43da1bc4ce Merge pull request `#28930`_ from twangboy/fix_28888
 
-- **PR** `#28293`_: (*cachedout*) Minor grammar changes
+  * f5c489eaad Added missing import mmap required by file.py
 
-- **PR** `#28271`_: (*gwaters*) Update tutorial documentation
+* **PR** `#28908`_: (`rallytime`_) A couple of spelling fixes for doc conventions page.
+  @ *2015-11-16 02:29:35 UTC*
 
-- **PR** `#28280`_: (*0xf10e*) Correct Jinja function load_* to import_*
+  * 2488b873b8 Merge pull request `#28908`_ from rallytime/doc-convention-spelling
 
-- **PR** `#28255`_: (*cachedout*) Add __cli opt
+  * 60e6eddb77 A couple of spelling fixes for doc conventions page.
 
-- **PR** `#28213`_: (*rallytime*) If record returned None, don't continue with the state. Something went wrong
+* **ISSUE** `#22442`_: (`allanliu`_) rest_cherrypy /keys URL does not handle JSON requests (refs: `#28902`_)
 
-- **PR** `#28238`_: (*basepi*) [2015.5] Fix schedule.present always diffing
+* **PR** `#28902`_: (`whiteinge`_) Fix missing JSON support for /keys endpoint
+  @ *2015-11-15 15:36:05 UTC*
 
-- **PR** `#28174`_: (*lorengordon*) Add support for multiline regex in file.replace
+  * 827a1ae020 Merge pull request `#28902`_ from whiteinge/json-keys
 
-- **PR** `#28175`_: (*twangboy*) Fixes `#19673`_
+  * 9745903301 Fix missing JSON support for /keys endpoint
 
-- **PR** `#28140`_: (*rallytime*) Add OpenBSD installation documentation to 2015.5 branch
+* **PR** `#28897`_: (`rallytime`_) Back-port `#28873`_ to 2015.5
+  @ *2015-11-15 00:43:35 UTC*
 
-- **PR** `#28138`_: (*rallytime*) Back-port `#28130`_ EC2 Sizes Only portion to 2015.5
+  * **PR** `#28873`_: (`tehmaspc`_) Fix salt-cloud help output typo (refs: `#28897`_)
 
-- **PR** `#28097`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not …
+  * d23bd49130 Merge pull request `#28897`_ from rallytime/bp-28873
 
-- **PR** `#28117`_: (*rallytime*) Clean up stacktrace when master can't be reached in lxc cloud driver
+  * 077e671ead Fix salt-cloud help output typo
 
-- **PR** `#28110`_: (*terminalmage*) Add explanation of file_client: local setting masterless mode
+* **ISSUE** `#28870`_: (`basepi`_) mdadm commands failing (refs: `#28871`_)
 
-- **PR** `#28109`_: (*rallytime*) Add created reactor event to lxc cloud driver
+* **PR** `#28871`_: (`basepi`_) [2015.5] Fix command generation for mdadm.assemble
+  @ *2015-11-13 21:54:33 UTC*
 
-- **PR** `#27996`_: (*rallytime*) Don't fail if pip package is already present and pip1 is installed
+  * a9dc8b6ca6 Merge pull request `#28871`_ from basepi/mdadm.fix.28870
 
-- **PR** `#28056`_: (*rallytime*) Back-port `#28033`_ to 2015.5
+  * 323bc2d2ac Fix command generation for mdadm.assemble
 
-- **PR** `#28059`_: (*rallytime*) Back-port `#28040`_ to 2015.5
+.. _`#13850`: https://github.com/saltstack/salt/issues/13850
-
+.. _`#22442`: https://github.com/saltstack/salt/issues/22442
-- **PR** `#28047`_: (*cachedout*) Restore FTP functionality to file client
+.. _`#26911`: https://github.com/saltstack/salt/issues/26911
-
+.. _`#28010`: https://github.com/saltstack/salt/issues/28010
-- **PR** `#28032`_: (*twangboy*) Fixed win_path.py
-
-- **PR** `#28037`_: (*rallytime*) Back-port `#28003`_ to 2015.5
-
-- **PR** `#28031`_: (*jacobhammons*) Updated release notes with additional CVE information
-
-- **PR** `#28008`_: (*jfindlay*) platform independent line endings in hosts mod
-
-- **PR** `#28012`_: (*rallytime*) Clean up stack trace when something goes wrong with minion output
-
-- **PR** `#27995`_: (*jacobhammons*) added link to grains security FAQ to targeting and pillar topics.
-
-- **PR** `#27986`_: (*jacobhammons*) Changed current release to 5.6 and added CVE to release notes
-
-- **PR** `#27913`_: (*pass-by-value*) Set default
-
-- **PR** `#27876`_: (*terminalmage*) 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
-
-- **PR** `#27726`_: (*jfindlay*) deprecate hash_hostname in favor of hash_known_hosts
-
-- **PR** `#27776`_: (*jfindlay*) return message when local jobs_cache not found
-
-- **PR** `#27766`_: (*jfindlay*) better check for debian userdel error
-
-- **PR** `#27758`_: (*iggy*) Remove redundant text from syslog returner
-
-- **PR** `#27841`_: (*terminalmage*) Detect Manjaro Linux as Arch derivative
-
-- **PR** `#27852`_: (*rallytime*) Back-port `#27806`_ to 2015.5
-
-- **PR** `#27838`_: (*basepi*) [2015.5] Fix highstate outputter for jobs.lookup_jid
-
-- **PR** `#27791`_: (*eguven*) 2015.5 postgres_user groups backport
-
-- **PR** `#27759`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
-
-- **PR** `#27732`_: (*jacobhammons*) update docs for __virtual__ and __virtualname__
-
-- **PR** `#27747`_: (*Sacro*) Chocolatey doesn't have a help command.
-
-- **PR** `#27733`_: (*jacobhammons*) hardening topic - updates to docs.saltstack.com theme
-
-- **PR** `#27706`_: (*jacobhammons*) Assorted doc bugs
-
-- **PR** `#27695`_: (*rallytime*) Back-port `#27671`_ to 2015.5
-
-- **PR** `#27524`_: (*jfindlay*) parse pkgng output in quiet mode for >= 1.6.1
-
-- **PR** `#27686`_: (*rallytime*) Back-port `#27476`_ to 2015.5
-
-- **PR** `#27684`_: (*rallytime*) Back-port `#27656`_ to 2015.5
-
-- **PR** `#27683`_: (*rallytime*) Back-port `#27659`_ to 2015.5
-
-- **PR** `#27682`_: (*rallytime*) Back-port `#27566`_ to 2015.5
-
-- **PR** `#27681`_: (*rallytime*) Back-port `#25928`_ to 2015.5
-
-- **PR** `#27680`_: (*rallytime*) Back-port `#27535`_ to 2015.5
-
-- **PR** `#27442`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
-
-- **PR** `#27641`_: (*rallytime*) Gate the psutil import and add depends doc for diskusage beacon
-
-- **PR** `#27644`_: (*rallytime*) Back-port `#27640`_ to 2015.5
-
-- **PR** `#27612`_: (*rallytime*) Fix GCE external_ip stacktraces in 2015.5
-
-- **PR** `#27568`_: (*jacobhammons*) regenerated man pages
-
-.. _`#19673`: https://github.com/saltstack/salt/issues/19673
-.. _`#25521`: https://github.com/saltstack/salt/pull/25521
-.. _`#25775`: https://github.com/saltstack/salt/issues/25775
-.. _`#25928`: https://github.com/saltstack/salt/pull/25928
-.. _`#27201`: https://github.com/saltstack/salt/pull/27201
-.. _`#27286`: https://github.com/saltstack/salt/pull/27286
-.. _`#27390`: https://github.com/saltstack/salt/pull/27390
-.. _`#27442`: https://github.com/saltstack/salt/pull/27442
-.. _`#27476`: https://github.com/saltstack/salt/pull/27476
-.. _`#27524`: https://github.com/saltstack/salt/pull/27524
-.. _`#27535`: https://github.com/saltstack/salt/pull/27535
-.. _`#27566`: https://github.com/saltstack/salt/pull/27566
-.. _`#27568`: https://github.com/saltstack/salt/pull/27568
-.. _`#27612`: https://github.com/saltstack/salt/pull/27612
-.. _`#27640`: https://github.com/saltstack/salt/pull/27640
-.. _`#27641`: https://github.com/saltstack/salt/pull/27641
-.. _`#27644`: https://github.com/saltstack/salt/pull/27644
-.. _`#27656`: https://github.com/saltstack/salt/pull/27656
-.. _`#27659`: https://github.com/saltstack/salt/pull/27659
-.. _`#27671`: https://github.com/saltstack/salt/pull/27671
-.. _`#27680`: https://github.com/saltstack/salt/pull/27680
-.. _`#27681`: https://github.com/saltstack/salt/pull/27681
-.. _`#27682`: https://github.com/saltstack/salt/pull/27682
-.. _`#27683`: https://github.com/saltstack/salt/pull/27683
-.. _`#27684`: https://github.com/saltstack/salt/pull/27684
-.. _`#27686`: https://github.com/saltstack/salt/pull/27686
-.. _`#27695`: https://github.com/saltstack/salt/pull/27695
-.. _`#27706`: https://github.com/saltstack/salt/pull/27706
-.. _`#27726`: https://github.com/saltstack/salt/pull/27726
-.. _`#27732`: https://github.com/saltstack/salt/pull/27732
-.. _`#27733`: https://github.com/saltstack/salt/pull/27733
-.. _`#27747`: https://github.com/saltstack/salt/pull/27747
-.. _`#27758`: https://github.com/saltstack/salt/pull/27758
-.. _`#27759`: https://github.com/saltstack/salt/pull/27759
-.. _`#27766`: https://github.com/saltstack/salt/pull/27766
-.. _`#27776`: https://github.com/saltstack/salt/pull/27776
-.. _`#27791`: https://github.com/saltstack/salt/pull/27791
-.. _`#27806`: https://github.com/saltstack/salt/pull/27806
-.. _`#27838`: https://github.com/saltstack/salt/pull/27838
-.. _`#27841`: https://github.com/saltstack/salt/pull/27841
-.. _`#27852`: https://github.com/saltstack/salt/pull/27852
-.. _`#27876`: https://github.com/saltstack/salt/pull/27876
-.. _`#27913`: https://github.com/saltstack/salt/pull/27913
-.. _`#27986`: https://github.com/saltstack/salt/pull/27986
-.. _`#27995`: https://github.com/saltstack/salt/pull/27995
-.. _`#27996`: https://github.com/saltstack/salt/pull/27996
-.. _`#28003`: https://github.com/saltstack/salt/pull/28003
-.. _`#28008`: https://github.com/saltstack/salt/pull/28008
 .. _`#28012`: https://github.com/saltstack/salt/pull/28012
-.. _`#28031`: https://github.com/saltstack/salt/pull/28031
-.. _`#28032`: https://github.com/saltstack/salt/pull/28032
-.. _`#28033`: https://github.com/saltstack/salt/pull/28033
-.. _`#28037`: https://github.com/saltstack/salt/pull/28037
-.. _`#28040`: https://github.com/saltstack/salt/pull/28040
-.. _`#28047`: https://github.com/saltstack/salt/pull/28047
-.. _`#28056`: https://github.com/saltstack/salt/pull/28056
-.. _`#28059`: https://github.com/saltstack/salt/pull/28059
-.. _`#28097`: https://github.com/saltstack/salt/pull/28097
-.. _`#28103`: https://github.com/saltstack/salt/pull/28103
-.. _`#28109`: https://github.com/saltstack/salt/pull/28109
-.. _`#28110`: https://github.com/saltstack/salt/pull/28110
-.. _`#28117`: https://github.com/saltstack/salt/pull/28117
-.. _`#28130`: https://github.com/saltstack/salt/pull/28130
-.. _`#28138`: https://github.com/saltstack/salt/pull/28138
-.. _`#28140`: https://github.com/saltstack/salt/pull/28140
-.. _`#28174`: https://github.com/saltstack/salt/pull/28174
-.. _`#28175`: https://github.com/saltstack/salt/pull/28175
-.. _`#28210`: https://github.com/saltstack/salt/pull/28210
-.. _`#28211`: https://github.com/saltstack/salt/pull/28211
-.. _`#28213`: https://github.com/saltstack/salt/pull/28213
-.. _`#28238`: https://github.com/saltstack/salt/pull/28238
-.. _`#28255`: https://github.com/saltstack/salt/pull/28255
-.. _`#28263`: https://github.com/saltstack/salt/pull/28263
-.. _`#28271`: https://github.com/saltstack/salt/pull/28271
-.. _`#28280`: https://github.com/saltstack/salt/pull/28280
-.. _`#28293`: https://github.com/saltstack/salt/pull/28293
-.. _`#28315`: https://github.com/saltstack/salt/pull/28315
-.. _`#28346`: https://github.com/saltstack/salt/pull/28346
-.. _`#28358`: https://github.com/saltstack/salt/pull/28358
-.. _`#28359`: https://github.com/saltstack/salt/pull/28359
-.. _`#28366`: https://github.com/saltstack/salt/pull/28366
-.. _`#28372`: https://github.com/saltstack/salt/issues/28372
-.. _`#28373`: https://github.com/saltstack/salt/pull/28373
-.. _`#28381`: https://github.com/saltstack/salt/pull/28381
-.. _`#28400`: https://github.com/saltstack/salt/pull/28400
-.. _`#28406`: https://github.com/saltstack/salt/pull/28406
-.. _`#28407`: https://github.com/saltstack/salt/pull/28407
-.. _`#28413`: https://github.com/saltstack/salt/pull/28413
-.. _`#28448`: https://github.com/saltstack/salt/pull/28448
-.. _`#28461`: https://github.com/saltstack/salt/pull/28461
-.. _`#28508`: https://github.com/saltstack/salt/pull/28508
-.. _`#28512`: https://github.com/saltstack/salt/pull/28512
-.. _`#28517`: https://github.com/saltstack/salt/pull/28517
-.. _`#28525`: https://github.com/saltstack/salt/pull/28525
-.. _`#28529`: https://github.com/saltstack/salt/pull/28529
-.. _`#28531`: https://github.com/saltstack/salt/pull/28531
-.. _`#28537`: https://github.com/saltstack/salt/pull/28537
-.. _`#28538`: https://github.com/saltstack/salt/pull/28538
-.. _`#28541`: https://github.com/saltstack/salt/pull/28541
-.. _`#28546`: https://github.com/saltstack/salt/pull/28546
-.. _`#28548`: https://github.com/saltstack/salt/pull/28548
-.. _`#28563`: https://github.com/saltstack/salt/pull/28563
-.. _`#28617`: https://github.com/saltstack/salt/pull/28617
-.. _`#28622`: https://github.com/saltstack/salt/pull/28622
 .. _`#28627`: https://github.com/saltstack/salt/pull/28627
 .. _`#28630`: https://github.com/saltstack/salt/pull/28630
-.. _`#28645`: https://github.com/saltstack/salt/pull/28645
-.. _`#28662`: https://github.com/saltstack/salt/pull/28662
-.. _`#28666`: https://github.com/saltstack/salt/pull/28666
-.. _`#28668`: https://github.com/saltstack/salt/pull/28668
-.. _`#28669`: https://github.com/saltstack/salt/pull/28669
-.. _`#28670`: https://github.com/saltstack/salt/pull/28670
-.. _`#28690`: https://github.com/saltstack/salt/pull/28690
-.. _`#28694`: https://github.com/saltstack/salt/pull/28694
-.. _`#28699`: https://github.com/saltstack/salt/pull/28699
-.. _`#28703`: https://github.com/saltstack/salt/pull/28703
-.. _`#28705`: https://github.com/saltstack/salt/pull/28705
-.. _`#28716`: https://github.com/saltstack/salt/pull/28716
-.. _`#28717`: https://github.com/saltstack/salt/pull/28717
-.. _`#28718`: https://github.com/saltstack/salt/pull/28718
-.. _`#28731`: https://github.com/saltstack/salt/pull/28731
 .. _`#28740`: https://github.com/saltstack/salt/pull/28740
-.. _`#28746`: https://github.com/saltstack/salt/pull/28746
-.. _`#28756`: https://github.com/saltstack/salt/pull/28756
-.. _`#28760`: https://github.com/saltstack/salt/pull/28760
-.. _`#28776`: https://github.com/saltstack/salt/pull/28776
-.. _`#28777`: https://github.com/saltstack/salt/pull/28777
-.. _`#28783`: https://github.com/saltstack/salt/issues/28783
-.. _`#28786`: https://github.com/saltstack/salt/pull/28786
-.. _`#28826`: https://github.com/saltstack/salt/pull/28826
-.. _`#28829`: https://github.com/saltstack/salt/pull/28829
-.. _`#28832`: https://github.com/saltstack/salt/pull/28832
-.. _`#28833`: https://github.com/saltstack/salt/pull/28833
 .. _`#28839`: https://github.com/saltstack/salt/pull/28839
-.. _`#28851`: https://github.com/saltstack/salt/pull/28851
+.. _`#28870`: https://github.com/saltstack/salt/issues/28870
-.. _`#28853`: https://github.com/saltstack/salt/pull/28853
-.. _`#28856`: https://github.com/saltstack/salt/pull/28856
-.. _`#28857`: https://github.com/saltstack/salt/pull/28857
-.. _`#28864`: https://github.com/saltstack/salt/pull/28864
 .. _`#28871`: https://github.com/saltstack/salt/pull/28871
 .. _`#28873`: https://github.com/saltstack/salt/pull/28873
+.. _`#28883`: https://github.com/saltstack/salt/issues/28883
+.. _`#28888`: https://github.com/saltstack/salt/issues/28888
 .. _`#28897`: https://github.com/saltstack/salt/pull/28897
 .. _`#28902`: https://github.com/saltstack/salt/pull/28902
 .. _`#28908`: https://github.com/saltstack/salt/pull/28908
+.. _`#28928`: https://github.com/saltstack/salt/issues/28928
 .. _`#28930`: https://github.com/saltstack/salt/pull/28930
 .. _`#28932`: https://github.com/saltstack/salt/pull/28932
+.. _`#28947`: https://github.com/saltstack/salt/issues/28947
 .. _`#28949`: https://github.com/saltstack/salt/pull/28949
 .. _`#28982`: https://github.com/saltstack/salt/pull/28982
 .. _`#29011`: https://github.com/saltstack/salt/pull/29011
@@ -397,5 +236,29 @@ Changes:
 .. _`#29084`: https://github.com/saltstack/salt/pull/29084
 .. _`#29093`: https://github.com/saltstack/salt/pull/29093
 .. _`#29096`: https://github.com/saltstack/salt/pull/29096
+.. _`#29110`: https://github.com/saltstack/salt/issues/29110
+.. _`#29113`: https://github.com/saltstack/salt/pull/29113
 .. _`#29122`: https://github.com/saltstack/salt/pull/29122
 .. _`#29128`: https://github.com/saltstack/salt/pull/29128
+.. _`#29138`: https://github.com/saltstack/salt/pull/29138
+.. _`#29164`: https://github.com/saltstack/salt/pull/29164
+.. _`MasterNayru`: https://github.com/MasterNayru
+.. _`TronPaul`: https://github.com/TronPaul
+.. _`allanliu`: https://github.com/allanliu
+.. _`basepi`: https://github.com/basepi
+.. _`cachedout`: https://github.com/cachedout
+.. _`cxmcc`: https://github.com/cxmcc
+.. _`dmyerscough`: https://github.com/dmyerscough
+.. _`dsumsky`: https://github.com/dsumsky
+.. _`jfindlay`: https://github.com/jfindlay
+.. _`kevinlondon`: https://github.com/kevinlondon
+.. _`ldelossa`: https://github.com/ldelossa
+.. _`messa`: https://github.com/messa
+.. _`mohshami`: https://github.com/mohshami
+.. _`rallytime`: https://github.com/rallytime
+.. _`ryan-lane`: https://github.com/ryan-lane
+.. _`tehmaspc`: https://github.com/tehmaspc
+.. _`twangboy`: https://github.com/twangboy
+.. _`vakulich`: https://github.com/vakulich
+.. _`whiteinge`: https://github.com/whiteinge
+.. _`zmalone`: https://github.com/zmalone

doc/topics/releases/2015.5.9.rst

@@ -2,100 +2,442 @@
 Salt 2015.5.9 Release Notes
 ===========================
 
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+:release: 2016-01-11
 
-*Generated at: 2016-01-08T23:02:31Z*
+Version 2015.5.9 is a bugfix release for :ref:`2015.5.0 <release-2015-5-0>`.
 
-Total Merges: **44**
 
-Changes:
+Statistics
+==========
 
-- **PR** `#30237`_: (*jacobhammons*) Updated man pages and doc version for 2015.5.9
+- Total Merges: **45**
+- Total Issue References: **21**
+- Total PR References: **48**
 
-- **PR** `#30207`_: (*rallytime*) Use correct spacing in rabbitmq state examples
+- Contributors: **21** (`abednarik`_, `aletourneau`_, `attiasr`_, `basepi`_, `cachedout`_, `clan`_, `clarkperkins`_, `cro`_, `dmyerscough`_, `jacobhammons`_, `jfindlay`_, `jsutton`_, `justinta`_, `lorengordon`_, `markckimball`_, `mpreziuso`_, `rallytime`_, `terminalmage`_, `titilambert`_, `twangboy`_, `zmalone`_)
 
-- **PR** `#30191`_: (*jacobhammons*) Updated doc site banners
 
-- **PR** `#30125`_: (*abednarik*) Update user home event when createhome is set to False
+Changelog for v2015.5.8..v2015.5.9
+==================================
 
-- **PR** `#30127`_: (*jsutton*) Updating documentation and example minion config for random_master/master_shuffle.
+*Generated at: 2018-05-27 22:31:06 UTC*
 
-- **PR** `#30110`_: (*markckimball*) Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly
+* **PR** `#30248`_: (`jfindlay`_) add 2015.5.9 release notes
+  @ *2016-01-08 23:13:10 UTC*
 
-- **PR** `#30093`_: (*zmalone*) Noting that file_roots and "state tree" should both be avoided
+  * 92889db638 Merge pull request `#30248`_ from jfindlay/2015.5
 
-- **PR** `#30097`_: (*cachedout*) Note concern about cleartext password in docs for shadow.gen_password
+  * 741f7aba31 add 2015.5.9 release notes
 
-- **PR** `#30089`_: (*mpreziuso*) Fixes terminology and adds more accurate details about the algorithms
+* **PR** `#30237`_: (`jacobhammons`_) Updated man pages and doc version for 2015.5.9
+  @ *2016-01-08 18:10:05 UTC*
 
-- **PR** `#30086`_: (*cachedout*) Document that gitfs needs recent libs
+  * 7a329d89d7 Merge pull request `#30237`_ from jacobhammons/man-pages-prev
 
-- **PR** `#30070`_: (*cachedout*) Add documentation on debugging salt-ssh
+  * 2431c4c5c3 Updated man page and doc conf.py copyright year to 2016
 
-- **PR** `#30059`_: (*mpreziuso*) Fixes wrong function scope
+  * fe3da1c174 Updated man pages and doc version for 2015.5.9
 
-- **PR** `#30025`_: (*jtand*) Skipping some Boto tests until resolved moto issue
+* **PR** `#30207`_: (`rallytime`_) Use correct spacing in rabbitmq state examples
+  @ *2016-01-07 18:37:35 UTC*
 
-- **PR** `#29949`_: (*aletourneau*) Enhanced netscaler docstring
+  * 2c0b725924 Merge pull request `#30207`_ from rallytime/rabbitmq_states_doc_fix
 
-- **PR** `#29941`_: (*cachedout*) Fix spelling error in boto_vpc
+  * 8d48c24182 Use correct spacing in rabbitmq state examples
 
-- **PR** `#29908`_: (*cachedout*) Allow kwargs to be passed to pacman provide for update func
+* **PR** `#30191`_: (`jacobhammons`_) Updated doc site banners
+  @ *2016-01-06 22:37:40 UTC*
 
-- **PR** `#29909`_: (*abednarik*) FreeBSD pkgng fix for non-interactive install.
+  * b49cf910f4 Merge pull request `#30191`_ from jacobhammons/banner-prev
 
-- **PR** `#29730`_: (*rallytime*) Update docker-py version requirement to 0.6.0 for dockerio.py files
+  * c3390955b0 Updated doc site banners
 
-- **PR** `#29715`_: (*rallytime*) Install correct package version, if provided, for npm state.
+* **ISSUE** `#29633`_: (`twellspring`_) user.present does not modify home directory (refs: `#30125`_)
 
-- **PR** `#29721`_: (*terminalmage*) Fix display of multiline strings when iterating over a list
+* **PR** `#30125`_: (`abednarik`_) Update user home event when createhome is set to False
+  @ *2016-01-05 18:15:38 UTC*
 
-- **PR** `#29646`_: (*rallytime*) Don't stacktrace on kwargs.get if kwargs=None
+  * 9363d6f5b6 Merge pull request `#30125`_ from abednarik/update_user_home
 
-- **PR** `#29673`_: (*rallytime*) Default value should be False and not 'False'
+  * 56544a77f6 Update user home event when createhome is set to False
 
-- **PR** `#29527`_: (*jfindlay*) 2015.5.7 notes: add note about not being released
+* **ISSUE** `#10155`_: (`jhenry82`_) Option to select a random master in multi-master mode (refs: `#30127`_)
 
-- **PR** `#29539`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+* **PR** `#30127`_: (`jsutton`_) Updating documentation and example minion config for random_master/master_shuffle.
+  @ *2016-01-04 19:30:50 UTC*
 
-- **PR** `#29504`_: (*rallytime*) Document userdata_file option for EC2 driver
+  * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documenation-for-random_master
 
-- **PR** `#29507`_: (*rallytime*) Switch volumes and del_*_on_destroy example ordering
+  * 01dbf385ef Adding random_master to reference and updating master_shuffle. Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
 
-- **PR** `#29469`_: (*abednarik*) Added Documentation note in salt cloud.
+* **PR** `#30110`_: (`markckimball`_) Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly
+  @ *2015-12-31 21:17:53 UTC*
 
-- **PR** `#29461`_: (*dmyerscough*) Fix resource limits, systemd sets the default too small
+  * 28b1bbbe77 Merge pull request `#30110`_ from markckimball/fix-verify_ssl-in-joyent-cloud
 
-- **PR** `#29439`_: (*rallytime*) Back-port `#28656`_ to 2015.5
+  * e1c08cb269 Fixed flag sent to salt.utils.http in order for verify_ssl to work appropriately.
 
-- **PR** `#29418`_: (*jacobhammons*) Added CVE 2015-8034 to 2015.5.8 release notes
+* **PR** `#30093`_: (`zmalone`_) Noting that file_roots and "state tree" should both be avoided
+  @ *2015-12-30 22:40:05 UTC*
 
-- **PR** `#29389`_: (*jacobhammons*) updated version numbers in documentation
+  * 040412b0b1 Merge pull request `#30093`_ from zmalone/pillar-notes
 
-- **PR** `#28501`_: (*twangboy*) Requested fixes for 26898
+  * cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some environments, the actual states show up another level down.  Adding notes about why this is undesirable.
 
-- **PR** `#29348`_: (*jtand*) Fixes an file.search on python2.6
+* **ISSUE** `#28120`_: (`jtylers`_) Clear text passwords (refs: `#30097`_)
 
-- **PR** `#29336`_: (*rallytime*) Back-port `#29276`_ to 2015.5
+* **PR** `#30097`_: (`cachedout`_) Note concern about cleartext password in docs for shadow.gen_password
+  @ *2015-12-30 22:37:33 UTC*
 
-- **PR** `#29333`_: (*rallytime*) Back-port `#29280`_ to 2015.5
+  * 25edefc93a Merge pull request `#30097`_ from cachedout/note_on_password_process_list
 
-- **PR** `#29316`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5
+  * 58aec884ef Note concern about cleartext password in docs for shadow.gen_password
 
-- **PR** `#29216`_: (*clan*) size is 0 doesn't mean no data, e.g, /proc/version
+* **PR** `#30089`_: (`mpreziuso`_) Fixes terminology and adds more accurate details about the algorithms
+  @ *2015-12-30 20:02:18 UTC*
 
-- **PR** `#29261`_: (*attiasr*) fix incorrect reinstallation of windows pkg
+  * 6b1c3a6bf2 Merge pull request `#30089`_ from mpreziuso/patch-1
 
-- **PR** `#29214`_: (*cro*) Doc for salt.utils.http should say verify_ssl not ssl_verify.
+  * 50533add40 Fixes terminology and adds more accurate details about the algorithms
 
-- **PR** `#29204`_: (*lorengordon*) Use os.path.join to return full path to ca bundle
+* **ISSUE** `#29921`_: (`anlutro`_) pygit 0.21 not fully supported? (refs: `#30086`_)
 
+* **PR** `#30086`_: (`cachedout`_) Document that gitfs needs recent libs
+  @ *2015-12-30 19:26:05 UTC*
+
+  * 200d09385d Merge pull request `#30086`_ from cachedout/issue_29921
+
+  * 8c29e2dd6a Document that gitfs needs recent libs
+
+* **ISSUE** `#27835`_: (`bertjwregeer`_) [FreeBSD] salt-ssh hangs forever (refs: `#30070`_)
+
+* **PR** `#30070`_: (`cachedout`_) Add documentation on debugging salt-ssh
+  @ *2015-12-29 23:00:06 UTC*
+
+  * 404414bf57 Merge pull request `#30070`_ from cachedout/issue_27835
+
+  * 60431e342a Add documentation on debugging salt-ssh
+
+* **PR** `#30059`_: (`mpreziuso`_) Fixes wrong function scope
+  @ *2015-12-29 16:12:06 UTC*
+
+  * 84db12212d Merge pull request `#30059`_ from mpreziuso/patch-1
+
+  * 1cb1c2da07 Fixes wrong function scope
+
+* **PR** `#30025`_: (`justinta`_) Skipping some Boto tests until resolved moto issue
+  @ *2015-12-28 15:21:45 UTC*
+
+  * **PR** `#29725`_: (`cachedout`_) Disable some boto tests per resolution of moto issue (refs: `#30025`_)
+
+  * 1c6c9b1a06 Merge pull request `#30025`_ from jtand/boto_tests
+
+  * e706642152 Skipping some Boto tests until resolved moto issue
+
+* **ISSUE** `#28956`_: (`racooper`_) Netscaler module doc enhancements (refs: `#29949`_)
+
+* **PR** `#29949`_: (`aletourneau`_) Enhanced netscaler docstring
+  @ *2015-12-22 20:26:52 UTC*
+
+  * 0f91021c59 Merge pull request `#29949`_ from aletourneau/2015.5
+
+  * cf855fe262 Fixed trailing white spaces
+
+  * 864801e002 fixed version
+
+  * 041d9346c4 Enhanced netscaler docstring
+
+* **PR** `#29941`_: (`cachedout`_) Fix spelling error in boto_vpc
+  @ *2015-12-22 15:49:54 UTC*
+
+  * 229d3eb60b Merge pull request `#29941`_ from cachedout/boto_spelling
+
+  * b11bfd07b8 Fix spelling error in boto_vpc
+
+* **ISSUE** `#29880`_: (`githubcdr`_) Salt pkg.uptodate fails on Arch linux (refs: `#29908`_)
+
+* **PR** `#29908`_: (`cachedout`_) Allow kwargs to be passed to pacman provide for update func
+  @ *2015-12-22 15:04:18 UTC*
+
+  * 69c5ada636 Merge pull request `#29908`_ from cachedout/issue_29880
+
+  * 4cd77b4118 Allow kwargs to be passed to pacman provide for update func
+
+* **ISSUE** `#27056`_: (`oogali`_) pkgng provider on FreeBSD does not do BATCH=yes (refs: `#29909`_)
+
+* **PR** `#29909`_: (`abednarik`_) FreeBSD pkgng fix for non-interactive install.
+  @ *2015-12-22 15:03:50 UTC*
+
+  * ad0de4d563 Merge pull request `#29909`_ from abednarik/freebsd_pkgng_non_interactive_fix
+
+  * 8ac213001a FreeBSD pkgng fix for non-interactive install.
+
+* **ISSUE** `#24698`_: (`cmhe`_) docker.installed not working (salt 2015.5.0, docker 1.6.2, dockerpy 0.5.3) (refs: `#29730`_)
+
+* **PR** `#29730`_: (`rallytime`_) Update docker-py version requirement to 0.6.0 for dockerio.py files
+  @ *2015-12-16 14:44:40 UTC*
+
+  * f43f3d166c Merge pull request `#29730`_ from rallytime/fix-24698
+
+  * 120fd5fdf0 Update docker-py version requirement to 0.6.0 for dockerio.py files
+
+* **ISSUE** `#23343`_: (`micaelbergeron`_) npm state ignore the requested version (refs: `#29715`_)
+
+* **ISSUE** `#18647`_: (`hundt`_) Version number in npm state name does not result in correct version being installed (refs: `#29715`_)
+
+* **PR** `#29715`_: (`rallytime`_) Install correct package version, if provided, for npm state.
+  @ *2015-12-15 23:19:45 UTC*
+
+  * c393a4175a Merge pull request `#29715`_ from rallytime/fix-23343
+
+  * a0ed857c37 Install correct package version, if provided, for npm state.
+
+* **PR** `#29721`_: (`terminalmage`_) Fix display of multiline strings when iterating over a list
+  @ *2015-12-15 22:16:10 UTC*
+
+  * 1310afbbc2 Merge pull request `#29721`_ from terminalmage/nested-output-multiline-fix
+
+  * 761be9cb93 Fix display of multiline strings when iterating over a list
+
+* **ISSUE** `#29488`_: (`Shad0w1nk`_) salt.cloud.clouds.vmware.revert_to_snapshot crash when using the default value (refs: `#29646`_)
+
+* **PR** `#29646`_: (`rallytime`_) Don't stacktrace on kwargs.get if kwargs=None
+  @ *2015-12-15 19:02:58 UTC*
+
+  * 52cc07cec9 Merge pull request `#29646`_ from rallytime/fix-29488
+
+  * c5fa9e9351 Don't stacktrace on kwargs.get if kwargs=None
+
+* **ISSUE** `#29661`_: (`mosuowhq`_) bug report when creating VM in /salt/cloud/clouds/nova.py (refs: `#29673`_)
+
+* **PR** `#29673`_: (`rallytime`_) Default value should be False and not 'False'
+  @ *2015-12-14 18:08:44 UTC*
+
+  * f606c23ea8 Merge pull request `#29673`_ from rallytime/fix-29661
+
+  * e4af7a1157 Default value should be False and not 'False'
+
+* **PR** `#29527`_: (`jfindlay`_) 2015.5.7 notes: add note about not being released
+  @ *2015-12-08 21:08:26 UTC*
+
+  * f77c8e7baf Merge pull request `#29527`_ from jfindlay/2015.5
+
+  * 1a8044f0c9 2015.5.7 notes: add note about not being released
+
+* **PR** `#29539`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5
+  @ *2015-12-08 19:14:51 UTC*
+
+  * 867d550271 Merge pull request `#29539`_ from basepi/merge-forward-2015.5
+
+  * 2c9c4ba430 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
+
+  * 85aa70a6cb Merge pull request `#29392`_ from jacobhammons/2014.7
+
+    * d7f0db1dd8 updated version number to not reference a specific build from the latest branch
+
+* **ISSUE** `#12072`_: (`vk00226`_) Passing user-data when provisioning  ec2 instances (refs: `#29504`_)
+
+* **PR** `#29504`_: (`rallytime`_) Document userdata_file option for EC2 driver
+  @ *2015-12-08 16:54:33 UTC*
+
+  * de7f3d5a59 Merge pull request `#29504`_ from rallytime/fix-12072
+
+  * 8357c95dc2 Document userdata_file option for EC2 driver
+
+* **ISSUE** `#29101`_: (`jessbreckenridge`_) Salt-cloud 2015.8.0 - del_*_vols_on_destroy does not work according to docs (refs: `#29507`_)
+
+* **PR** `#29507`_: (`rallytime`_) Switch volumes and del_*_on_destroy example ordering
+  @ *2015-12-08 16:50:11 UTC*
+
+  * 65deba8bb5 Merge pull request `#29507`_ from rallytime/ec2-doc-fix
+
+  * 90b4823bc2 Switch volumes and del_*_on_destroy example ordering
+
+* **ISSUE** `#28862`_: (`trevor-h`_) salt-cloud uppercase timeout options no longer recognized (refs: `#29469`_)
+
+* **PR** `#29469`_: (`abednarik`_) Added Documentation note in salt cloud.
+  @ *2015-12-07 18:27:46 UTC*
+
+  * 0918c9294f Merge pull request `#29469`_ from abednarik/doc_note_for_saltcloud_connection_timeout
+
+  * 8e5c3e366a Added Documentation note in salt cloud.
+
+* **PR** `#29461`_: (`dmyerscough`_) Fix resource limits, systemd sets the default too small
+  @ *2015-12-05 16:26:34 UTC*
+
+  * e43c7c05a6 Merge pull request `#29461`_ from dmyerscough/fix-resource-limits
+
+  * 85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys
+
+* **ISSUE** `#28526`_: (`clarkperkins`_) yumpkg.installed broken in salt v2015.8.1 on CentOS 6 minions (refs: `#28656`_)
+
+* **PR** `#29439`_: (`rallytime`_) Back-port `#28656`_ to 2015.5
+  @ *2015-12-04 22:56:17 UTC*
+
+  * **PR** `#28656`_: (`clarkperkins`_) `#28526`_ fixed yumpkg module issue with pkg.installed (refs: `#29439`_)
+
+  * 730f02fbdf Merge pull request `#29439`_ from rallytime/bp-28656
+
+  * 2f11bb021f `#28526`_ fixed yumpkg module
+
+* **PR** `#29418`_: (`jacobhammons`_) Added CVE 2015-8034 to 2015.5.8 release notes
+  @ *2015-12-04 03:02:53 UTC*
+
+  * 197210d52e Merge pull request `#29418`_ from jacobhammons/dot8
+
+  * 4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes
+
+* **PR** `#29389`_: (`jacobhammons`_) updated version numbers in documentation
+  @ *2015-12-03 16:27:23 UTC*
+
+  * b3452f2a1a Merge pull request `#29389`_ from jacobhammons/2015.5
+
+  * 824721ff36 updated version numbers
+
+* **ISSUE** `#26898`_: (`twangboy`_) Symlinks in Windows (2015.8) (refs: `#28191`_)
+
+* **PR** `#28501`_: (`twangboy`_) Requested fixes for 26898
+  @ *2015-12-03 01:12:12 UTC*
+
+  * **PR** `#28420`_: (`jfindlay`_) fix removal of symbolic links on windows in the file state (refs: `#28501`_)
+
+  * **PR** `#28191`_: (`twangboy`_) Fix 26898 (refs: `#28420`_, `#28501`_)
+
+  * 6a7a95f28a Merge pull request `#28501`_ from twangboy/jmoney_26898
+
+  * c0cf33332c Fixed some Lint...
+
+  * df17fc59d3 Merge pull request `#6`_ from jfindlay/twang_test
+
+    * bc7e0cfe64 add file.symlink unit tests
+
+    * 9381dc7215 orthogonalize file.symlink unit tests
+
+  * 8f462ba044 Merge pull request `#5`_ from cachedout/fix_twangboy_test
+
+    * 5293150d25 Fix tests
+
+  * 7d39091c91 Fixed some more lint
+
+  * 3dbd62af2c Fixed some tests... hopefully
+
+  * f187db3288 Removed unnecessary logic
+
+  * 89ebd268e6 Added file attributes restore on fail
+
+  * 9ec72ca724 fix file state unit tests for win symlink feature
+
+  * 69c32a663e Fixed some lint
+
+  * 638dec5027 Fixed some tests... let's see if they're really are
+
+  * 5ed7a99792 Replaced instances of shutil.rmtree in file state
+
+  * 2651ce509f Fix file.remove for windows
+
+* **ISSUE** `#29344`_: (`justinta`_) file.search broken on python 2.6 with empty files (refs: `#29348`_)
+
+* **PR** `#29348`_: (`justinta`_) Fixes an file.search on python2.6
+  @ *2015-12-02 23:26:36 UTC*
+
+  * 760a521603 Merge pull request `#29348`_ from jtand/file_search_fix
+
+  * 04f82bd4fd Fixes an file.search on python2.6
+
+* **ISSUE** `#29206`_: (`mschiff`_) ssh_known_hosts.present creates wrong known_hosts lines (refs: `#29276`_)
+
+* **PR** `#29336`_: (`rallytime`_) Back-port `#29276`_ to 2015.5
+  @ *2015-12-02 19:37:42 UTC*
+
+  * **PR** `#29276`_: (`abednarik`_) Prevent adding port twice when adding entry in known hosts (refs: `#29336`_)
+
+  * 51ea88d489 Merge pull request `#29336`_ from rallytime/bp-29276
+
+  * 3a0e19debb Prevent adding port twice when adding entry in known hosts
+
+* **PR** `#29333`_: (`rallytime`_) Back-port `#29280`_ to 2015.5
+  @ *2015-12-02 19:37:05 UTC*
+
+  * **PR** `#29280`_: (`cachedout`_) [Doc] Add note for SVN state (refs: `#29333`_)
+
+  * **PR** `#29165`_: (`titilambert`_) [Doc] Add note for SVN state (refs: `#29280`_, `#29333`_)
+
+  * 28255af52a Merge pull request `#29333`_ from rallytime/bp-29280
+
+  * 722d02ff4a Lint
+
+  * 4a0040c1b4 [Doc] Add note for SVN state
+
+* **PR** `#29316`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5
+  @ *2015-12-01 20:20:23 UTC*
+
+  * 14e94b3593 Merge pull request `#29316`_ from basepi/merge-forward-2015.5
+
+  * 33f40b3c47 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
+
+  * d2fb2109a3 Merge pull request `#29296`_ from douardda/patch-3
+
+  * d2885390f4 Use process KillMode on Debian systems also
+
+* **PR** `#29216`_: (`clan`_) size is 0 doesn't mean no data, e.g, /proc/version
+  @ *2015-11-30 20:01:43 UTC*
+
+  * 6a2ffbfb7c Merge pull request `#29216`_ from clan/file_search_on_proc_file
+
+  * 91a20c07a1 try mmap first
+
+  * 8aa4f2053e remove extra space to fix lint failure
+
+  * d34e6b1a9a use read only if has read() method
+
+  * 3209c1cdb5 size is 0 doesn't mean no data, e.g, /proc/version
+
+* **PR** `#29261`_: (`attiasr`_) fix incorrect reinstallation of windows pkg
+  @ *2015-11-30 18:28:42 UTC*
+
+  * d6aaae8d7b Merge pull request `#29261`_ from attiasr/patch-1
+
+  * 7a99b90596 add log and return if pkg already installed
+
+  * 1843c7ab8e fix incorrect reinstallation of windows pkg
+
+* **PR** `#29214`_: (`cro`_) Doc for salt.utils.http should say verify_ssl not ssl_verify.
+  @ *2015-11-25 23:55:38 UTC*
+
+  * 9236188867 Merge pull request `#29214`_ from cro/ssl_verify_ssl
+
+  * e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify.
+
+* **ISSUE** `#29202`_: (`lorengordon`_) Broken ca bundle lookup in `salt.utils.http.get_ca_bundle` (refs: `#29204`_)
+
+* **PR** `#29204`_: (`lorengordon`_) Use os.path.join to return full path to ca bundle
+  @ *2015-11-25 20:00:42 UTC*
+
+  * df7b35a86b Merge pull request `#29204`_ from lorengordon/fix-29202
+
+  * b1dae5e6fe Use os.path.join to return full path to ca bundle
+
+.. _`#10155`: https://github.com/saltstack/salt/issues/10155
+.. _`#12072`: https://github.com/saltstack/salt/issues/12072
+.. _`#18647`: https://github.com/saltstack/salt/issues/18647
+.. _`#23343`: https://github.com/saltstack/salt/issues/23343
+.. _`#24698`: https://github.com/saltstack/salt/issues/24698
+.. _`#26898`: https://github.com/saltstack/salt/issues/26898
+.. _`#27056`: https://github.com/saltstack/salt/issues/27056
+.. _`#27835`: https://github.com/saltstack/salt/issues/27835
+.. _`#28120`: https://github.com/saltstack/salt/issues/28120
 .. _`#28191`: https://github.com/saltstack/salt/pull/28191
 .. _`#28420`: https://github.com/saltstack/salt/pull/28420
 .. _`#28501`: https://github.com/saltstack/salt/pull/28501
+.. _`#28526`: https://github.com/saltstack/salt/issues/28526
 .. _`#28656`: https://github.com/saltstack/salt/pull/28656
+.. _`#28862`: https://github.com/saltstack/salt/issues/28862
+.. _`#28956`: https://github.com/saltstack/salt/issues/28956
+.. _`#29101`: https://github.com/saltstack/salt/issues/29101
 .. _`#29165`: https://github.com/saltstack/salt/pull/29165
+.. _`#29202`: https://github.com/saltstack/salt/issues/29202
 .. _`#29204`: https://github.com/saltstack/salt/pull/29204
+.. _`#29206`: https://github.com/saltstack/salt/issues/29206
 .. _`#29214`: https://github.com/saltstack/salt/pull/29214
 .. _`#29216`: https://github.com/saltstack/salt/pull/29216
 .. _`#29261`: https://github.com/saltstack/salt/pull/29261
@@ -105,6 +447,7 @@ Changes:
 .. _`#29316`: https://github.com/saltstack/salt/pull/29316
 .. _`#29333`: https://github.com/saltstack/salt/pull/29333
 .. _`#29336`: https://github.com/saltstack/salt/pull/29336
+.. _`#29344`: https://github.com/saltstack/salt/issues/29344
 .. _`#29348`: https://github.com/saltstack/salt/pull/29348
 .. _`#29389`: https://github.com/saltstack/salt/pull/29389
 .. _`#29392`: https://github.com/saltstack/salt/pull/29392
@@ -112,18 +455,23 @@ Changes:
 .. _`#29439`: https://github.com/saltstack/salt/pull/29439
 .. _`#29461`: https://github.com/saltstack/salt/pull/29461
 .. _`#29469`: https://github.com/saltstack/salt/pull/29469
+.. _`#29488`: https://github.com/saltstack/salt/issues/29488
 .. _`#29504`: https://github.com/saltstack/salt/pull/29504
 .. _`#29507`: https://github.com/saltstack/salt/pull/29507
 .. _`#29527`: https://github.com/saltstack/salt/pull/29527
 .. _`#29539`: https://github.com/saltstack/salt/pull/29539
+.. _`#29633`: https://github.com/saltstack/salt/issues/29633
 .. _`#29646`: https://github.com/saltstack/salt/pull/29646
+.. _`#29661`: https://github.com/saltstack/salt/issues/29661
 .. _`#29673`: https://github.com/saltstack/salt/pull/29673
 .. _`#29715`: https://github.com/saltstack/salt/pull/29715
 .. _`#29721`: https://github.com/saltstack/salt/pull/29721
 .. _`#29725`: https://github.com/saltstack/salt/pull/29725
 .. _`#29730`: https://github.com/saltstack/salt/pull/29730
+.. _`#29880`: https://github.com/saltstack/salt/issues/29880
 .. _`#29908`: https://github.com/saltstack/salt/pull/29908
 .. _`#29909`: https://github.com/saltstack/salt/pull/29909
+.. _`#29921`: https://github.com/saltstack/salt/issues/29921
 .. _`#29941`: https://github.com/saltstack/salt/pull/29941
 .. _`#29949`: https://github.com/saltstack/salt/pull/29949
 .. _`#30025`: https://github.com/saltstack/salt/pull/30025
@@ -139,3 +487,44 @@ Changes:
 .. _`#30191`: https://github.com/saltstack/salt/pull/30191
 .. _`#30207`: https://github.com/saltstack/salt/pull/30207
 .. _`#30237`: https://github.com/saltstack/salt/pull/30237
+.. _`#30248`: https://github.com/saltstack/salt/pull/30248
+.. _`#5`: https://github.com/saltstack/salt/issues/5
+.. _`#6`: https://github.com/saltstack/salt/issues/6
+.. _`Shad0w1nk`: https://github.com/Shad0w1nk
+.. _`abednarik`: https://github.com/abednarik
+.. _`aletourneau`: https://github.com/aletourneau
+.. _`anlutro`: https://github.com/anlutro
+.. _`attiasr`: https://github.com/attiasr
+.. _`basepi`: https://github.com/basepi
+.. _`bertjwregeer`: https://github.com/bertjwregeer
+.. _`cachedout`: https://github.com/cachedout
+.. _`clan`: https://github.com/clan
+.. _`clarkperkins`: https://github.com/clarkperkins
+.. _`cmhe`: https://github.com/cmhe
+.. _`cro`: https://github.com/cro
+.. _`dmyerscough`: https://github.com/dmyerscough
+.. _`githubcdr`: https://github.com/githubcdr
+.. _`hundt`: https://github.com/hundt
+.. _`jacobhammons`: https://github.com/jacobhammons
+.. _`jessbreckenridge`: https://github.com/jessbreckenridge
+.. _`jfindlay`: https://github.com/jfindlay
+.. _`jhenry82`: https://github.com/jhenry82
+.. _`jsutton`: https://github.com/jsutton
+.. _`jtylers`: https://github.com/jtylers
+.. _`justinta`: https://github.com/justinta
+.. _`lorengordon`: https://github.com/lorengordon
+.. _`markckimball`: https://github.com/markckimball
+.. _`micaelbergeron`: https://github.com/micaelbergeron
+.. _`mosuowhq`: https://github.com/mosuowhq
+.. _`mpreziuso`: https://github.com/mpreziuso
+.. _`mschiff`: https://github.com/mschiff
+.. _`oogali`: https://github.com/oogali
+.. _`racooper`: https://github.com/racooper
+.. _`rallytime`: https://github.com/rallytime
+.. _`terminalmage`: https://github.com/terminalmage
+.. _`titilambert`: https://github.com/titilambert
+.. _`trevor-h`: https://github.com/trevor-h
+.. _`twangboy`: https://github.com/twangboy
+.. _`twellspring`: https://github.com/twellspring
+.. _`vk00226`: https://github.com/vk00226
+.. _`zmalone`: https://github.com/zmalone

doc/topics/releases/2015.8.0.rst

@@ -65,14 +65,13 @@ for asynchronous behavior, which should greatly improve reliability and
 performance.
 
 .. note::
+    Tornado is considered expiremental in this release. The following known
+    issues were being investigated at the time of release:
 
-   Tornado is considered expiremental in this release. The following known
+    - TCP tests show performance degredation over time (:issue:`26051`)
-   issues were being investigated at the time of release:
+    - TCP transport stacktrace on windows minion: Future exception was never
-     - TCP tests show
+      retrieved (:issue:`25718`)
-       performance degredation over time (:issue:`26051`)
+    - [freebsd] TCP transport not working in 2015.8.0rc3 (:issue:`26364`)
-     - TCP transport stacktrace on windows minion: Future exception was never
-       retrieved (:issue:`25718`)
-     - [freebsd] TCP transport not working in 2015.8.0rc3 (:issue:`26364`)
 
 Proxy Minion Enhancements
 =========================
@@ -136,8 +135,10 @@ State and Execution Module Improvements
 
 - New and improved Docker state and execution modules (:mod:`state
   <salt.states.dockerng>` and :mod:`execution module <salt.modules.dockerng>`).
+
 .. toctree::
     includes/git-2015.8.0
+
 - OpenStack Glance API V2 execution module
 - Amazon VPC state module
 - RallyDev execution module

doc/topics/releases/2015.8.10.rst

@@ -2,37 +2,45 @@
 Salt 2015.8.10 Release Notes
 ============================
 
-Version 2015.8.10 is a bugfix release for :ref:`2015.8.0<release-2015-8-0>`.
+Version 2015.8.10 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
 
-**Final Release of Debian 7 Packages**
+This release includes fixes for two issues discovered in :ref:`2015.8.9
+<release-2015-8-9>`:
+
+- Pip state broken in 2015.8.9 with pip <6.0 (:issue:`33376`)
+- Fix traceback in logging for config validation (:pull:`33386`)
+
+Final Release of Debian 7 Packages
+==================================
 
 Regular security support for Debian 7 ended on April 25th 2016. As a result,
 2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian
 7 packages are created.
 
-.. admonition:: Mint Linux: Important Post-Upgrade Instructions
+Important Post-Upgrade Instructions for Linux Mint
+==================================================
 
-    As a result of some upstream changes, the ``os`` grain on Mint Linux is now
+As a result of some upstream changes, the ``os`` grain on Mint Linux is now
-    being detected as ``LinuxMint`` (:issue:`33295`). Run the following command
+being detected as ``LinuxMint`` (:issue:`33295`). Run the following command
-    **after you upgrade to 2015.8.10** to reset the ``os`` grain to ``Mint`` and
+**after you upgrade to 2015.8.10** to reset the ``os`` grain to ``Mint`` and
-    the ``os_family`` grain to ``Debian``:
+the ``os_family`` grain to ``Debian``:
 
-    .. code-block:: bash
+.. code-block:: bash
 
-        salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}"
+    salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}"
 
 
-Changes for v2015.8.9..v2015.8.10
+Changelog for v2015.8.9..v2015.8.10
----------------------------------
+===================================
 
-Salt 2015.8.10 includes fixes for the following known issues in 2015.8.9:
+*Generated at: 2018-05-28 00:51:57 UTC*
 
-* :issue:`33376`: pip state broken in 2015.8.9 with pip <6.0
+* c3d2c4eaae Fix traceback in logging for config validation (`#33386`_)
-* :pull:`33386`: Fix traceback in logging for config validation
 
-Since 2015.8.10 includes only two fixes, the 2015.8.9 changes list is included
+* 2a060ea1e8 restore whitespace
-below for convenience:
 
-.. include:: 2015.8.9.rst
+* aa1f45d664 blast, put the try/except int he right place
-   :start-line: 19
 
+* be1a7659a3 maintain the fallabck because I am totally sick of this crap
+
+.. _`#33386`: https://github.com/saltstack/salt/pull/33386

doc/topics/releases/2015.8.13.rst

@@ -8,44 +8,18 @@ Version 2015.8.13 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
 Security Fixes
 ==============
 
-CVE-2017-5192: local_batch client external authentication not respected
+**CVE-2017-5192** local_batch client external authentication not respected
 
 The ``LocalClient.cmd_batch()`` method client does not accept ``external_auth``
 credentials and so access to it from salt-api has been removed for now. This
 vulnerability allows code execution for already-authenticated users and is only
 in effect when running salt-api as the ``root`` user.
 
-CVE-2017-5200: Salt-api allows arbitrary command execution on a salt-master via
+**CVE-2017-5200** Salt-api allows arbitrary command execution on a salt-master
-Salt's ssh_client
+via Salt's ssh_client
 
 Users of Salt-API and salt-ssh could execute a command on the salt master via a
 hole when both systems were enabled.
 
 We recommend everyone on the 2015.8 branch upgrade to a patched release as soon
 as possible.
-
-
-Changes for v2015.8.12..v2015.8.13
-----------------------------------
-
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
-
-*Generated at: 2017-01-09T21:17:06Z*
-
-Statistics:
-
-- Total Merges: **3**
-- Total Issue references: **3**
-- Total PR references: **5**
-
-Changes:
-
-* 3428232 Clean up tests and docs for batch execution
-* 3d8f3d1 Remove batch execution from NetapiClient and Saltnado
-* 97b0f64 Lintfix
-* d151666 Add explanation comment
-* 62f2c87 Add docstring
-* 9b0a786 Explain what it is about and how to configure that
-* 5ea3579 Pick up a specified roster file from the configured locations
-* 3a8614c Disable custom rosters in API
-* c0e5a11 Add roster disable flag

doc/topics/releases/2015.8.14.rst

@@ -1,5 +0,0 @@
-============================
-Salt 2015.8.14 Release Notes
-============================
-
-Version 2015.8.14 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.

doc/topics/releases/2015.8.5.rst

@@ -1,16 +1,15 @@
-.. _2015.8.5:
+.. _release-2015-8-5:
 
 ===========================
 Salt 2015.8.5 Release Notes
 ===========================
 
-.. admonition:: About this Release
+Version 2015.8.5 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
 
-    Salt 2015.8.5 is identical to the 2015.8.4 release with the addition of
+.. important:: About this Release
-    a fix for :issue:`30820`, fixed by **PR** `#30833`_. For convenience, the
+    Salt 2015.8.5 is identical to the 2015.8.4 release with the addition of a
-    content from the 2015.8.4 release notes is included below.
+    fix for :issue:`30820`, fixed by :pull:`30833`. See :ref:`here
-
+    <release-2015-8-4>` for the 2015.8.4 release notes.
-.. _`#30833`: https://github.com/saltstack/salt/pull/30833
 
 Known Issue in ``boto_*`` execution modules
 ===========================================
@@ -22,15 +21,14 @@ following:
 
 1. Download the ``boto_*`` execution modules that you would like to update from
    the 2015.8 branch of Salt. A complete list of affected modules with the
-   specific changes is available in **PR** `#30867`_.
+   specific changes is available in :pull`30867`.
 
    A simple way to get the updated modules is to `download
    <https://github.com/saltstack/salt/archive/2015.8.zip>`_ a zip file of the
    2015.8 branch from GitHub. The updated modules are in the ``salt\modules``
    directory.
 
-2. Copy the ``boto_*`` modules to the ``\srv\salt\_modules`` directory on your
+2. Place the ``boto_*`` modules into ``salt://_modules``.
-   Salt master.
 
 3. Run the following command to sync these modules to all Salt minions:
 
@@ -39,11 +37,9 @@ following:
        salt '*' saltutil.sync_modules
 
 
-.. _`#30867`: https://github.com/saltstack/salt/pull/30867/files
+Changelog for v2015.8.4..v2015.8.5
+==================================
 
---------------------------
+*Generated at: 2018-05-27 23:47:32 UTC*
 
-**2015.8.4 Release Notes**
+* c7db4350d5 Fix regression in scanning for state with 'name' param
-
-.. include:: 2015.8.4.rst
-   :start-line: 16

doc/topics/releases/2015.8.7.rst

@@ -2,16 +2,29 @@
 Salt 2015.8.7 Release Notes
 ===========================
 
+Version 2015.8.7 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
+
 .. note::
     Salt 2015.8.4, 2015.8.5, and 2015.8.7 were all released within a short
     period due to regressions found soon after the releases of 2015.8.4 and
-    2015.8.5. These release notes contain all of the changes since 2015.8.3 to
+    2015.8.5. See :ref:`here <release-2015-8-4>` for the 2015.8.4 release
-    make it easier to see everything that has changed recently.
+    notes, and :ref:`here <release-2015-8-5>` for the 2015.8.5 release notes.
 
-Changes for v2015.8.4..v2015.8.7
---------------------------------
 
-For :py:mod:`pkg.installed <salt.states.pkg.installed>` states, on Linux
+Statistics
+==========
+
+- Total Merges: **2**
+- Total Issue References: **1**
+- Total PR References: **5**
+
+- Contributors: **4** (`gtmanfred`_, `justinta`_, `pass-by-value`_, `terminalmage`_)
+
+
+Change to Epoch Support for YUM/DNF
+===================================
+
+For :py:func:`pkg.installed <salt.states.pkg.installed>` states, on Linux
 distributions which use yum/dnf, packages which have a non-zero epoch in the
 version number now require this epoch to be included when specifying an exact
 version for a package. For example:
@@ -22,92 +35,88 @@ version for a package. For example:
       pkg.installed:
         - version: 2:7.4.160-1.el7
 
-The :py:mod:`pkg.latest_version <salt.modules.yumpkg.latest_version>` and
+The :py:func:`pkg.latest_version <salt.modules.yumpkg.latest_version>` and
-:py:mod:`pkg.list_repo_pkgs <salt.modules.yumpkg.list_repo_pkgs>` functions can
+:py:func:`pkg.list_repo_pkgs <salt.modules.yumpkg.list_repo_pkgs>` functions
-be used to get the correct version string to use, as they will now contain the
+can be used to get the correct version string to use, as they will now contain
-epoch when it is non-zero.
+the epoch when it is non-zero.
 
-Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
 
-*Generated at: 2016-02-11T22:13:51Z*
+Changelog for v2015.8.5..v2015.8.7
+==================================
 
-Statistics:
+*Generated at: 2018-05-28 00:17:59 UTC*
 
-- Total Merges: **2**
+* **PR** `#31111`_: (`justinta`_) Fixes failing npm test on arch.
-- Total Issue references: **0**
+  @ *2016-02-10 21:51:47 UTC*
-- Total PR references: **3**
 
-Changes:
+  * 8d84c636cf Merge pull request `#31111`_ from jtand/8_4_npm_fix
 
-- **PR** `#31111`_: (*jtand*) Fixes failing npm test on arch.
+  * b0a48e5ef2 Fixes failing npm test on arch.
-  @ *2016-02-10T21:51:47Z*
 
-  * 8d84c63 Merge pull request `#31111`_ from jtand/8_4_npm_fix
+  * **PR** `#30217`_: (`pass-by-value`_) Make sure cloud actions can be called via salt run
-  * b0a48e5 Fixes failing npm test on arch.
 
-  * 733c6ab Some 3rd-party modules (e.g. gnupg) define custom log levels that emit at INFO level and above.  This patch sets the color data lookups to default to TextFormat('reset') rather than producing a stack trace every time a log message is generated from an affected module.
+* **ISSUE** `#31014`_: (`gtmanfred`_) [2015.8] pkg breaks for yum pkgs.latest if the packages has an epoch (refs: `#31031`_, `#31015`_)
 
-  * 3f71fd0 Revert `#30217`_
+* **PR** `#31092`_: (`terminalmage`_) Apply PR `#31031`_ to 2015.8.4.follow_up
+  @ *2016-02-10 20:54:37 UTC*
 
-    - **PR** `#30217`_: (*pass-by-value*) Make sure cloud actions can be called via salt run
+  * **PR** `#31031`_: (`terminalmage`_) More complete fix for `#31014`_ (refs: `#31092`_)
 
-- **PR** `#31092`_: (*terminalmage*) Apply PR `#31031`_ to 2015.8.4.follow_up
+  * **PR** `#31015`_: (`gtmanfred`_) include possible epoch in version for rpm (refs: `#31031`_)
-  @ *2016-02-10T20:54:37Z*
 
-  * 5a6a93e Merge pull request `#31092`_ from terminalmage/issue31014-2015.8.4.follow_up
+  * 5a6a93e98b Merge pull request `#31092`_ from terminalmage/issue31014-2015.8.4.follow_up
-    * 2767a4e Don't handle epoch specially for dnf
 
-    * e5dfcc0 More efficient way to add the epoch before version number
+    * 2767a4e519 Don't handle epoch specially for dnf
 
-    * ed74627 include possible epoch in version for rpm
+    * e5dfcc0ef2 More efficient way to add the epoch before version number
 
-  * 6c6b66a Comment multiprocessing line in minion config
+    * ed7462793c include possible epoch in version for rpm
 
-  * 1f7dfef Set multiprocessing to true in config.py
+  * 6c6b66aedd Comment multiprocessing line in minion config
 
-  * 433c645 Fix remove placeholder files
+  * 1f7dfefc4a Set multiprocessing to true in config.py
 
-  * 7103756 Remove placeholder files
+  * 433c645c20 Fix remove placeholder files
 
-  * 20b381f Set overwrite to off
+  * 71037560d4 Remove placeholder files
 
-  * ca50f56 Fix boto_secgroup
+  * 20b381fdf7 Set overwrite to off
 
-  * fd571d2 Fix boto test failures
+  * ca50f56d6c Fix boto_secgroup
 
-  * cfb6588 Fix regression when contents_pillar/contents_grains is a list.
+  * fd571d23de Fix boto test failures
 
-  * 881d866 utils.aws: use time lib to conver to epoch seconds
+  * cfb6588744 Fix regression when contents_pillar/contents_grains is a list.
 
-  * 3141292 The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail.
+  * 881d8669e3 utils.aws: use time lib to conver to epoch seconds
 
-  * a869401 Fix regression in git_pillar when multiple remotes are configured
+  * 31412920fc The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail.
 
-  * 2243f25 Properly set the default value for pillar_merge_lists
+  * a8694014a9 Fix regression in git_pillar when multiple remotes are configured
 
-  * c7472ff Lint
+  * 2243f25be5 Properly set the default value for pillar_merge_lists
 
-  * d868711 Fix failing boto_vpc module unit tests
+  * c7472ff6aa Lint
 
-  * ed09516 Fix failing state module tests
+  * d868711a83 Fix failing boto_vpc module unit tests
 
-  * fd0e940 Pylint fix
+  * ed09516469 Fix failing state module tests
 
-  * bc780a7 Don't use pack=pack. Just pass in pack=__salt__ always.
+  * fd0e940088 Pylint fix
 
-  * 1ae022d Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules.
+  * bc780a7c25 Don't use pack=pack. Just pass in pack=__salt__ always.
 
-  * 1efaff1 Remove bad symlinks in osx pkg dirs
+  * 1ae022dbfe Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules.
 
-  * c7db435 Fix regression in scanning for state with 'name' param
+  * 1efaff107d Remove bad symlinks in osx pkg dirs
 
 .. _`#30217`: https://github.com/saltstack/salt/pull/30217
-.. _`#31031`: https://github.com/saltstack/salt/issues/31031
+.. _`#31014`: https://github.com/saltstack/salt/issues/31014
+.. _`#31015`: https://github.com/saltstack/salt/pull/31015
+.. _`#31031`: https://github.com/saltstack/salt/pull/31031
 .. _`#31092`: https://github.com/saltstack/salt/pull/31092
 .. _`#31111`: https://github.com/saltstack/salt/pull/31111
-
+.. _`gtmanfred`: https://github.com/gtmanfred
---------------------------
+.. _`justinta`: https://github.com/justinta
-
+.. _`pass-by-value`: https://github.com/pass-by-value
-.. include:: 2015.8.4.rst
+.. _`terminalmage`: https://github.com/terminalmage
-   :start-line: 17
-

doc/topics/releases/2015.8.8.2.rst

@@ -0,0 +1,41 @@
+.. _release-2015-8-8-2:
+
+=============================
+Salt 2015.8.8.2 Release Notes
+=============================
+
+Version 2015.8.8.2 is a bugfix release for :ref:`2015.8.0 <release-2015-8-0>`.
+
+
+Fixes to 2015.8.8
+=================
+
+Salt 2015.8.8.2 includes fixes for the following known issues in 2015.8.8:
+
+- Key master with value [...] has an invalid type of list Error (:issue:`32044`)
+- Failed to import module win_dacl Error (:issue:`32004`)
+- Wrong validation type for file_ignore_glob key (:issue:`32114`)
+- Fix file.managed for windows (:issue:`31969`)
+
+.. important::
+   :issue:`32183` prevents Salt Cloud from installing the Salt minion on new
+   systems. To workaround this issue, call ``salt-cloud -u`` to update the
+   bootstrap script to the latest version.
+
+
+Changelog for v2015.8.8..v2015.8.8.2
+====================================
+
+*Generated at: 2018-05-28 00:29:12 UTC*
+
+* 403563e441 Change type check errors to debug loglevel
+
+* 8323005b3d Support multiple valid option types when performing type checks
+
+* 2f95082a96 Fixed validation type for file_ignore_glob Fixes `#32114`_
+
+* 2685e61d9e Move constant declaration into member variable to avoid issues when modules can't be loaded.
+
+* bc10d7dede Add apply_template_on_contents for windows
+
+.. _`#32114`: https://github.com/saltstack/salt/issues/32114