Commit Graph

27 Commits

Author SHA1 Message Date
jacobhammons
7e95127467 man pages updated (#33307)
sphinx build fixes
doc additions for new modules including thorium
2016-05-17 10:24:44 -06:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
rallytime
ca044dd201 Add grains modules to salt modindex
Fixes #28790
2016-02-02 13:35:49 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop'
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Jonathan Ballet
a329adfb21 Add missing salt.queues.* documentation 2016-01-25 12:19:21 +01:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename)
Keeping client_acl support
2015-10-23 11:59:40 +03:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
2015-03-30 15:10:17 -06:00
Seth House
c2af83ea3e Added sdb modules to the module index 2015-03-25 17:08:19 -04:00
Seth House
b001cb6534 Added engine modules to modules index in docs 2015-03-02 13:49:17 -07:00
Seth House
a26aef0d7d Added beacon module docs to the module index 2015-01-26 18:19:34 -07:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Erik Johnson
132bdb78ee Fix sphinx build error 2014-09-17 18:00:18 -05:00
Seth House
918f12a376 Added roster modules to the documentation 2014-06-30 14:01:48 -06:00
Seth House
ae413133f3 Added netapi modules to the module index 2014-06-18 23:04:45 -06:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
d7873621b1 Wrapping up sub-TOCs. 2014-02-26 13:32:33 -07:00
Mike Place
0593c3311d A minor clarity fix for documentation regarding the extension of Salt.
I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
2013-10-03 14:51:49 -06:00
Seth House
4d3012d9db Removed the "Python API" document in favor of the "Clients" doc
This change moves some docs into class docstrings and some into the
clients/index.rst document.

Fixes #6705
2013-08-15 16:00:02 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Seth House
a336f6c15f Added shortcuts to hyperlink downloads, source files, and issues 2011-09-25 01:23:16 -06:00
Thomas S Hatch
6fd4d4c9dc clean up spacing 2011-07-01 17:10:27 -06:00
Thomas S Hatch
74caa97327 Add extending salt page 2011-06-23 23:54:05 -06:00
Seth House
4df7ebd8dd Added placeholder docs for modules/returners/grains/renderers/states 2011-05-27 06:27:52 +08:00