rallytime f6bfaede21 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/installation/index.rst - salt/master.py - salt/modules/mac_brew.py - salt/modules/pacman.py - salt/modules/solarisips.py - salt/returners/postgres_local_cache.py - salt/states/apache_module.py - salt/utils/minions.py - tests/unit/acl/client_test.py		2016-06-16 16:10:41 -06:00
..
_ext	Fix custom Sphinx formatter for aliased functions	2015-03-29 01:08:26 +01:00
_incl	Spelling correction. (#33406)	2016-05-20 13:15:08 -07:00
_static	Merge branch '2015.8' into '2016.3'	2016-03-10 13:13:35 -07:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Fixes doc refresh bug on chrome mobile.	2016-06-16 12:43:33 -06: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	Fixed spelling of "through"	2016-06-04 03:08:22 +00:00
ref	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06: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-06-16 16:10:41 -06:00
apidoc-saltmods.sh	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
conf.py	Updated latest release version	2016-06-15 13:22:06 -06:00
contents.rst	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
faq.rst	Merge branch '2015.8' into '2016.3'	2016-05-19 16:22:36 -06: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
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