Merge branch '2016.11' into 'develop'

Conflicts: - salt/config/__init__.py - salt/modules/win_lgpo.py - salt/utils/aws.py - tests/unit/utils/schema_test.py
mcpanayides · Feb 9, 2017 · 609e6e4 · 609e6e4
2 parents bac99d9 + db6140a
commit 609e6e4
Show file tree

Hide file tree

Showing 78 changed files with 806 additions and 282 deletions.
diff --git a/doc/glossary.rst b/doc/glossary.rst
@@ -1,3 +1,6 @@
+.. _glossary:
+
+========
 Glossary
 ========
 

diff --git a/doc/ref/clouds/all/salt.cloud.clouds.virtualbox.rst b/doc/ref/clouds/all/salt.cloud.clouds.virtualbox.rst
@@ -1,6 +1,6 @@
-========================
+============================
 salt.cloud.clouds.virtualbox
-========================
+============================
 
 .. automodule:: salt.cloud.clouds.virtualbox
     :members:

diff --git a/doc/ref/configuration/examples.rst b/doc/ref/configuration/examples.rst
@@ -1,3 +1,5 @@
+.. _configuration-file-examples:
+
 ===========================
 Configuration file examples
 ===========================

diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
@@ -794,7 +794,7 @@ Pass in an alternative location for the salt-ssh roster file.
 .. conf_master:: ssh_log_file
 
 ``ssh_log_file``
--------------------
+----------------
 
 .. versionadded:: 2016.3.5
 

diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
@@ -1,4 +1,4 @@
-.. _all-salt_modules:
+.. _all-salt.modules:
 
 =================
 execution modules

diff --git a/doc/ref/modules/all/salt.modules.cytest.rst b/doc/ref/modules/all/salt.modules.cytest.rst
@@ -3,4 +3,3 @@ salt.modules.cytest module
 
 .. automodule:: salt.modules.cytest
     :members:
-
diff --git a/doc/ref/returners/index.rst b/doc/ref/returners/index.rst
@@ -47,7 +47,7 @@ Writing a Returner
 
 A returner is a Python module containing at minimum a ``returner`` function.
 Other optional functions can be included to add support for
-:ref:`master_job_cache`, :ref:`external_job_cache`, and `Event Returners`_.
+:conf_master:`master_job_cache`, :ref:`external-job-cache`, and `Event Returners`_.
 
 ``returner``
     The ``returner`` function must accept a single argument. The argument
@@ -85,8 +85,8 @@ serializes the data as JSON and sets it in redis.
 Master Job Cache Support
 ------------------------
 
-:ref:`master_job_cache`, :ref:`external_job_cache`, and `Event Returners`_.
-Salt's :ref:`master_job_cache` allows returners to be used as a pluggable
+:conf_master:`master_job_cache`, :ref:`external-job-cache`, and `Event Returners`_.
+Salt's :conf_master:`master_job_cache` allows returners to be used as a pluggable
 replacement for the :ref:`default_job_cache`. In order to do so, a returner
 must implement the following functions:
 
@@ -176,7 +176,7 @@ must implement the following functions:
 External Job Cache Support
 --------------------------
 
-Salt's :ref:`external_job_cache` extends the :ref:`master_job_cache`. External
+Salt's :ref:`external-job-cache` extends the :conf_master:`master_job_cache`. External
 Job Cache support requires the following functions in addition to what is
 required for Master Job Cache support:
 
@@ -328,7 +328,7 @@ Testing the Returner
 
 The ``returner``, ``prep_jid``, ``save_load``, ``get_load``, and
 ``event_return`` functions can be tested by configuring the
-:ref:`master_job_cache` and `Event Returners`_ in the master config
+:conf_master:`master_job_cache` and `Event Returners`_ in the master config
 file and submitting a job to ``test.ping`` each minion from the master.
 
 Once you have successfully exercised the Master Job Cache functions, test the

diff --git a/doc/topics/cloud/misc.rst b/doc/topics/cloud/misc.rst
@@ -94,7 +94,7 @@ profile or map:
 Setting Up a Salt Syndic with Salt Cloud
 ========================================
 
