rallytime cded9ac01d Merge branch '2015.8' into 'develop' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/freebsdpkg.py - salt/modules/virtualenv_mod.py - salt/states/boto_asg.py - tests/integration/__init__.py - tests/runtests.py		2015-11-06 09:34:31 -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	Fix typo in some draw object labels	2015-08-28 12:49:16 -06:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Updated saltstack2 theme to add SaltConf16 banner	2015-10-06 17:51:30 -06:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx	Update 'doc/.tx/config' - Build #213	2014-11-26 20:01:25 +00:00
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Merge branch '2015.8' into 'develop'	2015-11-06 09:34:31 -07:00
ref	Merge branch '2015.8' into 'develop'	2015-11-06 09:34:31 -07:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge branch '2015.8' into 'develop'	2015-11-06 09:34:31 -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	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-20 18:13:11 -06: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	2015-10-07 13:14:28 -06: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