rallytime 3e6445a9d6 Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/beacons/log.py - salt/client/ssh/__init__.py - salt/modules/cmdmod.py - salt/utils/win_functions.py - tests/integration/modules/test_cmdmod.py - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py		2018-08-08 13:31:57 -04:00
..
.scripts	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
_ext	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
_incl	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
_static	Add NAPALM logo	2017-05-04 09:09:08 +00:00
_templates
_themes	Update Saltstack Logo banner on docs.saltstack.com	2018-07-25 10:41:43 -04:00
cheatsheet
man	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
ref	Merge branch '2018.3' into jid	2018-08-05 15:16:41 -04:00
security
topics	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
apidoc-saltmods.sh	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
conf.py	Update release versions for the 2017.7 branch	2018-07-03 09:37:58 -04:00
contents.rst	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
faq.rst	Update docs to include references to new "sync" argument	2018-06-08 12:29:19 -05:00
favicon.ico	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
gen_gource	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
glossary.rst	Merge branch '2016.11' into 'develop'	2017-02-09 10:29:40 -07:00
Makefile	Do not require sphinx-build for cleaning docs	2017-05-23 17:14:11 +02:00
spelling_wordlist.txt	remove Stormpath module, states and docs	2017-08-14 16:03:00 -06:00