Colton Myers 36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: salt/client/ssh/wrapper/pillar.py		2015-05-19 15:23:37 -06:00
..
_ext	Disable the 'routing table' index from the httpdomain	2014-06-19 13:13:09 -06:00
_incl	Whitespace cleanup	2014-12-11 07:53:20 -08:00
_static	saltstack2 sphinx theme and build settings	2015-05-11 17:29:12 -06:00
_templates	Whitespace cleanup	2014-12-11 07:53:20 -08:00
_themes	saltstack2 sphinx theme updates	2015-05-17 20:39:24 -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	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
man	Update manpages to reflect 2015.2 rename to 2015.5	2015-05-06 11:13:13 -06:00
ref	saltstack2 sphinx theme and build settings	2015-05-11 17:29:12 -06:00
security	Whitespace cleanup	2014-12-11 07:53:20 -08:00
topics	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-05-19 15:23:37 -06:00
conf.py	changed previous release to 2014.7.6	2015-05-18 17:40:50 -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	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
faq.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
gen_gource
glossary.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Whitespace cleanup	2014-12-11 07:53:20 -08: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	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00