salt/doc/topics/development
Colton Myers d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
..
conventions Remove overstate documentation 2015-06-12 13:00:08 -06:00
git Whitespace cleanup 2014-12-11 07:53:19 -08:00
raet Fixes for doc build errors 2015-05-27 11:40:31 -06:00
tests revise unit test documentation 2015-03-31 00:40:05 -06:00
architecture.rst fix typos 2015-05-14 01:23:20 +02:00
contributing.rst revise label and milestone documentation 2015-06-27 16:17:44 -06:00
deprecations.rst rework deprecation documentation for release names 2015-07-29 15:50:33 -06:00
dunder_dictionaries.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
external_pillars.rst Updates documentation for external_pillar - Fixes Bash Example 2015-07-14 14:26:00 -07:00
hacking.rst Refs #25063 2015-07-16 13:24:01 -06:00
index.rst Merge conflict and rebase. 2014-02-26 13:32:08 -07:00
labels.rst revise label and milestone documentation 2015-06-27 16:17:44 -06:00
logging.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
modular_systems.rst Remove overstate documentation 2015-06-12 13:00:08 -06:00
package_providers.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
reporting_bugs.rst Document the bug reporting procedure 2015-02-18 09:22:28 -07:00
salt_projects.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
topology.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
translating.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00