salt/doc
Colton Myers 2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
2015-09-17 10:54:33 -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 Update latest to 2015.8, 2015.5 is now previous 2015-09-14 16:32:22 -06:00
.scripts
.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 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 2015-09-01 17:09:35 -06:00
ref Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-09-17 10:54: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.5' into merge-forward-2015.8 2015-09-17 10:54:33 -06:00
conf.py Update latest to 2015.8, 2015.5 is now previous 2015-09-14 16:32:22 -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 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-09-17 10:54:33 -06:00
gen_gource
glossary.rst release notes updates 2015-09-14 14:52:14 -06:00
index.rst Add end-to-end walkthrough 2015-08-18 14:43:26 -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