-In addition to `setting up new Salt Masters`_, :ref:`syndic`s can also be
+In addition to `setting up new Salt Masters`_, :ref:`syndics <syndic>` can also be
 provisioned using Salt Cloud. In order to set up a Salt Syndic via Salt Cloud,
 a Salt Master needs to be installed on the new machine and a master configuration
 file needs to be set up using the ``make_master`` setting. This setting can be

diff --git a/doc/topics/development/contributing.rst b/doc/topics/development/contributing.rst
@@ -418,3 +418,4 @@ and bug resolution. See the :ref:`Labels and Milestones
 .. _'Git resources`: https://help.github.com/articles/good-resources-for-learning-git-and-github/
 .. _`Closing issues via commit message`: https://help.github.com/articles/closing-issues-via-commit-messages
 .. _`git format-patch`: https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html
+.. _salt-users: https://groups.google.com/forum/#!forum/salt-users
diff --git a/doc/topics/development/modular_systems.rst b/doc/topics/development/modular_systems.rst
@@ -25,7 +25,7 @@ modules is that the defined functions always return a JSON serializable
 object.
 
 For a list of all built in execution modules, click :ref:`here
-<all-salt_modules>`
+<all-salt.modules>`
 
 For information on writing execution modules, see :ref:`this page
 <writing-execution-modules>`.

diff --git a/doc/topics/execution/index.rst b/doc/topics/execution/index.rst
@@ -15,7 +15,7 @@ a wide variety of tasks. These modules provide functionality such as installing
 packages, restarting a service, running a remote command, transferring files,
 and so on.
 
-    :ref:`Full list of execution modules <all-salt_modules>`
+    :ref:`Full list of execution modules <all-salt.modules>`
         Contains: a list of core modules that ship with Salt.
 
     :ref:`Writing execution modules <writing-execution-modules>`

diff --git a/doc/topics/highavailability/index.rst b/doc/topics/highavailability/index.rst
@@ -6,7 +6,7 @@ High Availability Features in Salt
 
 Salt supports several features for high availability and fault tolerance.
 Brief documentation for these features is listed alongside their configuration
-parameters in :ref:`Configuration file examples <configuration/examples>`.
+parameters in :ref:`Configuration file examples <configuration-file-examples>`.
 
 Multimaster
 ===========

diff --git a/doc/topics/index.rst b/doc/topics/index.rst
@@ -6,6 +6,7 @@ Introduction to Salt
 
 The 30 second summary
 =====================
+
 Salt is:
 
 * a configuration management system, capable of maintaining remote nodes
@@ -89,3 +90,101 @@ the Salt project so that we can all benefit together as Salt grows.
 Please feel free to sprinkle Salt around your systems and let the
 deliciousness come forth.
 
+.. _salt-community:
+
+Salt Community
+==============
+
+Join the Salt!
+
+There are many ways to participate in and communicate with the Salt community.
+
+Salt has an active IRC channel and a mailing list.
+
+Mailing List
+============
+
+Join the `salt-users mailing list`_. It is the best place to ask questions
+about Salt and see whats going on with Salt development! The Salt mailing list
+is hosted by Google Groups. It is open to new members.
+
+.. _`salt-users mailing list`: https://groups.google.com/forum/#!forum/salt-users
+
+
+IRC
+===
+
+The ``#salt`` IRC channel is hosted on the popular `Freenode`_ network. You
+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 webchat client:: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
+.. _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``.
+
+
+Follow on Github
+================
+
+The Salt code is developed via Github. Follow Salt for constant updates on what
+is happening in Salt development:
+
+|saltrepo|
+
+
+Blogs
+=====
+
+SaltStack Inc. keeps a `blog`_ with recent news and advancements:
+
+http://www.saltstack.com/blog/
+
+.. _`blog`: http://www.saltstack.com/blog/
+
+
+Example Salt States
+===================
+
+The official ``salt-states`` repository is:
+https://github.com/saltstack/salt-states
+
+A few examples of salt states from the community:
+
+* https://github.com/blast-hardcheese/blast-salt-states
+* https://github.com/kevingranade/kevingranade-salt-state
+* https://github.com/uggedal/states
+* https://github.com/mattmcclean/salt-openstack/tree/master/salt
+* https://github.com/rentalita/ubuntu-setup/
+* https://github.com/brutasse/states
+* https://github.com/bclermont/states
+* https://github.com/pcrews/salt-data
+
+Follow on ohloh
+===============
+
+https://www.ohloh.net/p/salt
+
+Other community links
+=====================
+
+- `Salt Stack Inc. <http://www.saltstack.com>`_
+- `Subreddit <http://www.reddit.com/r/saltstack>`_
+- `Google+ <https://plus.google.com/114449193225626631691/posts>`_
+- `YouTube <http://www.youtube.com/user/SaltStack>`_
+- `Facebook <https://www.facebook.com/SaltStack>`_
+- `Twitter <https://twitter.com/SaltStackInc>`_
+- `Wikipedia page <http://en.wikipedia.org/wiki/Salt_(software)>`_
+
+Hack the Source
+===============
+
+If you want to get involved with the development of source code or the
+documentation efforts, please review the :ref:`contributing documentation
+<contributing>`!
+
+.. _`Apache 2.0 license`: http://www.apache.org/licenses/LICENSE-2.0.html
+
diff --git a/doc/topics/jinja/index.rst b/doc/topics/jinja/index.rst
@@ -1,4 +1,4 @@
-.. _jinja:
+.. _understanding-jinja:
 
 ===================
 Understanding Jinja

