rallytime dd3e6f3f0a 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/states/pkgrepo.py		2018-05-15 12:29:29 -04:00
..
_ext	Fix docs build on Sphinx 1.7+	2018-05-03 13:31:34 -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	Merge branch '2016.11' into '2017.7'	2018-02-28 14:59:01 -05:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Merge branch '2017.7' into '2018.3'	2018-05-15 12:29:29 -04:00
ref	Merge pull request #47589 from Ch3LL/watch_any_doc	2018-05-10 18:05:59 -04:00
security
topics	Merge branch '2017.7' into '2018.3'	2018-05-15 12:29:29 -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	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
contents.rst	Slots documentation.	2018-01-11 14:05:58 +03:00
faq.rst	[DOC] Fix Jinja block in FAQ page	2018-04-08 12:19:48 +03: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