Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop: (42 commits) Typo fix (saltstack#34066) states.disk: rewrite unit tests states.disk.status: validate percent values states.disk: add documentation _active_mounts_openbsd: unbreak output for special filesystems (saltstack#34057) Use the develop version of the disk state fix saltstack#34038 (saltstack#34042) Merge pull request saltstack#34025 from rallytime/merge-2016.3 Update saltmod tests to use master __opts__ Documentation to describe orchestration support for masterless minions Support `salt.state` orchestration formats on masterless minions Import the orchestrate runner as an execution module function Updated latest release to 2016.3.1 Clean up installation instructions code-block type updates Add link to jinja tutorial fix launch config creation params (saltstack#34014) Always make chanes to minion config if set (saltstack#34021) `states.postgres_privileges` expects a real list, not a comma-separated string for `privileges` one clause to set OS grain from CPE_NAME fix redis_return's clean_old_jobs. Adds new Understanding Jinja topic, and fixes several Jinja doc issues. Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability. Call `sys.exit()` instead of `exit()` ...
gitebra · Jun 16, 2016 · e83b4bb · e83b4bb
2 parents 3b73ba1 + 5a792ca
commit e83b4bb
Show file tree

Hide file tree

Showing 92 changed files with 1,565 additions and 698 deletions.
diff --git a/doc/_themes/saltstack2/layout.html b/doc/_themes/saltstack2/layout.html
@@ -221,10 +221,11 @@
                     <div class="footer">
                         <hr />
 
-                        {% if on_saltstack %}
                         <div class="row">
 
+                            {% if on_saltstack %}
                             <div class="col-sm-6">
+                            <p><i>Generated on {{today}}.</i></p>
 
                                 {% if build_type == "latest" %}
                                 <p>You are viewing docs for the latest stable release, {{ latest_release }}. Switch to docs for the previous stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release }}</a>, or to a recent doc build from the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Latest docs from the develop branch" href="/en/develop/">develop</a> branch.</p>
@@ -252,8 +253,8 @@
 
 
                             </div>
+                            {% endif %}
                         </div>
-                        {% endif %}
                     </div> <!--end footer-->
                     {%- endblock %}
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -7,6 +7,7 @@
 import sys
 import os
 import types
+import time
 
 from sphinx.directives import TocTree
 
@@ -217,6 +218,8 @@ def inner(fn, *iargs, **ikwargs):
 next_release = ''  # next release
 next_release_dir = ''  # path on web server for next release branch
 
+today = time.strftime("%B %d, %Y") + " at " + time.strftime("%X %Z")
+
 # < --- START do not merge these settings to other branches START ---> #
 build_type = 'develop'  # latest, previous, develop, next
 release = version  # version, latest_release, previous_release
@@ -285,6 +288,11 @@ def inner(fn, *iargs, **ikwargs):
      <p>AMD64: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-AMD64-Setup.exe"><strong>Salt-Minion-{release}-AMD64-Setup.exe</strong></a>
       | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
 
