valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24008 from davidjb/2014.7

Browse Source 
Correct reST formatting for states.cmd documentation
This commit is contained in:
Justin Findlay 2015-05-20 22:19:01 -06:00
commit 5bffd3045e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/states/cmd.py
View File

@ -132,9 +132,8 @@ it can also watch a git state for changes
- git: my-project
Should I use :mod:`cmd.run <salt.states.cmd.run>` or :mod:`cmd.wait
<salt.states.cmd.wait>`?
-------------------------------------------------------------------------------
Should I use :mod:`cmd.run <salt.states.cmd.run>` or :mod:`cmd.wait <salt.states.cmd.wait>`?
--------------------------------------------------------------------------------------------
These two states are often confused. The important thing to remember about them
is that :mod:`cmd.run <salt.states.cmd.run>` states are run each time the SLS
@ -159,7 +158,7 @@ executed when the state it is watching changes. Example:
- file: /usr/local/bin/postinstall.sh
How do I create an environment from a pillar map?
-------------------------------------------------------------------------------
-------------------------------------------------
The map that comes from a pillar cannot be directly consumed by the env option.
To use it one must convert it to a list. Example: