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
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
6e323b6dd3
Update latest to 2015.8, 2015.5 is now previous
...
Assorted style and minor updates
2015-09-14 16:32:22 -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
Thomas Jackson
b8e39c13f9
Add docs for new raw boolean support of depends decorator
2015-03-05 22:02:34 -08:00
Thomas Jackson
e32a7e1ed7
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Mike Place
a5e1540f22
Provide a facility for modules to report the reasons they cannot be
...
loaded.
2014-10-02 15:43:10 -06:00
Thomas S Hatch
3ce955c774
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Erik Johnson
a4413bb27a
Improve formatting
...
Bullet points look better here than an indented section with an enormous
font.
2014-09-23 20:58:26 -05:00
loz-hurst
9031ea871a
Fix broken back ticks in 68301c4
2014-09-11 16:15:35 +01:00
loz-hurst
68301c4339
Updated module documentation for clarification
...
Added note to say that __salt__ is not available to __virtual__. Also added link to 'at.py' as an example, since it demonstrates using salt.utils in __virtual__ which the existing examples do not. Tweaked wording to make clear that not all the examples are package managers any more.
2014-09-10 14:35:40 +01:00
Seth House
64b8fb6a81
Added label to the docs for writing execution modules
2014-05-20 23:30:02 -06:00
Chris Rebert
7d1df94bb1
copyedit ref docs
2014-04-30 14:08:31 -07:00
Mike Place
2637fc689f
Docs build cleanly! Yay!
2014-02-26 13:32:33 -07:00
Mike Place
a485eceac9
Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301.
...
Conflicts:
doc/topics/installation/index.rst
2014-02-20 16:16:59 -07:00
Thomas S Hatch
553a4fe10f
Merge pull request #10598 from cachedout/2_19_docfix
...
2 19 docfix
2014-02-19 19:11:12 -07:00
Mike Place
7001c9dcc3
Big re-write of the modules reference. Standardized on 'execution module' as a term to avoid confusion. Cleaned up a lot of weasel-words and made the phrasing more declarative.
2014-02-19 12:51:53 -07:00
Mike Place
f12194c146
Change decorator example to setup logging. Closes #10584 .
2014-02-19 09:38:38 -07:00
Thomas S Hatch
6c144e003e
Log to trace instead of print, @pwaller per #9752
2014-01-16 10:49:41 -07:00
Peter Waller
054fccd3b7
Update index.rst
...
Fix a pet peeve of mine so that beginners don't repeat the mistake: silencing `ImportError` is evil since you don't know if it came because `dependency_that_sometimes_exists` is unavailable or the `dependency_that_sometimes_exists` tried to import something which was broken.
This can seriously hinder debugging.
2014-01-15 14:04:03 +00:00
Colton Myers
b43b0d5d09
Add more state vs module clarification
2014-01-07 16:55:28 -07:00
Joseph Hall
214843c53b
Clarify that execution modules and state modules are not the same thing
2014-01-06 19:57:01 -07:00
Jeffrey C. Ollie
b1fb52a680
fix more funcion => function typos
2013-11-15 14:50:17 -06:00
Erik Johnson
2b397ec24c
Docs formatting fixes
...
Format filenames in bullet points and use aliases instead of letting the
"blob" role show the full URL for the filenames.
2013-11-09 15:10:12 -06:00
loz-hurst
91d7b2a346
Added note about methods with trailing underscores to module docs.
...
Not fantastically impressed with what I've written and welcome for someone else to have a stab at it - trying to rectify that it's not clear from the docs ANYWHERE that, e.g., salt.states.alternatives.set_ must be specified as 'alternatives.set' or 'alternatives: - set' in the sls. 'alternatives.set_' or 'alternatives: - set_' will not work.
As a python coder it's obvious what's going on to avoid the name clash in the source but I wouldn't expect all salt users to be python programmers so it needs mentioning somewhere, imho.
2013-10-16 18:10:02 +01:00
Paul Brian (lifeisstillgood)
fe4559101e
Trivial doc spelling fix
...
It is trivial but it is my first commit / pull request so useful for
checking the process is correct. And it has a semicolon
2013-07-27 13:07:44 +01:00
Pedro Algarvio
bc28a6276b
Link to python's glossary.
2013-07-23 21:45:26 +01:00
Pedro Algarvio
0df4f2e8d0
Link to the actual python False constant.
2013-07-23 18:21:01 +01:00
Pedro Algarvio
947f99a007
Link to string and False in the python documentation.
2013-07-23 17:55:45 +01:00
Pedro Algarvio
b83a749d60
Link to the dict on python's typesmapping and point to a docstring explanation.
2013-07-23 17:20:50 +01:00
Erik Johnson
87d0c07eb2
Remove ref to salt/modules in module writing docs
...
A beginner is not going to know what this means, so don't muddy the
waters with this info. Besides, new modules should only go in
salt/modules once they are accepted into salt proper. Custom modules
should pretty much always go into _modules.
2013-07-18 12:26:39 -05:00
Erik Johnson
1b876fc53a
Clarify docs on custom types
2013-07-08 21:36:34 -05:00
Chris Rebert
bf03461f00
fix spelling: dependancy ==> dependency
2013-07-05 13:35:53 -07:00
Pedro Algarvio
ce76fd78a4
Quiet sphinx.
2013-06-26 18:29:40 +01:00
Thomas Jackson
f6cf1ee206
Adding docs for "depends" decorator
2013-06-14 17:19:53 -07:00
Gary Wilson Jr
bd499e5640
Fixed several minor misspellings and acronym capitalizations.
2013-03-18 16:42:57 -05:00
Thomas S Hatch
fff07a3fc0
Merge pull request #3768 from ydavid365/grains-state-doc
...
added grains state module to docs
2013-02-18 09:11:02 -08:00
ydavid365
bc756c69be
added grains state module to docs
2013-02-18 00:11:51 -08:00
ydavid365
18bec175ad
module sp
2013-02-17 23:26:28 -08:00
Erik Johnson
d14d859154
Minor tweaks to doc headings
...
Corrected odd grammar on the Modules doc page, and changed a similar
heading in the States docs to match the same wording.
2013-02-10 22:20:56 -06:00