+.. |osxdownload| raw:: html
+
+     <p>x86_64: <a href="https://repo.saltstack.com/osx/salt-{release}-x86_64.pkg"><strong>salt-{release}-x86_64.pkg</strong></a>
+      | <a href="https://repo.saltstack.com/osx/salt-{release}-x86_64.pkg.md5"><strong>md5</strong></a></p>
+
 """.format(release=release)
 
 # A shortcut for linking to tickets on the GitHub issue tracker
@@ -362,6 +370,7 @@ def inner(fn, *iargs, **ikwargs):
     'next_release_dir': next_release_dir,
     'search_cx': search_cx,
     'build_type': build_type,
+    'today': today,
 }
 
 html_use_index = True

diff --git a/doc/ref/auth/all/index.rst b/doc/ref/auth/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.auth:
 
-=================================
-Full list of builtin auth modules
-=================================
+============
+auth modules
+============
 
 .. currentmodule:: salt.auth
 

diff --git a/doc/ref/beacons/all/index.rst b/doc/ref/beacons/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.beacons:
 
-===================================
-Full list of builtin beacon modules
-===================================
+==============
+beacon modules
+==============
 
 .. currentmodule:: salt.beacons
 

diff --git a/doc/ref/engines/all/index.rst b/doc/ref/engines/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.engines:
 
-===================================
-Full list of builtin engine modules
-===================================
+==============
+engine modules
+==============
 
 .. currentmodule:: salt.engines
 

diff --git a/doc/ref/file_server/all/index.rst b/doc/ref/file_server/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.fileserver:
 
-=======================================
-Full list of builtin fileserver modules
-=======================================
+==================
+fileserver modules
+==================
 
 .. currentmodule:: salt.fileserver
 

diff --git a/doc/ref/grains/all/index.rst b/doc/ref/grains/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.grains:
 
-===================================
-Full list of builtin grains modules
-===================================
+==============
+grains modules
+==============
 
 .. currentmodule:: salt.grains
 

diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt_modules:
 
-======================================
-Full list of builtin execution modules
-======================================
+=================
+execution modules
+=================
 
 .. admonition:: Virtual modules
 

diff --git a/doc/ref/netapi/all/index.rst b/doc/ref/netapi/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-netapi-modules:
 
-===========================
-Full list of netapi modules
-===========================
+==============
+netapi modules
+==============
 
 .. toctree::
     :maxdepth: 2

diff --git a/doc/ref/output/all/index.rst b/doc/ref/output/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.output:
 
-===================================
-Full list of builtin output modules
-===================================
+==============
+output modules
+==============
 
 Follow one of the below links for further information and examples
 

diff --git a/doc/ref/pillar/all/index.rst b/doc/ref/pillar/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.pillars:
 
-===================================
-Full list of builtin pillar modules
-===================================
+==============
+pillar modules
+==============
 
 .. currentmodule:: salt.pillar
 

diff --git a/doc/ref/proxy/all/index.rst b/doc/ref/proxy/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.proxy:
 
-==================================
-Full list of builtin proxy modules
-==================================
+=============
+proxy modules
+=============
 
 .. currentmodule:: salt.proxy
 

diff --git a/doc/ref/queues/all/index.rst b/doc/ref/queues/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.queues:
 
-===========================
-Full list of builtin queues
-===========================
+=============
+queue modules
+=============
 
 .. currentmodule:: salt.queues
 

diff --git a/doc/ref/renderers/all/index.rst b/doc/ref/renderers/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.renderers:
 
-=====================================
-Full list of builtin renderer modules
-=====================================
+================
+renderer modules
+================
 
 .. currentmodule:: salt.renderers
 

diff --git a/doc/ref/returners/all/index.rst b/doc/ref/returners/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.returners:
 
-=====================================
-Full list of builtin returner modules
-=====================================
+================
+returner modules
+================
 
 .. currentmodule:: salt.returners
 

diff --git a/doc/ref/roster/all/index.rst b/doc/ref/roster/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.roster:
 
-===================================
-Full list of builtin roster modules
-===================================
+==============
+roster modules
+==============
 
 .. currentmodule:: salt.roster
 

diff --git a/doc/ref/runners/all/index.rst b/doc/ref/runners/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.runners:
 
-===========================
-Full list of runner modules
-===========================
+==============
+runner modules
+==============
 
 .. currentmodule:: salt.runners
 

diff --git a/doc/ref/sdb/all/index.rst b/doc/ref/sdb/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.sdb:
 
-================================
-Full list of builtin sdb modules
-================================
+===========
+sdb modules
+===========
 
 .. currentmodule:: salt.sdb
 

diff --git a/doc/ref/serializers/all/index.rst b/doc/ref/serializers/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.serializers:
 
-================================
-Full list of builtin serializers
-================================
+==================
+serializer modules
+==================
 
 .. currentmodule:: salt.serializers
 

diff --git a/doc/ref/states/all/index.rst b/doc/ref/states/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.states:
 
-==================================
-Full list of builtin state modules
-==================================
+=============
+state modules
+=============
 
 .. currentmodule:: salt.states
 

diff --git a/doc/ref/thorium/all/index.rst b/doc/ref/thorium/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.thorium:
 
-====================================
-Full list of builtin thorium modules
-====================================
+===============
+thorium modules
+===============
 
 .. currentmodule:: salt.thorium
 

diff --git a/doc/ref/tops/all/index.rst b/doc/ref/tops/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.tops:
 
-========================================
-Full list of builtin master tops modules
-========================================
+===================
+master tops modules
+===================
 
 .. currentmodule:: salt.tops
 

diff --git a/doc/ref/wheel/all/index.rst b/doc/ref/wheel/all/index.rst
@@ -1,8 +1,8 @@
 .. _all-salt.wheel:
 
-==================================
-Full list of builtin wheel modules
-==================================
+=============
+wheel modules
+=============
 
 .. currentmodule:: salt.wheel
 

diff --git a/doc/topics/development/salt_projects.rst b/doc/topics/development/salt_projects.rst
diff --git a/doc/topics/installation/debian.rst b/doc/topics/installation/debian.rst
@@ -21,7 +21,12 @@ Installation from the Official SaltStack Repository
 Packages for Debian 8 (Jessie) and Debian 7 (Wheezy) are available in the
 Official SaltStack repository.
 
-Instructions are at http://repo.saltstack.com/#debian.
+Instructions are at https://repo.saltstack.com/#debian.
+
+.. note::
+    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.
 
 .. _installation-debian-raspbian:
 

diff --git a/doc/topics/installation/index.rst b/doc/topics/installation/index.rst
@@ -176,3 +176,14 @@ a security vulnerability.
 
     :doc:`Installing Salt for development </topics/development/hacking>` and
     contributing to the project.
+
+Building Packages using Salt Pack
+---------------------------------
+
+Salt-pack is an open-source package builder for most commonly used Linux
+platforms, for example: Redhat/CentOS and Debian/Ubuntu families, utilizing
+SaltStack states and execution modules to build Salt and a specified set of
+dependencies, from which a platform specific repository can be built.
+
+https://github.com/saltstack/salt-pack
+