salt/doc
Kris Raney 0aa6334442 Merge branch 'develop' into kraney_bugfix
Conflicts:
	salt/pillar/__init__.py
2016-02-26 09:41:09 -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 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 Release notes updated 2016-02-16 19:54:49 -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 Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first 2016-02-25 10:17:39 -06:00
ref Merge branch 'develop' into kraney_bugfix 2016-02-26 09:41:09 -06:00
security Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
topics Merge pull request #31492 from m03/add-source_hash-to-win_pkg 2016-02-26 08:06:27 -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 Add script to gen the gource video to webm 2012-01-08 00:20:18 -07:00
glossary.rst release notes updates 2015-09-14 14:52:14 -06:00
index.rst Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07: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