Thomas S Hatch 1638e58245 Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master ... Conflicts: doc/topics/cloud/aws.rst		2014-10-23 13:29:24 -06:00
..
_ext	Disable the 'routing table' index from the httpdomain	2014-06-19 13:13:09 -06:00
_incl	Fix broken links and other sphinx errors	2014-03-17 17:17:18 -05:00
_static	Removed redundant docs files with Salt-core docs	2014-06-18 20:02:16 -06:00
_templates	Swap out SaltConf15 sidebar image for one with better scaled fonts	2014-10-22 16:26:26 -06:00
_themes/saltstack	Swap out SaltConf15 sidebar image for one with better scaled fonts	2014-10-22 16:26:26 -06:00
.scripts	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
.tx	Update 'doc/.tx/config' - Build #166	2014-09-29 21:34:48 +01:00
cheatsheet	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
man	Fix minor typos.	2014-10-11 17:03:38 -07:00
ref	Merge branch '2014.7' into develop	2014-10-20 09:20:37 -06:00
security	Merge branch '2014.7' into develop	2014-09-22 14:22:54 -06:00
topics	Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master	2014-10-23 13:29:24 -06:00
conf.py	Update conf.py as well	2014-10-22 17:10:18 +02:00
contents.rst	Added security disclosure proceedure page	2014-07-03 20:32:52 -06:00
faq.rst	Fix weird merge forward in FAQ	2014-10-22 10:26:48 -05:00
gen_gource	Add script to gen the gource video to webm	2012-01-08 00:20:18 -07:00
glossary.rst	Update glossary.rst	2014-06-26 16:41:33 -06:00
index.rst	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
Makefile	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
spelling_wordlist.txt	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00