saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24598 from jacobhammons/doc-fixes

Browse source 
2015.5.2 release changes
This commit is contained in:
Thomas S Hatch 2015-06-11 11:24:11 -06:00
commit e0bb177823
9 changed files with 69 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
doc/_themes/saltstack2/layout.html vendored
View file

@ -21,13 +21,13 @@
{% set script_files = [
'_static/js/webhelp.min.js',
'_static/js/webhelp.min_v1.1.js',
'_static/js/bootstrap.min.js',
] %}
{% set css_files = [
'_static/css/core.min.css',
'_static/css/webhelp.min.css',
'_static/css/webhelp.min_v1.1.css',
'_static/css/pygments.css',
'_static/css/basic.css',
'_static/css/main.css',
@ -94,7 +94,7 @@
{{ css() }}
<!--[if lt IE 9]>
<script src="{{ pathto('_static/js/respond.min.js', 1) }}">
<script src="{{ pathto('_static/js/respond.min.js', 1) }}"></script>
<![endif]-->
{%- if not embedded %}
@ -154,16 +154,11 @@
<div id="wrapper">
<div id="sidebar-wrapper">
<div id="sidebar-static">
<a class="ss-logo" href="http://saltstack.com"><img width="350px" class="nolightbox" src="{{ pathto('_static/images/saltstack_logo.png', 1) }}"></a>
{% if on_saltstack %}
<div class="versions">
<a id="latest" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the latest stable release" href="/en/latest/">{{ latest_release }} </a> {% if build_type == "latest" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="previous" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Docs for the previous stable release" href="/en/{{ previous_release_dir }}/">{{ previous_release }} </a> {% if build_type == "previous" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="develop" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Recent doc build from the develop branch" href="/en/develop/">Develop </a> {% if build_type == "develop" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %}
</div>
<a href="http://saltstack.com/saltstack-enterprise-4-0-now-with-gui/" target="_blank"><img class="nolightbox nav-banner center" width="275px" src="{{ pathto('_static/images/sse-4-gui.png', 1) }}"/></a>
{% else %}
<a class="ss-logo" href="http://saltstack.com"><img width="163px" class="nolightbox" src="{{ pathto('_static/images/saltstack_logo.svg', 1) }}"></a>
{% endif %}
<div class="text-nowrap">
<!--social icons from http://vervex.deviantart.com/art/Somacro-45-300DPI-Social-Media-Icons-267955425-->
<ul id="social-links" class="list-inline">
@ -179,6 +174,14 @@
</ul>
</div>
{% if on_saltstack %}
<div class="versions {{ build_type }}">
<a id="previous"{% if build_type == "previous" %} class="selected-version" 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 }} </a> {% if build_type == "previous" %}<i class="glyphicon glyphicon-ok"></i>{%- endif %} |
<a id="latest"{% if build_type == "latest" %} class="selected-version" 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 }} </a> {% if build_type == "latest" %}<i class="glyphicon glyphicon-ok"></i>{% endif %} |
<a id="develop"{% if build_type == "develop" %} class="selected-version" title="View all release notes"{% endif %} title="Switch to docs built recently from the develop branch" data-container="body" data-toggle="tooltip" data-placement="bottom" href="/en/develop/">Develop </a> {% if build_type == "develop" %}<i class="glyphicon glyphicon-ok"></i>{% endif %}
</div>
{% else %}
<div class="versions">
<p>Version {{ version }}</p>
@ -222,7 +225,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{% if on_saltstack %}
<a class="ss-logo" href="http://saltstack.com"><img width="163px" class="nolightbox" src="{{ pathto('_static/images/saltstack_logo.svg', 1) }}"></a>
{% endif %}
<ul id="header-nav" class="nav navbar-nav">
{%- block relbar_small %}{{ relbar() }}{% endblock %}

7
doc/_themes/saltstack2/static/css/webhelp.min.css → doc/_themes/saltstack2/static/css/webhelp.min_v1.1.css vendored
View file

@ -247,3 +247,10 @@ dl.function {
line-height: 1.3;
font-weight: 300;
}
img.logo {
margin-top: -10px;
}
img.nav-banner {
margin-top: 5px;
}