diff --git a/doc/topics/jobs/external_cache.rst b/doc/topics/jobs/external_cache.rst
@@ -1,4 +1,4 @@
-.. _external-master-cache:
+.. _external-job-cache:
 
 =========================================
 Storing Job Results in an External System

diff --git a/doc/topics/jobs/job_cache.rst b/doc/topics/jobs/job_cache.rst
@@ -67,6 +67,6 @@ Many deployments may wish to use an external database to maintain a long term
 register of executed jobs. Salt comes with two main mechanisms to do this, the
 master job cache and the external job cache.
 
-See :ref:`Storing Job Results in an External System <external-master-cache>`.
+See :ref:`Storing Job Results in an External System <external-job-cache>`.
 
 
diff --git a/doc/topics/mine/index.rst b/doc/topics/mine/index.rst
@@ -22,7 +22,7 @@ refreshed on a very limited basis and are largely static data. Mines are
 designed to replace slow peer publishing calls when Minions need data from
 other Minions. Rather than having a Minion reach out to all the other Minions
 for a piece of data, the Salt Mine, running on the Master, can collect it from
-all the Minions every :ref:`mine-interval`, resulting in
+all the Minions every :ref:`mine_interval`, resulting in
 almost fresh data at any given time, with much less overhead.
 
 Mine Functions

diff --git a/doc/topics/reactor/index.rst b/doc/topics/reactor/index.rst
@@ -410,7 +410,7 @@ sets up and listens to the minions event bus, instead of to the masters.
 The biggest difference is that you have to use the caller method on the
 Reactor, which is the equivalent of salt-call, to run your commands.
 
-:ref:`Reactor Engine setup<salt.engines.reactor>`
+:mod:`Reactor Engine setup <salt.engines.reactor>`
 
 .. code-block:: yaml
 

diff --git a/doc/topics/releases/2014.1.0.rst b/doc/topics/releases/2014.1.0.rst
@@ -9,7 +9,7 @@ Salt 2014.1.0 Release Notes - Codename Hydrogen
    Due to a change in master to minion communication, 2014.1.0 minions are not
    compatible with older-version masters.  Please upgrade masters first.
    More info on backwards-compatibility policy :ref:`here
-   <installation`, under the "Upgrading Salt" subheading.
+   <installation>`, under the "Upgrading Salt" subheading.
 
 .. note::
 
@@ -248,7 +248,7 @@ Proxy Minions
 -------------
 
 Initial basic support for Proxy Minions is in this release. Documentation can
-be found :ref:`here <proxy>`.
+be found :ref:`here <proxy-minion>`.
 
 Proxy minions are a developing feature in Salt that enables control of devices
 that cannot run a minion. Examples include network gear like switches and

diff --git a/doc/topics/releases/2015.8.11.rst b/doc/topics/releases/2015.8.11.rst
@@ -17,7 +17,7 @@ New Configuration Parameter: ``rotate_aes_key``
 - ``Rotate_aes_key`` causes Salt to generate a new AES key whenever a minion key
   is deleted.  This eliminates the chance that a deleted minion could continue
   to eavesdrop on communications with the master if it continues to run after its
-  key is deleted.  See the entry in the documentation for `rotate_aes_key`_.
+  key is deleted.  See the entry in the documentation for :conf_master:`rotate_aes_key`.
 
 Ubuntu 16.04 Packages
 =====================
@@ -404,11 +404,13 @@ Changes:
 
 .. _`#20226`: https://github.com/saltstack/salt/pull/20226
 .. _`#22480`: https://github.com/saltstack/salt/pull/22480
