Gareth J. Greenaway 0f15796484 Merge branch '2018.3' into merge-2018.3 ... Conflicts: salt/utils/schedule.py		2018-11-26 11:43:51 -08:00
..
_ext	Don't import obsolete Directive class from Sphinx	2018-11-12 14:54:38 -06: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 docbanner hyperlink	2018-11-08 17:05:13 -05:00
.scripts	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
.tx
cheatsheet
man	Merge branch '2018.3' into 'fluorine'	2018-10-03 09:45:20 -04:00
ref	Merge branch 'fluorine' into win_pkg_min_repo	2018-11-17 01:45:50 +11:00
security
topics	Merge branch '2018.3' into merge-2018.3	2018-11-26 11:43:51 -08:00
apidoc-saltmods.sh
conf.py	Merge remote-tracking branch 'upstream/2018.3' into fluorine	2018-11-21 07:31:51 -06:00
contents.rst	Add return codes docs to TOC	2018-07-31 17:23:20 -05: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
glossary.rst	Touch up glossary references	2018-03-13 17:28:54 -05: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