Updated release notes, change 2015.8 to latest release for doc site

doc/_themes/saltstack2/layout.html

@@ -21,12 +21,12 @@
 
 {% set script_files = [
     '_static/js/core.min.js',
-    '_static/js/webhelp.min_v1.4.1.js',
+    '_static/js/webhelp.min_v1.4.2.js',
 ] %}
 
 {% set css_files = [
     '_static/css/core.min.css',
-    '_static/css/webhelp.min_v1.4.2.css',
+    '_static/css/webhelp.min_v1.4.1.css',
 ] %}
 
 {%- macro relbar() %}
@@ -160,6 +160,12 @@
                             </div>
                             {% endif %}
 
+                            {% if build_type == "inactive" and on_saltstack %}
+                            <div id="dev-notification">
+                                <div class="alert alert-warning dev-notification-text releaselinks" role="alert"><i class="glyphicon glyphicon-cog"></i> You are viewing docs from a branch that is no longer active. You might want to view docs for the <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release }}</a> release instead.</div>
+                            </div>
+                            {% endif %}
+
                             {%- block document %}
                             <div class="body-content">
                                 {% block body %} {% endblock %}
@@ -192,8 +198,11 @@
                                 {% elif build_type == "previous" %}
                                 <p>You are viewing docs for the previous stable release, {{ previous_release }}. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_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>
 
+                                {% elif build_type == "inactive" %}
+                                <p>You are viewing docs for an inactive release, {{ previous_release }}. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_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>
+
                                 {% elif build_type == "develop" %}
-                                <p>You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release }}</a>, or 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>.</p>
+                                <p>You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, <a data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release }}</a>.</p>
                                 {% endif %}
 
                                 <br>
@@ -203,12 +212,9 @@
 
                             <div class="col-sm-6">
 
-                                <a href="http://saltstack.com/saltstack-enterprise-4-0-now-with-gui/" target="_blank"><img class="nolightbox nav-banner" src="{{ pathto('_static/images/saltStack_enterprise_350x125.jpg', 1) }}"/></a>
+                                 <a href="http://saltstack.com/events/" target="_blank"><img class="nolightbox nav-banner center" src="{{ pathto('_static/images/saltStack_events_300x300.jpg', 1) }}"/></a>
 
-                                <br/><br/>
 
-                                <p><b>SaltStack Training</b></p>
-                                <p><a href="http://www.saltstack.com/training/">Now offering remote attendee training!</a></p>
                             </div>
                         </div>
                         {% endif %}
@@ -224,9 +230,9 @@
                 <a class="ss-logo" href="http://saltstack.com"><img width="250" height="63" class="nolightbox center" src="{{ pathto('_static/images/saltstack_logo.svg', 1) }}"></a>
 
                 {% if on_saltstack %}
-                <div class="versions {{ build_type }}">
+                <div class="releaselinks versions {{ build_type }}">
 
-                <a class="btn btn-secondary{% if build_type == "previous" %} active{% endif %}" id="previous"{% if build_type == "previous" %} title="View release notes"{% else %} title="Switch to docs for the previous stable release"{% endif %} data-container="body" data-toggle="tooltip" data-placement="bottom" href="/en/{{ previous_release_dir }}/">{{ previous_release }}{% if build_type == "previous" %} <i class="glyphicon glyphicon-ok"></i>{%- endif %}</a>
+                <a class="btn btn-secondary{% if build_type == "previous" or build_type == "inactive" %} active{% endif %}" id="previous"{% if build_type == "previous" or build_type == "inactive" %} title="View release notes"{% else %} title="Switch to docs for the previous stable release"{% endif %} data-container="body" data-toggle="tooltip" data-placement="bottom" href="/en/{{ previous_release_dir }}/">{{ previous_release }}{% if build_type == "previous" or build_type == "inactive" %} <i class="glyphicon glyphicon-ok"></i>{%- endif %}</a>
 
                 <a  class="btn btn-secondary{% if build_type == "latest" %} active{% endif %}" id="latest"{% if build_type == "latest" %} title="View release notes"{% else %} title="Switch to docs for the latest stable release"{% endif %} data-container="body" data-toggle="tooltip" data-placement="bottom" href="/en/latest/">{{ latest_release }}{% if build_type == "latest" %} <i class="glyphicon glyphicon-ok"></i>{% endif %}</a>
 

doc/_themes/saltstack2/static/js/webhelp.min_v1.4.2.js

@@ -115,7 +115,7 @@ $( document ).ready(function() {
     });
 
     /*version page selector*/