+.. _`#23643`: https://github.com/saltstack/salt/issues/23643
 .. _`#25089`: https://github.com/saltstack/salt/pull/25089
 .. _`#28325`: https://github.com/saltstack/salt/pull/28325
 .. _`#28467`: https://github.com/saltstack/salt/pull/28467
 .. _`#32484`: https://github.com/saltstack/salt/pull/32484
 .. _`#32857`: https://github.com/saltstack/salt/pull/32857
+.. _`#33266`: https://github.com/saltstack/salt/issues/33266
 .. _`#33282`: https://github.com/saltstack/salt/pull/33282
 .. _`#33286`: https://github.com/saltstack/salt/pull/33286
 .. _`#33287`: https://github.com/saltstack/salt/pull/33287
@@ -491,6 +493,7 @@ Changes:
 .. _`#33555`: https://github.com/saltstack/salt/pull/33555
 .. _`#33558`: https://github.com/saltstack/salt/pull/33558
 .. _`#33581`: https://github.com/saltstack/salt/pull/33581
+.. _`#33582`: https://github.com/saltstack/salt/issues/33582
 .. _`#33599`: https://github.com/saltstack/salt/pull/33599
 .. _`#33611`: https://github.com/saltstack/salt/pull/33611
 .. _`#33615`: https://github.com/saltstack/salt/pull/33615
@@ -647,4 +650,3 @@ Changes:
 .. _`#34647`: https://github.com/saltstack/salt/pull/34647
 .. _`#34651`: https://github.com/saltstack/salt/pull/34651
 .. _`#34676`: https://github.com/saltstack/salt/pull/34676
-.. _ `rotate_aes_key`: https://docs.saltstack.com/en/2015.8/ref/configuration/master.html#rotate-aes-key
diff --git a/doc/topics/releases/2015.8.4.rst b/doc/topics/releases/2015.8.4.rst
@@ -48,8 +48,6 @@ Core Changes
     salt '*' state.highstate mock=True
     salt '*' state.apply edit.vim mock=True
 
-.. _`#28994`: https://github.com/saltstack/salt/pull/28994
-
 Changes for v2015.8.3..v2015.8.4
 --------------------------------
 
@@ -515,7 +513,7 @@ Changes:
 
 - **PR** `#29317`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8
 
-- **PR** `#29240`_: (*clan*) handle acl_type [[d]efault:][user|group|mask|other]
+- **PR** `#29240`_: (*clan*) handle acl_type ``[[d]efault:][user|group|mask|other]``
 
 - **PR** `#29305`_: (*lorengordon*) Add 'file' as a source_hash proto
 
@@ -578,11 +576,13 @@ Changes:
 - **PR** `#29178`_: (*whytewolf*) Profile not being passed to keystone.endpoint_get in _auth. so if a p…
 
 .. _`#19332`: https://github.com/saltstack/salt/issues/19332
+.. _`#24237`: https://github.com/saltstack/salt/issues/24237
 .. _`#29116`: https://github.com/saltstack/salt/issues/29116
 .. _`#29187`: https://github.com/saltstack/salt/issues/29187
 .. _`#23825`: https://github.com/saltstack/salt/pull/23825
 .. _`#26511`: https://github.com/saltstack/salt/pull/26511
 .. _`#26853`: https://github.com/saltstack/salt/pull/26853
+.. _`#26845`: https://github.com/saltstack/salt/issues/26845
 .. _`#26962`: https://github.com/saltstack/salt/pull/26962
 .. _`#27104`: https://github.com/saltstack/salt/pull/27104
 .. _`#27606`: https://github.com/saltstack/salt/pull/27606
-Original file line number
+Diff line change
@@ Expand Up @@
     .. conf_master:: ssh_log_file
     ``ssh_log_file``
-    -------------------
+    ----------------
     .. versionadded:: 2016.3.5
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@ salt.modules.cytest module

		.. automodule:: salt.modules.cytest
		:members: