Commit Graph

44 Commits

Author SHA1 Message Date
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
rallytime
be8f650901 Punctuation. 2015-11-02 19:30:58 -06:00
rallytime
fd846822c1 Add state_auto_order defaults to True note to ordering docs
Fixes #28243
2015-11-02 19:29:32 -06:00
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
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Jille Timmermans
a8e3586aa1 Some textual fixes 2014-09-11 14:45:44 +02:00
Colton Myers
426ebcbc4d More requisite doc cleanup 2014-06-05 16:24:59 -06:00
Seth House
86e0075fcf Updated tutorials, highstate, and PyDSL docs from term links to ref 2014-02-27 19:43:12 -07:00
Seth House
276d05b464 Added ref anchors for the ordering sections 2014-02-27 19:38:57 -07:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Thomas S Hatch
70f637d1a1 Clarify require document 2014-01-20 12:08:59 -07:00
Colton Myers
ca72744cc7 Add some additional docs for cmd.wait for the watch requisite 2013-11-21 14:33:52 -07:00
hvnsweeting
dd38ba8fc6 remove confusing example about order option
clarify that state with order option should not be require/required by other
2013-11-20 19:44:11 +07:00
Sylvestre Ledru
03f14de476 Fix more typos in the documentation 2013-11-19 17:22:56 +01:00
Sylvestre Ledru
b9a04bcc68 Consistency change in the documentation 2013-11-19 17:03:28 +01:00
Sylvestre Ledru
49de8e0aa9 Fix some minor typos 2013-11-19 16:57:51 +01:00
Thomas S Hatch
68b90aa00e Merge pull request #8097 from cmartyniuk/patch-1
Added information about sls type requisites
2013-10-25 09:20:40 -07:00
Thomas S Hatch
d6c970a9c8 Fix first person refs 2013-10-25 09:02:43 -06:00
cmartyniuk
6ef4b6bfcc Added information about sls type requisites 2013-10-25 09:18:38 -03:00
Mike Place
af376a7706 The documentation for state ordering contained duplicate information about 0.17 in two contiguous paragraphs. Removed the first of those occurrences to improve readability. 2013-10-02 15:19:41 -06:00
Henrik Holmboe
46fb3bcf28 Syntax of versionadded 2013-09-03 14:59:14 +02:00
Chris Rebert
d854574bf9 copyedit state ordering docs 2013-08-20 12:21:26 -07:00
Thomas S Hatch
e263e9a7b9 Add state_auto_order docs 2013-08-20 11:55:24 -06:00
Erik Johnson
5eef8217d6 Add notes on requisite matching 2013-02-13 21:34:21 -06:00
Jack Kuan
06484a2d8b Some random doc updates. 2012-11-24 02:07:53 -05:00
Thomas S Hatch
d76f051610 dd some more docs making the order to requitie relationship
a little more clear
2012-09-20 09:39:16 -06:00
Thomas S Hatch
53285798e0 The watcher function is called mod_watch now
and has been for some time...
2012-07-15 01:03:26 -06:00
Intchanter
588f93a5cd Made some language clearer. 2012-07-15 00:57:53 -06:00
Seth House
13acaab80a Revert "Revert "Merge pull request #1449 from elfixit/develop""
This reverts commit 6440faa4d0 but
restores the salt/states/service.py from last correct version.
2012-06-18 00:31:14 -07:00
Seth House
6440faa4d0 Revert "Merge pull request #1449 from elfixit/develop"
This reverts commit 31b093dd93, reversing
changes made to edf676a23e.

There was a mistake added that changed the salt/states/service.py file
to a binary type.

Conflicts:

	doc/ref/states/highstate.rst
	doc/ref/states/index.rst
	doc/ref/states/ordering.rst
2012-06-18 00:26:36 -07:00
Thomas S Hatch
51a8789bd2 Repair docs that violate the "double short dec" problem
This problem exists because these statements are not valid yaml. An
example is in the troubleshooting guide.
2012-06-18 00:09:38 -06:00
elfixit
3574518dec updated state docs to new style state syntax
updated the state docs to the new state syntax from:
http://salt.readthedocs.org/en/latest/topics/releases/0.9.9.html#state-syntax-update
2012-06-17 15:40:21 +02:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Gordon McAllister
72c2014767 War on typos
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Thomas S Hatch
a45ba616df write reffernce on requisites 2012-02-17 11:41:48 -07:00
Seth House
258a449be9 Merge branch 'doc-ordering' into develop 2012-02-12 04:15:01 -07:00
Seth House
a6da234826 Added note to State ordering doc about source order 2012-02-12 02:56:46 -07:00
Erik Johnson
088bdc26f5 spelling/grammar corrections 2012-02-01 14:09:25 -06:00
Seth House
c62e4f199c Fixed two rST syntax errors 2011-11-26 01:02:14 -07:00
Thomas S Hatch
df1c762d93 update ordering doc to handle last statement 2011-11-24 21:49:39 -07:00
Thomas S Hatch
1e520d8a04 Add ordering doc 2011-11-24 16:21:08 -07:00