-    $( 'div.versions' ).on('click', 'a', function (e) {
+    $( 'div.releaselinks' ).on('click', 'a', function (e) {
         e.preventDefault();
         var clickedVer = $(this).attr("href");
         var $currentVer = $( 'div.versions' ).find( 'a.active' ).first();
@@ -188,4 +188,4 @@ function resizeend() {
 
 function last(list) {
     return list[list.length - 1];
-}
+}

doc/conf.py

@@ -166,7 +166,7 @@ version = salt.version.__version__
 latest_release = '2015.8.0' # latest release
 previous_release = '2015.5.5'  # latest release from previous branch
 previous_release_dir = '2015.5'  # path on web server for previous branch
-build_type = 'latest'  # latest, previous, develop
+build_type = 'latest'  # latest, previous, develop, inactive
 
 # set release to 'version' for develop so sha is used
 # - otherwise -
@@ -177,11 +177,11 @@ release = latest_release  # version, latest_release, previous_release
 # Set google custom search engine
 
 if release == latest_release:
-    search_cx = '004624818632696854117:yfmprrbw3pk'
+    search_cx = '004624818632696854117:yfmprrbw3pk' # latest
 elif release.startswith('2014.7'):
-    search_cx = '004624818632696854117:thhslradbru'
+    search_cx = '004624818632696854117:thhslradbru' # 2014.7
 elif release.startswith('2015.5'):
-    search_cx = '004624818632696854117:ovogwef29do'
+    search_cx = '004624818632696854117:ovogwef29do' # 2015.5
 else:
     search_cx = '004624818632696854117:haj7bjntf4s'  # develop
 
@@ -229,11 +229,11 @@ rst_prolog = """\
 .. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers
 .. |windownload| raw:: html
 
-     <p>x86: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-x86-Setup.exe"><strong>Salt-Minion-{release}-x86-Setup.exe</strong></a>
-      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-x86-Setup.exe.md5"><strong>md5</strong></a></p>
+     <p>x86: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-3-x86-Setup.exe"><strong>Salt-Minion-{release}-3-x86-Setup.exe</strong></a>
+      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-3-x86-Setup.exe.md5"><strong>md5</strong></a></p>
 
-     <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>
+     <p>AMD64: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-3-AMD64-Setup.exe"><strong>Salt-Minion-{release}-3-AMD64-Setup.exe</strong></a>
+      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-3-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
 
 """.format(release=release)
 

doc/topics/installation/debian.rst

@@ -1,14 +1,46 @@
+.. _installation-debian:
+
 ===================
 Debian Installation
 ===================
 
-Currently the latest packages for Debian Old Stable, Stable, and
-Unstable (Squeeze, Wheezy, and Sid) are published in our
-(saltstack.com) Debian repository.
+.. _installation-debian-repo:
+
+Installation from the SaltStack Repository
+==========================================
+
+Debian 8 packages are available in the SaltStack Debian repository.
+
+To install using the SaltStack Debian repository:
+
+#. Run the following command to import the SaltStack repository key:
+
+   .. code-block:: bash
+
+       wget -O - https://repo.saltstack.com/apt/debian/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+#. Add the following line to ``/etc/apt/sources.list``:
+
+   .. code-block:: bash
+
+       deb http://repo.saltstack.com/apt/debian jessie contrib
+
+#. Run ``sudo apt-get update``
+
+#. Install the salt-minion, salt-master, or other Salt components:
+
+   - ``apt-get install salt-master``
+   - ``apt-get install salt-minion``
+   - ``apt-get install salt-ssh``
+   - ``apt-get install salt-syndic``
+   - ``apt-get install salt-cloud``
 
 Configure Apt
 -------------
 
+Currently the latest packages for Debian Old Stable, Stable, and
+Unstable (Squeeze, Wheezy, and Sid) are published in our
+(saltstack.com) Debian repository.
 
 Squeeze (Old Old Stable)
 ------------------------

doc/topics/installation/rhel.rst

@@ -1,26 +1,92 @@
+.. _installation-rhel:
+
 ==============================================================
 RHEL / CentOS / Scientific Linux / Amazon Linux / Oracle Linux
 ==============================================================
 
+.. _installation-rhel-repo:
+
+Installation from the SaltStack Repository
+==========================================
+
+To install using the SaltStack yum repository:
+
+#. Run one of the following commands based on your version to import the SaltStack repository key:
+
+   Version 7:
+
+   .. code-block:: bash
+
+       wget -O - rpm --import https://repo.saltstack.com/yum/rhel7/SALTSTACK-GPG-KEY.pub
+
+   Version 6:
+
+   .. code-block:: bash
+
+       wget -O - rpm --import https://repo.saltstack.com/yum/rhel6/SALTSTACK-GPG-KEY.pub
+
+   Version 5:
+
+   .. code-block:: bash
+
+       wget https://repo.saltstack.com/yum/rhel5/SALTSTACK-EL5-GPG-KEY.pub ; rpm --import SALTSTACK-EL5-GPG-KEY.pub ; rm -f SALTSTACK-EL5-GPG-KEY.pub
+
+#. Save the following file to ``/etc/yum.repos.d/saltstack.repo``:
+
+   Versions 6 / 7:
+
+    .. code-block:: config
+
+        ####################
+        # Enable SaltStack's package repository
+        [saltstack-repo]
+        name=SaltStack repo for RHEL/CentOS $releasever
+        baseurl=https://repo.saltstack.com/yum/rhel$releasever
+        enabled=1
+        gpgcheck=1
+        gpgkey=https://repo.saltstack.com/yum/rhel$releasever/SALTSTACK-GPG-KEY.pub
+
+   Version 5:
+
+    .. code-block:: config
+
+        ####################
+        # Enable SaltStack's package repository
+        [saltstack-repo]
+        name=SaltStack repo for RHEL/CentOS $releasever
+        baseurl=https://repo.saltstack.com/yum/rhel$releasever
+        enabled=1
+        gpgcheck=1
+        gpgkey=https://repo.saltstack.com/yum/rhel$releasever/SALTSTACK-EL5-GPG-KEY.pub
+
+#. Run ``sudo yum clean expire-cache``
+
+#. Run ``sudo yum update``
+
+#. Install the salt-minion, salt-master, or other Salt components:
+
+   - ``yum install salt-master``
+   - ``yum install salt-minion``
+   - ``yum install salt-ssh``
+   - ``yum install salt-syndic``
+   - ``yum install salt-cloud``
+
+.. note::
+    EPEL support is not required when installing using the SaltStack repository
+    on Red Hat 6 and 7. EPEL must be enabled when installing on Red Hat 5.
+
 Installation from Repository
 ============================
 
-.. _installation-rhel-5:
-
-RHEL/CentOS 5
--------------
-
-Due to the removal of some of Salt's dependencies from EPEL5, we have created a
-repository on `Fedora COPR`_. Moving forward, this will be the official means
-of installing Salt on RHEL5-based systems. Information on how to enable this
-repository can be found here__.
-
-.. _`Fedora COPR`: https://copr.fedoraproject.org/
-.. __: https://copr.fedoraproject.org/coprs/saltstack/salt-el5/
-
 RHEL/CentOS 6 and 7, Scientific Linux, etc.
 -------------------------------------------
 
+.. warning::
+    Salt 2015.8 requires ``python-crypto`` 2.6.1 or higher, and ``python-tornado`` version
+    4.2.1 or higher. These packages are not currently available in EPEL for
+    Red Hat 5 and 6. You must install these dependencies from another location
+    or use the SaltStack repository documented above.
+
 Beginning with version 0.9.4, Salt has been available in `EPEL`_. It is
 installable using yum. Salt should work properly with all mainstream
 derivatives of RHEL, including CentOS, Scientific Linux, Oracle Linux and
@@ -34,6 +100,18 @@ installing salt on RHEL6.
 
 .. _`EPEL`: http://fedoraproject.org/wiki/EPEL
 
+.. _installation-rhel-5:
+
+RHEL/CentOS 5
+-------------
+
+Due to the removal of some of Salt's dependencies from EPEL5, we have created a
+repository on `Fedora COPR`_. Moving forward, this will be the official means
+of installing Salt on RHEL5-based systems. Information on how to enable this
+repository can be found here__.
+
+.. _`Fedora COPR`: https://copr.fedoraproject.org/
+.. __: https://copr.fedoraproject.org/coprs/saltstack/salt-el5/
 
 Enabling EPEL
 *************

doc/topics/releases/2015.8.0.rst

@@ -10,6 +10,17 @@ usual the release notes are not exhaustive and primarily include the most
 notable additions and improvements. Hundreds of bugs have been fixed and many
 modules have been substantially updated and added.
 
+New SaltStack Installation Repositories
+=======================================
+
+SaltStack now provides installation repositories for several platforms, with more to come.
+See the following links for instructions:
+
+- :ref:`Red Hat / CentOS 5, 6, 7 <installation-rhel-repo>`
+- :ref:`Debian 8 <installation-debian-repo>`
+- :ref:`Windows <windows-installer>`
+- FreeBSD
+
 Send Event on State Completion
 ==============================
 
@@ -47,7 +58,7 @@ performance.
 
 .. note::
 
-   Tornado is considered early-access in this release. The following known
+   Tornado is considered expiremental in this release. The following known
    issues were being investigated at the time of release:
      - TCP tests show
        performance degredation over time (:issue:`26051`)
@@ -197,6 +208,7 @@ Other Improvements
 - Add end time to master job cache for jobs (optional, off by default)
 - Tornado is now the default backend for http.request
 - Support pillarenv selection as it's done for saltenv
+- salt was updated to use python-crypto version 2.6.1, which removes the dependency on python-m2crypto.
 
 Deprecations
 ============
@@ -278,3 +290,4 @@ Major Bug Fixes
 - Improve process management in proxy minion (:issue:`12024`)
 - Proxy minion never comes up with message ' I am XXX and I am not supposed to
   start any proxies.' (:issue:`25908`)
+- Fixed an issue that caused an exception when using Salt mine from pillar (:issue:`11509`).