Colton Myers c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/client/mixins.py salt/daemons/flo/__init__.py		2015-01-26 19:44:59 -07:00
..
_ext	Disable the 'routing table' index from the httpdomain	2014-06-19 13:13:09 -06:00
_incl	Create sls_filename_cant_contain_period.rst	2015-01-19 20:56:49 -08:00
_static	Removed redundant docs files with Salt-core docs	2014-06-18 20:02:16 -06:00
_templates	Whitespace cleanup	2014-12-11 07:53:20 -08:00
_themes/saltstack	Merge branch '2014.7' into mergeforward	2014-10-30 17:42:36 -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	cloud timeout doc updates	2015-01-16 12:37:28 -08:00
ref	Merge pull request #20039 from bechtoldt/doc_various_fixes	2015-01-26 12:15:38 -07:00
security	Whitespace cleanup	2014-12-11 07:53:20 -08:00
topics	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-26 19:44:59 -07:00
conf.py	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-22 16:53:22 -07:00
contents-1.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
contents-2.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
contents-3.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
contents-4.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
contents.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
faq.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
gen_gource	Add script to gen the gource video to webm	2012-01-08 00:20:18 -07:00
glossary.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	rooted config	2015-01-01 07:07:09 -06:00
Makefile	makefile update at Wed Nov 26 16:21:18 CST 2014	2014-11-26 16:21:18 -06:00
spelling_wordlist.txt	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00