Merge pull request #30920 from jacobhammons/release-notes

Versioned to 2015.8.5, added known issue #30300 to release notes

doc/conf.py

@@ -164,7 +164,7 @@ def __getattr__(cls, name):
 copyright = '2016 SaltStack, Inc.'
 
 version = salt.version.__version__
-latest_release = '2015.8.4'  # latest release
+latest_release = '2015.8.5'  # latest release
 previous_release = '2015.5.9'  # latest release from previous branch
 previous_release_dir = '2015.5'  # path on web server for previous branch
 build_type = 'latest'  # latest, previous, develop, inactive

doc/topics/releases/2015.8.4.rst

@@ -5,16 +5,18 @@ Salt 2015.8.4 Release Notes
 Known Issues
 ============
 
-.. important:: :issue:`30820`
+``in_`` requisites (:issue:`30820`)
+
+This issue affects all users targeting an explicit ``- name: <name>`` with a ``_in``
+requisite (such as ``watch_in`` or ``require_in``). If you are not using explicit ``-
+name: <name>`` arguments, are targeting with the state ID instead of the name,
+or are not using ``_in`` requisites, then you should be safe to upgrade to
+2015.8.4.
+
+We are working on a 2015.8.5 release to resolve this issue. It will be available as
+soon as possible.
 
-    This issue affects all users targeting an explicit ``- name: <name>`` with a ``_in``
-    requisite (such as ``watch_in`` or ``require_in``). If you are not using explicit ``-
-    name: <name>`` arguments, are targeting with the state ID instead of the name,
-    or are not using ``_in`` requisites, then you should be safe to upgrade to
-    2015.8.4.
 
-    We are working on a 2015.8.5 release to resolve this issue. It will be available as
-    soon as possible.
 
 Security Fix
 ============

doc/topics/releases/2015.8.5.rst

@@ -10,4 +10,33 @@ Salt 2015.8.5 Release Notes
 
 .. _`#30833`: https://github.com/saltstack/salt/pull/30833
 
+Known Issue in ``boto_*`` execution modules
+===========================================
+
+This release contains an issue that causes the ``boto_*`` execution modules to
+display a ``__salt__ not defined`` error (:issue:`30300`). This issue will be
+fixed in an upcoming release, but can be manually resolved by completing the
+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`_.
+
+   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
+   Salt master.
+
+3. Run the following command to sync these modules to all Salt minions:
+
+   .. code-block:: bash
+
+       salt '*' saltutil.sync_modules
+
+
+.. _`#30867`: https://github.com/saltstack/salt/pull/30867/files
+
 .. include:: 2015.8.4.rst