rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/daemons.py - salt/config/__init__.py - salt/exceptions.py - salt/pillar/foreman.py - salt/returners/local_cache.py - salt/states/saltmod.py - salt/utils/__init__.py - salt/utils/cloud.py The merge conflicts in salt/cli/daemons.py are still present in this commit. @s0undt3ch is going to resolve them after this commit.		2016-03-08 10:14:32 -07: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	updated spm docs	2015-12-28 14:29:02 -07:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx	Merge pull request #30917 from rallytime/remove-botocore-aws-driver	2016-02-10 12:07:14 -07:00
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
ref	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
apidoc-saltmods.sh	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
conf.py	Merge branch '2015.8' into '2016.3'	2016-02-20 12:27:41 -07:00
contents.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
faq.rst	Merge branch '2015.8' into 'develop'	2016-01-14 13:33:53 -07:00
gen_gource	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
glossary.rst	Merge branch '2015.5' into '2015.8'	2016-03-06 10:59:46 -07:00
index.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
Makefile	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
spelling_wordlist.txt	Change Github to GitHub	2015-02-15 15:19:54 +01:00