+
+
+
+
+
+
-
-
+
+
{% if "topics/releases" in pagename and "0" in pagename and not release in pagename and not "In Progress" in title %}
-
`
-
-The Salt Bootstrap project, found in the following repository, is a single
-shell script, which automates the install correctly on multiple platforms:
-
-* https://github.com/saltstack/salt-bootstrap
-
-Demo Environments
-=================
-You can download one of the following `Vagrant `_
-projects to quickly set up a Salt demo environment:
-
-- https://github.com/UtahDave/salt-vagrant-demo
-- https://github.com/UtahDave/salt-vagrant-lxc
-
-Example Formulas
-================
-A Github repo that contains a number of community-maintained formulas is
-available at https://github.com/saltstack-formulas. Contributions are welcome!
-
-A Github repo that contains formulas to install a number of Windows
-applications is available at https://github.com/saltstack/salt-winrepo-ng. Note
-that Salt makes this repo :ref:`available ` to your
-Windows minions, and contributions are welcome!
-
-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.
-
-https://groups.google.com/forum/#!forum/salt-users
-
-.. _`salt-users mailing list`: https://groups.google.com/forum/#!forum/salt-users
-
-There is also a low-traffic list used to announce new releases
-called `salt-announce`_
-
-https://groups.google.com/forum/#!forum/salt-announce
-
-.. _`salt-announce`: https://groups.google.com/forum/#!forum/salt-announce
-
-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.
-
-.. __: http://freenode.net/irc_servers.shtml
-.. __: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
-.. __: 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|
-
-Hack the Source
-===============
-If you want to get involved with the development of source code or the
-documentation efforts, please review the :ref:`Developing Salt Tutorial
-`.
-
diff --git a/doc/topics/releases/2016.3.0.rst b/doc/topics/releases/2016.3.0.rst
index 5a6098e4fcb1..fea6cea4ddd2 100644
--- a/doc/topics/releases/2016.3.0.rst
+++ b/doc/topics/releases/2016.3.0.rst
@@ -4,6 +4,13 @@
Salt 2016.3.0 Release Notes - Codename Boron
============================================
+Known Issues
+============
+
+- :issue:`33516`: When upgrading from 2015.8.10 to 2016.3.0 on centos7/redhat7
+ salt-minion must be restarted twice.
+- :issue:`33517`: SPM does not work on amazon linux 2015 in 2016.3.0.
+
Backwards-incompatible Changes
==============================
@@ -294,7 +301,7 @@ Windows DSC Integration (Experiemental)
Dimension Data Cloud Support
----------------------------
-A SaltStack Cloud driver for `Dimension Data Public Cloud`_, provides the driver functionality to service automation for any of the Dimension
+A SaltStack Cloud driver for `Dimension Data Public Cloud`_, provides the driver functionality to service automation for any of the Dimension
Data Public Cloud locations:
- Deploy new virtual machines
+
{% elif build_type == "develop" and on_saltstack %}
- These release notes are for an old release of Salt. This release might contain known security and other issues that are fixed in the latest release.
-
+
{% elif build_type == "inactive" and on_saltstack %}
- You are viewing docs from the develop branch, some of these features are not yet released.
-
+
{% endif %}
{% if build_type == "next" and on_saltstack %}
- You are viewing docs from a branch that is no longer active. You might want to view docs for the {{ latest_release }} release instead.
-
+
{% endif %}
{%- block document %}
@@ -239,11 +263,15 @@
You are previewing docs for the next major release, {{ next_release }}.
-
-  }})
+
{% if build_type=="next" %}
@@ -292,8 +320,8 @@
diff --git a/doc/_themes/saltstack2/static/css/webhelp.min_v1.4.4.css b/doc/_themes/saltstack2/static/css/webhelp.min_v1.4.5.css
similarity index 94%
rename from doc/_themes/saltstack2/static/css/webhelp.min_v1.4.4.css
rename to doc/_themes/saltstack2/static/css/webhelp.min_v1.4.5.css
index 2131813fc20f..ef9e43e07055 100644
--- a/doc/_themes/saltstack2/static/css/webhelp.min_v1.4.4.css
+++ b/doc/_themes/saltstack2/static/css/webhelp.min_v1.4.5.css
@@ -6,7 +6,6 @@ blockquote{font-size:15px}
button#dropdownMenu1{width:90%;padding:10px;margin:10px}
.panel-default>.panel-heading{background-color:#f8f8f2;border:1px solid #e3e3e3}
.well{background-color:#f5f5f5;border:1px solid #e3e3e3}
-.nav>li>a{position:relative;display:block;padding:0}
#guide-links a,#guide-title{text-transform:uppercase;font-weight:300}
#guide-title,.well-title{text-transform:uppercase;font-weight:300}
.body-content img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}
@@ -46,19 +45,19 @@ button#prev-button{float:left;margin:15px 0 0}
#search-form{padding:5px 5px 10px}
#wrapper{padding-left:0;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease}
#wrapper.toggled{padding-left:250px}
-#sidebar-wrapper{z-index:1000;position:fixed;top:0;right:260px;width:0;height:100%;margin-right:-250px;overflow-y:hidden;overflow-x:hidden;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease;background-color:#fff}
+#sidebar-wrapper{z-index:1000;position:fixed;top:0;right:260px;width:0;height:100%;margin-right:-250px;padding-top:60px;overflow-y:hidden;overflow-x:hidden;-webkit-transition:all .5s ease;-moz-transition:all .5s ease;-o-transition:all .5s ease;transition:all .5s ease;background-color:#fff}
#sidebar-nav{position:absolute;top:0;width:260px;font-size:14px}
#wrapper.toggled #sidebar-wrapper{width:260px}
#page-content-wrapper{width:95%;padding:15px;font-size:15px;line-height:1.7}
#wrapper.toggled #page-content-wrapper{position:absolute;margin-left:-250px}
-#dev-notification{position:fixed;top:0;left:0;width:100%;background-color:#fff;text-align:center;z-index:20}
-.alert.alert-warning.dev-notification-text{padding:0;margin-bottom:0;width:95%}
+/*#dev-notification{}*/
+.alert.alert-warning.dev-notification-text{position:fixed;bottom:0;left:0;width:100%;text-align:center;z-index:20;padding:0;margin-bottom:0;width:95%}
@media(min-width:768px) {
#wrapper{padding-right:260px}
#wrapper.toggled{padding-right:0}
#sidebar-wrapper{width:260px}
#wrapper.toggled #sidebar-wrapper{width:0}
- #page-content-wrapper{padding:20px 0 0}
+ #page-content-wrapper{padding:70px 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle{display:none!important}
.alert.alert-warning.dev-notification-text{width:65%}
@@ -69,7 +68,7 @@ button#prev-button{float:left;margin:15px 0 0}
#sidebar-wrapper{width:300px}
#sidebar-nav{width:300px}
#wrapper.toggled #sidebar-wrapper{width:0}
- #page-content-wrapper{padding:20px 0 0}
+ #page-content-wrapper{padding:70px 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle{display:none!important}
.footer-banner{width:90%}
@@ -81,7 +80,7 @@ button#prev-button{float:left;margin:15px 0 0}
#sidebar-wrapper{width:350px}
#sidebar-nav{width:300px}
#wrapper.toggled #sidebar-wrapper{width:0}
- #page-content-wrapper{padding:20px 0 0}
+ #page-content-wrapper{padding:70px 0 0}
#wrapper.toggled #page-content-wrapper{position:relative;margin-right:0}
#menu-toggle{display:none!important}
.alert.alert-warning.dev-notification-text{width:68%}
@@ -148,8 +147,6 @@ ul.nav.collapsed{margin-left:80px;font-size:14pt}
#expanded-nav li{padding:0 15px 0 0}
ul.nav.collapsed li{padding:0 0 15px 10px;margin:0}
#social-links{text-align:center;padding:15px 0}
-.navbar-default{background-color:#fff;border-color:#fff}
-.navbar-header{width:100%}
.open>.dropdown-menu{width:100%}
#lnav-title{font-weight:300;font-size:16pt;text-align:center}
pre{border-top-width:4px;padding-top:18px}
@@ -179,6 +176,48 @@ div.versions a,div.versions a:hover,div.versions a:active{color: #428bca}
.sidebar-banner{padding: 0 0 10px 0}
.sidebar-logo{display:block;margin: 10px auto 10px auto}
+
+.navbar-inverse .navbar-nav>li>a {
+ color: #9d9d9d;
+}
+
+@media (min-width: 768px)
+ .navbar-nav>li>a {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ }
+ .navbar-nav>li>a {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ line-height: 20px;
+ }
+ .nav>li>a {
+ position: relative;
+ display: block;
+ padding: 15px 15px;
+ font-weight: 300;
+ line-height: 20px;
+ font-size: 16px;
+ }
+
+ #localnav {
+ float: right;
+ }
+ #localnav li>a {
+ padding: 20px 15px 10px 20px;
+ float: right;
+ font-size: 14px;
+ }
+
+ .navbar-header img {
+ margin-top: 5px;
+ margin-right: 15px;
+ }
+
+ .navbar-nav {
+ float: right;
+ }
+
/*pygments*/
.highlight .hll { background-color: #ffffcc }
diff --git a/doc/_themes/saltstack2/static/images/saltstack.svg b/doc/_themes/saltstack2/static/images/saltstack.svg
new file mode 100644
index 000000000000..76f092cc8c7b
--- /dev/null
+++ b/doc/_themes/saltstack2/static/images/saltstack.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/doc/_themes/saltstack2/static/js/webhelp.min_v1.4.3.js b/doc/_themes/saltstack2/static/js/webhelp.min_v1.4.4.js
similarity index 75%
rename from doc/_themes/saltstack2/static/js/webhelp.min_v1.4.3.js
rename to doc/_themes/saltstack2/static/js/webhelp.min_v1.4.4.js
index bce8a622996b..96196efbeaf4 100644
--- a/doc/_themes/saltstack2/static/js/webhelp.min_v1.4.3.js
+++ b/doc/_themes/saltstack2/static/js/webhelp.min_v1.4.4.js
@@ -26,7 +26,8 @@ $( document ).ready(function() {
}
/*scroll the right-hand navigation*/
- var wheight = $( window ).height() - $( '#sidebar-static' ).height() - $( '#sidebar-static-bottom' ).height();
+ //var wheight = $( window ).height() - $( '#sidebar-static' ).height() - $( '#sidebar-static-bottom' ).height();
+ var wheight = $( window ).height() - 160;
$(function(){
$( '#sidebar-nav' ).slimScroll({
width: 'inherit',
@@ -38,16 +39,16 @@ $( document ).ready(function() {
var hash = window.location.hash.substring(1);
var $link = $( '#sidebar-nav').find('a[href$="#' + hash + '"]').addClass("selected");
if ($link.length) {
- var scrollTo_val = $link.offset().top - ($( '#sidebar-static' ).height() + 40) + 'px';
+ var scrollTo_val = $link.offset().top - ($( '#sidebar-static' ).height() + 200) + 'px';
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
else if ($( 'a.current' ).length) {
- var scrollTo_val = $( 'a.current' ).offset().top - ($( '#sidebar-static' ).height() + 40) + 'px';
+ var scrollTo_val = $( 'a.current' ).offset().top - ($( '#sidebar-static' ).height() + 200) + 'px';
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
}
else if ($( 'a.current' ).length) {
- var scrollTo_val = $( 'a.current' ).offset().top - ($( '#sidebar-static' ).height() + 40) + 'px';
+ var scrollTo_val = $( 'a.current' ).offset().top - ($( '#sidebar-static' ).height() + 200) + 'px';
$( '#sidebar-nav' ).slimScroll({ scrollTo : scrollTo_val });
}
/*hidden by css - make visible after slimScroll plug-in loads*/
@@ -73,7 +74,7 @@ $( document ).ready(function() {
var $target = $(target);
$('html, body').stop().animate({
- 'scrollTop': $target.offset().top
+ 'scrollTop': $target.offset().top + 200
}, 900, 'swing', function () {
window.location.hash = target;
});
@@ -88,7 +89,7 @@ $( document ).ready(function() {
var $target = $('dt[id="' + target + '"]');
$('html, body').stop().animate({
- 'scrollTop': $target.offset().top
+ 'scrollTop': $target.offset().top + 200
}, 900, 'swing', function () {
window.location.hash = target;
});
@@ -206,3 +207,70 @@ function getMetaStatus() {
}
}
}
+
+(function(document, history, location) {
+ var HISTORY_SUPPORT = !!(history && history.pushState);
+
+ var anchorScrolls = {
+ ANCHOR_REGEX: /^#[^ ]+$/,
+ OFFSET_HEIGHT_PX: 60,
+
+ /**
+ * Establish events, and fix initial scroll position if a hash is provided.
+ */
+ init: function() {
+ this.scrollIfAnchor(location.hash);
+ $('body').on('click', 'a', $.proxy(this, 'delegateAnchors'));
+ },
+
+ /**
+ * Return the offset amount to deduct from the normal scroll position.
+ * Modify as appropriate to allow for dynamic calculations
+ */
+ getFixedOffset: function() {
+ return this.OFFSET_HEIGHT_PX;
+ },
+
+ /**
+ * If the provided href is an anchor which resolves to an element on the
+ * page, scroll to it.
+ * @param {String} href
+ * @return {Boolean} - Was the href an anchor.
+ */
+ scrollIfAnchor: function(href, pushToHistory) {
+ var match, anchorOffset;
+
+ if(!this.ANCHOR_REGEX.test(href)) {
+ return false;
+ }
+
+ match = document.getElementById(href.slice(1));
+
+ if(match) {
+ anchorOffset = $(match).offset().top - this.getFixedOffset();
+ $('html, body').animate({ scrollTop: anchorOffset});
+
+ // Add the state to history as-per normal anchor links
+ if(HISTORY_SUPPORT && pushToHistory) {
+ history.pushState({}, document.title, location.pathname + href);
+ }
+ }
+
+ return !!match;
+ },
+
+ /**
+ * If the click event's target was an anchor, fix the scroll position.
+ */
+ delegateAnchors: function(e) {
+ var elem = e.target;
+
+ if(this.scrollIfAnchor(elem.getAttribute('href'), true)) {
+ e.preventDefault();
+ }
+ }
+ };
+
+ $(document).ready($.proxy(anchorScrolls, 'init'));
+})(window.document, window.history, window.location);
+
diff --git a/doc/apidoc-saltmods.sh b/doc/apidoc-saltmods.sh
index dd137b677e27..909be8498892 100755
--- a/doc/apidoc-saltmods.sh
+++ b/doc/apidoc-saltmods.sh
@@ -18,6 +18,7 @@ returners
roster
runners
sdb
+thorium
serializers
states
tops
diff --git a/doc/conf.py b/doc/conf.py
index 20ed55c97a48..5c53c447b36f 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -195,18 +195,16 @@ def inner(fn, *iargs, **ikwargs):
copyright = '2016 SaltStack, Inc.'
version = salt.version.__version__
-latest_release = '2015.8.10' # latest release
-previous_release = '2015.5.10' # latest release from previous branch
-previous_release_dir = '2015.5' # path on web server for previous branch
-next_release = '2016.3.0' # latest release from previous branch
-next_release_dir = '2016.3' # path on web server for previous branch
-build_type = 'next' # latest, previous, develop, next
-
-# set release to 'version' for develop so sha is used
-# - otherwise -
-# set release to 'latest_release' or 'previous_release'
-
+latest_release = '2016.3.0' # latest release
+previous_release = '2015.8.10' # latest release from previous branch
+previous_release_dir = '2015.8' # path on web server for previous branch
+next_release = '' # next release
+next_release_dir = '' # path on web server for next release branch
+
+# < --- START do not merge these settings to other branches START ---> #
+build_type = 'latest' # latest, previous, develop, next
release = latest_release # version, latest_release, previous_release
+# < --- END do not merge these settings to other branches END ---> #
# Set google custom search engine
@@ -216,6 +214,8 @@ def inner(fn, *iargs, **ikwargs):
search_cx = '004624818632696854117:thhslradbru' # 2014.7
elif release.startswith('2015.5'):
search_cx = '004624818632696854117:ovogwef29do' # 2015.5
+elif release.startswith('2015.8'):
+ search_cx = '004624818632696854117:aw_tegffouy' # 2015.8
else:
search_cx = '004624818632696854117:haj7bjntf4s' # develop
@@ -263,11 +263,11 @@ def inner(fn, *iargs, **ikwargs):
.. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers
.. |windownload| raw:: html
-
+
{% if build_type=="next" %}
@@ -292,8 +320,8 @@
x86: Salt-Minion-{release}-2-x86-Setup.exe - | md5
+x86: Salt-Minion-{release}-x86-Setup.exe + | md5
-AMD64: Salt-Minion-{release}-2-AMD64-Setup.exe - | md5
+AMD64: Salt-Minion-{release}-AMD64-Setup.exe + | md5
""".format(release=release) diff --git a/doc/contents.rst b/doc/contents.rst index de8ebe0a9a67..a10ddc5b7fb6 100644 --- a/doc/contents.rst +++ b/doc/contents.rst @@ -5,7 +5,6 @@ Salt Table of Contents .. toctree:: :maxdepth: 2 - index topics/installation/index topics/configuration/index topics/using_salt diff --git a/doc/index.rst b/doc/index.rst deleted file mode 100644 index a1c320b534fe..000000000000 --- a/doc/index.rst +++ /dev/null @@ -1,114 +0,0 @@ -.. _get-started: - -========= -SaltStack -========= -Salt, a new approach to infrastructure management, is easy enough to get -running in minutes, scalable enough to manage tens of thousands of servers, -and fast enough to communicate with those servers in *seconds*. - -Salt delivers a dynamic communication bus for infrastructures that can be used -for orchestration, remote execution, configuration management and much more. - -.. toctree:: - :maxdepth: 1 - - topics/index - -Get Started -=========== -The Get Started Guide shows you how to: - -* Install and configure SaltStack -* Remotely execute commands across all managed systems -* Design, develop, and deploy system configurations - -.. toctree:: - :maxdepth: 1 - - Get Started Guide