Colton Myers baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/modules/lxc.py salt/roster/clustershell.py		2015-06-03 13:47:08 -06:00
..
_ext	Fix custom Sphinx formatter for aliased functions	2015-03-29 01:08:26 +01:00
_incl	Create sls_filename_cant_contain_period.rst	2015-01-19 20:56:49 -08:00
_static	saltstack2 sphinx theme and build settings	2015-05-11 17:29:12 -06:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
.scripts	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
.tx	Update 'doc/.tx/config' - Build #213	2014-11-26 20:01:25 +00:00
cheatsheet	rooted config	2015-01-01 07:07:09 -06:00
man	Do not reference serializers from aggregation docs.	2015-05-28 20:04:20 -04:00
ref	Add comment attempting to explain the security shortcomings of salt-cp	2015-06-02 18:26:04 -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.5' into merge-forward-develop	2015-06-03 13:47:08 -06:00
conf.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
contents-1.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents-2.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -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	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
faq.rst	Deprecate Halite from the Salt docs	2015-05-05 16:01:35 -06:00
gen_gource
glossary.rst	Fixing more sphinx errors and warnings	2015-05-18 12:39:49 -04:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -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