Colton Myers 1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/__init__.py salt/modules/smartos_vmadm.py salt/utils/s3.py setup.py		2015-08-28 16:44:08 -06: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	doc site css fix for tiny fonts that appeared in code or pre tags in headings	2015-08-19 14:32:55 -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	rooted config	2015-01-01 07:07:09 -06:00
man	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-19 11:29:45 -06:00
ref	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-26 14:47:33 -06:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-28 16:44:08 -06:00
conf.py	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-26 14:47:33 -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	Add end-to-end walkthrough	2015-08-18 14:43:26 -06:00
faq.rst	Fix wording of windows minion restart in FAQ	2015-08-17 13:39:20 -05:00
gen_gource	Add script to gen the gource video to webm	2012-01-08 00:20:18 -07:00
glossary.rst	Remove overstate documentation	2015-06-12 13:00:08 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-21 16:48:48 -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