27
doc/_themes/saltstack2/static/images/saltstack_logo.svg vendored Normal file
View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 257.5 65" enable-background="new 0 0 257.5 65" xml:space="preserve">
<g>
<path d="M162.6,29.3c-4.2-1-4.7-1.7-4.7-2.9c0-1.2,1.2-2,3-2c1.8,0,3.6,0.7,5.5,2.1l0.4,0.3l2.6-3.6l-0.4-0.3c-2.3-1.9-5-2.8-8-2.8
c-4.6,0-7.8,2.8-7.8,6.8c0,4.2,2.7,5.7,7.5,6.9c4.1,1,4.4,1.7,4.4,2.8c0,1.3-1.3,2.2-3.3,2.2c-2.3,0-4.3-0.8-6.4-2.6l-0.4-0.3
l-2.9,3.4l0.4,0.3c2.6,2.3,5.8,3.5,9.2,3.5c4.9,0,8.1-2.7,8.1-6.9C169.8,31.7,166.4,30.2,162.6,29.3z"/>
<polygon points="189.6,20.3 171.3,20.3 171.3,24.8 178.1,24.8 178.1,42.7 182.8,42.7 182.8,24.8 189.6,24.8 "/>
<path d="M197.6,20.2l-9.8,22.5h4.9l2.2-5.1h6l1.6-4.2l4,9.4h5.1l-9.8-22.5H197.6z M196.7,33.2l2.9-6.8l2.9,6.8H196.7z"/>
<path d="M228.9,36c-1.7,1.6-3.3,2.6-5.8,2.6c-3.7,0-6.5-3-6.5-7.1c0-4,2.8-7,6.5-7c2,0,3.8,0.8,5.6,2.5l0.4,0.4l3.1-3.5l-0.3-0.3
c-1.8-1.7-4.2-3.5-8.7-3.5c-6.6,0-11.5,5-11.5,11.6c0,6.4,5,11.5,11.4,11.5c3.7,0,6.4-1.2,9-3.9l0.3-0.4l-3.1-3.1L228.9,36z"/>
<polygon points="245.9,30.1 255.3,20.3 249.3,20.3 239.8,30.3 239.8,20.3 235.1,20.3 235.1,42.7 239.8,42.7 239.8,36.2 242.6,33.3
249.7,42.7 255.5,42.7 "/>
<path d="M83.7,29.9c-5-1.1-5.4-2.2-5.4-3.7c0-1.7,1.7-2.9,4-2.9c2.1,0,4,0.7,5.8,2.2l0.4,0.3l2-2.7l-0.4-0.3
c-2.4-1.9-4.7-2.7-7.8-2.7c-4.3,0-7.5,2.7-7.5,6.4c0,4.2,3,5.7,7.6,6.6c4.8,1,5.1,2.2,5.1,3.6c0,1.9-1.7,3.1-4.3,3.1
c-2.7,0-4.7-0.8-7-2.9L76,36.6l-2.1,2.5l0.4,0.3c2.7,2.4,5.6,3.5,9.1,3.5c4.6,0,7.8-2.7,7.8-6.6C91,32.9,88.8,31,83.7,29.9z"/>
<path d="M102.6,20.2L92.4,42.7H96l2.5-5.6h8.6l1.1-2.9l3.8,8.5h3.7l-10.2-22.5H102.6z M99.9,33.9l4.1-9.2l4.1,9.2H99.9z"/>
<polygon points="122,20.3 118.6,20.3 118.6,42.7 134,42.7 134,39.4 122,39.4 "/>
<polygon points="132.9,23.6 140,23.6 140,42.7 143.5,42.7 143.5,23.6 150.6,23.6 150.6,20.3 132.9,20.3 "/>
</g>
<path fill="#010101" d="M63.9,12.2L48.6,3.3L37.7,9.6l-8.9-5L3.9,19v28.9l25,14.4l25-14.4V35.7l10-5.8V12.2z M59.6,13l-11,6.4
l-11-6.4l11-6.4L59.6,13z M31.5,19.8l1.8-1l0,2l-0.7-0.4l0,0L31.5,19.8z M36.1,15.5l11,6.4v12.7L42,31.5v-5.7l-5.9-3.4L36.1,15.5z
M42,34.8l4,2.4l-4,2.3V34.8z M28.9,7.5l6.3,3.5l-1.9,1.1l0,3.6l-6.9,3.9l3.4,2l8.4,4.9L28.9,32L7.7,19.8L28.9,7.5z M6.5,22
l21.2,12.2v24.4L6.5,46.4V22z M51.3,46.4L30.2,58.6V34.2l9.3-5.4V44l9.1-5.2l0,0l2.8-1.6V46.4z M50,34.6V21.9l11-6.4v12.8L50,34.6z"
/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
doc/_themes/saltstack2/static/images/sse-4-gui.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

14
doc/_themes/saltstack2/static/js/webhelp.min.js → doc/_themes/saltstack2/static/js/webhelp.min_v1.1.js vendored
View file

@ -158,6 +158,20 @@ $( document ).ready(function() {
$( '#wrapper' ).toggleClass( 'toggled' );
});
$( 'div.versions' ).on('click', 'a', function (e) {
e.preventDefault();
var clickedVer = $(this).attr("href");
var $currentVer = $( 'a.selected-version' );
if (window.location.href.indexOf(clickedVer) == -1) {
window.location.href = window.location.href.replace($currentVer.attr("href"), clickedVer);
}
else {
if ($currentVer.text().indexOf("develop") == -1) {
window.location.href = clickedVer + "topics/releases/" + $currentVer.text().trim() + ".html";
}
else window.location.href = clickedVer + "topics/releases/";
}
});
}); // $.document.ready
//refresh on window resize

4
doc/conf.py
View file

@ -155,7 +155,7 @@ project = 'Salt'
copyright = '2015 SaltStack, Inc.'
version = salt.version.__version__
latest_release = '2015.5.1' # latest release
latest_release = '2015.5.2' # latest release
previous_release = '2014.7.6' # latest release from previous branch
previous_release_dir = '2014.7' # path on web server for previous branch
build_type = 'latest' # latest, previous, develop
@ -217,7 +217,7 @@ rst_prolog = """\
.. _`salt-users`: https://groups.google.com/forum/#!forum/salt-users
.. _`salt-announce`: https://groups.google.com/forum/#!forum/salt-announce
.. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers
""".format(release=latest_release)
""".format(release=release)
# A shortcut for linking to tickets on the GitHub issue tracker
extlinks = {

1
doc/ref/modules/all/index.rst
View file

@ -92,7 +92,6 @@ Full list of builtin execution modules
freebsdpkg
freebsdports
freebsdservice
fsutils
gem
genesis
gentoo_service

6
doc/ref/modules/all/salt.modules.fsutils.rst
View file

@ -1,6 +0,0 @@
====================
salt.modules.fsutils
====================
.. automodule:: salt.modules.fsutils
:members:

2
doc/topics/releases/2015.5.2.rst
View file

@ -2,7 +2,7 @@
Salt 2015.5.2 Release Notes
===========================
:release: TBA
:release: 2015-06-10
Version 2015.5.2 is a bugfix release for :doc:`2015.5.0
</topics/releases/2015.5.0>`.