Commit Graph

315 Commits

Author SHA1 Message Date
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
2016-04-11 11:33:08 -06:00
Erik Johnson
af24c82ab0 Add documentation on virtual module provider overrides to the module docs 2016-04-08 22:01:14 -05:00
Erik Johnson
e7fa21438c Add new doc pages to toctree 2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec Move the tables of virtual modules to individual documentation pages 2016-04-08 21:58:11 -05:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
2016-03-21 22:56:17 -05:00
Erik Johnson
978b6cb32f Add missing RST file for slsutil module 2016-03-03 21:40:36 -06:00
Jonathan Ballet
2465cf4ba5 Remove non-existing documentation
This removes warnings during the documentation compilation
2016-01-25 12:19:21 +01:00
Mike Place
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod
Add execution module for working in sls files
2016-01-22 10:25:16 -07:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
rallytime
3288ff104d Remove fsutils references from modules list
Fixes #22820
2016-01-19 14:41:02 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
rallytime
e7c5863468 Add esxi module and state to docs build
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
rallytime
3b7f5540ec Add vSphere module to doc ref module tree 2015-12-17 10:54:28 -07:00
Benjamin Drung
8edd2c1add Fix typos of dependency 2015-11-04 10:58:40 +01:00
C. R. Oldham
3712066fc9 More docs. 2015-10-19 13:19:20 -06:00
C. R. Oldham
4ce2f8bb11 Documentation. 2015-10-16 16:52:14 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
2015-10-07 12:06:12 -06:00
Justin Findlay
03400ef45b fix virtual fcn return doc indentation
Fixes #27724.
2015-10-07 11:49:16 -06:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546 update __virtual__ return documentation
Related to #26755; fixes #27116; implements part of #27643.
2015-10-06 13:47:31 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-17 13:53:22 -06:00
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
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
2015-09-14 14:39:03 -06:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
06ac3bed42 Fixed typo 2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
Refs #21214
2015-08-31 13:51:31 -06:00
Jeremy Rosenbaum
763ee20713 documentation for zip archive modules 2015-08-26 12:18:57 -06:00
Erik Johnson
56fc78de80 Hide aliased funcs from docs 2015-08-17 17:29:13 -05:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
Mike Place
fbea069319 Remove duplicate func doc
Closes #23613
2015-06-25 15:48:44 -06:00
Jacob Hammons
f3f34ddff6 2015.5.2 release changes
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes
Refs #24309
2015-06-04 16:42:47 -06:00