Commit Graph

169 Commits

Author SHA1 Message Date
C. R. Oldham
2de9672e95 Doc updates 2015-08-14 11:52:19 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Petr Demin
a80c47ee10 Fixed typo in salt.states.saltmod.function doc string 2015-07-30 09:27:14 -06:00
Jacob Hammons
0e02191f61 regenerated man pages 2015-07-29 10:24:47 -06:00
Alexey Pakseykin
c33eb813ea Change docs for --static option with JSON - text B 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb Change docs for --static option with JSON - text A 2015-07-27 09:00:59 -06:00
Jacob Hammons
0a46dc4c40 Built man page for spm, added man page entry for spm to doc/conf.py
Refs #25213
2015-07-07 20:48:58 -06:00
Jacob Hammons
cf97a4ab17 Updated man pages 2015-06-26 12:21:26 -06:00
Jacob Hammons
30a907576c rebuilt man pages, versioned html theme css 2015-06-26 11:06:21 -06:00
Julien Barbot
6d7e779e62 Fix typo in salt-cloud reactor section 2015-06-24 16:40:32 +02:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257.
Move existing serializers from salt.utils.serializers to
salt.serializers.
2015-05-28 20:03:11 -04:00
Paul Theodoropoulos
f7f002daf5 Removed link to github page that no longer exists. 2015-05-13 17:27:44 -07:00
Markus "Shorty" Uckelmann
61eab1e156 How to still use existing $PATH in "cmd" modules
Enhances #21840

Added a code example on how to still use the existing $PATH environment
variables in cmd modules. The code was taken from a mail from Ethan
Erchinger to the salt-users list.
2015-05-12 12:00:03 +02:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Vladimir Pouzanov
921aaea9b4 Fixed a Runenr typo in the docs 2015-05-03 18:47:15 +01:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages"
This reverts commit 069a0cac71.
2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
2015-04-16 12:27:53 -06:00
Colton Myers
ccfcedbf6b Go back to the 2015.2 version of salt.7 2015-04-16 11:46:30 -06:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
Markus "Shorty" Uckelmann
1341784184 improve cmd.run env documentation
Resolves #21840

Improved documentation to cmd.run(et.al.) env argument by mentioning
that variables as values will not be evaluated.
2015-04-16 11:20:20 +02:00
Jacob Hammons
6e416fc300 Regenerated salt-call and salt.7 man pages Refs #22239 2015-04-14 13:56:31 -06:00
Luca Corti
3aa4b3bfe6 Add recursive database owner change to postgres module/state
Add recursive owner change to postgres.db_alter and expose it via
postgres_database.present parameter.

`owner_recurse` defaults to false to avoid breaking compatibility, but
could arguably be a sane default.
2015-04-05 09:31:53 +02: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
Jacob Hammons
7cb6c8fdcb Updated salt man page 2015-03-27 12:15:49 -06:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Jacob Hammons
921d679065 Regenerated and updated man pages, updated release version in conf.py to 2014.7.2 2015-03-10 09:22:57 -06:00
Jacob Hammons
767a3c378d Updated man pages, updated copyright year in conf.py 2015-03-09 18:36:38 -06:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Todd Wells
99114eeeeb cloud timeout doc updates 2015-01-16 12:37:28 -08:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Metin OSMAN
21a6f6f0e7 Add the ability to filter the map file with salt-cloud 2014-12-11 01:39:54 +01:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Stephen Wood
1be08146c8 Fix minor typos. 2014-10-11 17:03:38 -07:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop
Conflicts:
	salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
Seth House
978931c470 Added salt-unity manpages
Closes #13937
2014-09-13 12:56:25 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop
Conflicts:
	conf/minion
	salt/modules/mine.py
2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Joseph Hall
e90b55650e Merge pull request #15020 from Jille/typos
Fix two typos in docs
2014-08-15 08:21:13 -06:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Jille Timmermans
1618c8d257 Fix typo in manpage: s/inetrfaces/interfaces/ 2014-08-11 15:42:03 +02:00