valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,403 Commits 24 Branches 182 Tags 341 MiB
99f2c27399
Commit Graph

21 Commits

Author SHA1 Message Date
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace 
Conflicts:
	doc/topics/tutorials/states_pt2.rst
 2014-12-11 07:53:19 -08:00
Erik Johnson
cc43b3cf4d Fix double-colon and remove redundant section 
There is a section in part 2 that is already covered in-depth in part 1,
this commit removes it.
 2014-07-14 12:34:03 -05:00
Erik Johnson
a7a878fea0 Add sub-titles to other states tutorial pages 2014-03-13 21:02:33 -05:00
Seth House
86e0075fcf Updated tutorials, highstate, and PyDSL docs from term links to ref 2014-02-27 19:43:12 -07:00
Erik Johnson
9c63495e04 Formatting fixes 
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
 2013-08-11 22:17:47 -05:00
Erik Johnson
49839b72aa Add a 4th step to the states tutorial 
This adds a step showing how file roots can be used to "promote" states
from dev -> QA -> prod.
 2013-07-25 20:41:21 -05:00
yinchuan
ddc3423a16 correct the line reference [#5408][https://github.com/saltstack/salt/issues/5408] 2013-06-06 10:55:43 +08:00
hvnsweeting
73c12a2cf4 add require for service state in examples 2013-05-03 09:49:23 +07:00
Clint Savage
9a5d086bf3 more documentation cleanup 2012-08-03 00:23:39 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Christer Edwards
f227c335b6 formatting and clarification cleanup in docs 2012-02-27 21:19:29 -07:00
Seth House
e5ffaf193d Fixed a bone-headed typo; thanks for the report, Zheng Liu! 2011-12-21 08:15:35 -07:00
Seth House
e47b629d51 Fixed mismatched glossary entries/definitions in the highstates docs 2011-11-26 02:16:30 -07:00
Seth House
be3eabb0da Fixed bad `watch` example; added a note about name declarations 2011-11-16 14:41:44 -07:00
Seth House
7e5f8be530 Fixed and improved the States tutorials 
Got rid of the references to state.template and jumped straight into
state.highstate use and configuration.
 2011-11-16 09:23:33 -07:00
Seth House
67c62c270c Finished the States tutorials 
They still need quite a bit of polish.
 2011-10-30 19:43:18 -06:00
Seth House
8582075a55 Moved requires into include for module & states tutorials 2011-10-30 19:28:02 -06:00
Seth House
c019fa1291 wip: Split States tutorial into separate steps 2011-10-30 12:41:14 -06:00