Colton Myers 17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/eauth/access_control.rst salt/modules/state.py salt/state.py salt/states/boto_secgroup.py tests/unit/modules/state_test.py		2016-01-07 16:36:40 -07:00
..
_ext	Fix custom Sphinx formatter for aliased functions	2015-03-29 01:08:26 +01:00
_incl	Fix formatting	2015-08-21 10:19:36 -05:00
_static	updated spm docs	2015-12-28 14:29:02 -07:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Updated doc site banners	2016-01-06 15:19:21 -07:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Fixing typo	2015-12-09 16:48:14 -05:00
ref	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-07 16:36:40 -07:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-07 16:36:40 -07:00
apidoc-saltmods.sh	Add script to run sphinx-apidoc against our module directories	2015-09-17 14:22:12 -06:00
conf.py	updated version numbers in documentation	2015-12-03 09:21:48 -07:00
contents-1.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents-2.rst	Add end-to-end walkthrough	2015-08-18 14:43:26 -06:00
contents-3.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents-4.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00
faq.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-20 18:13:11 -06:00
gen_gource
glossary.rst	release notes updates	2015-09-14 14:52:14 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-07 16:36:40 -07:00
Makefile	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-21 10:33:39 -06:00
spelling_wordlist.txt	Change Github to GitHub	2015-02-15 15:19:54 +01:00