Commit Graph

27 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
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Erik Johnson
83063c8d68 Fix broken links and other sphinx errors 2014-03-17 17:17:18 -05:00
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -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
Mike Place
362931561d States index re-write for clarity. 2014-02-19 15:36:14 -07:00
Dan Garthwaite
1edaf7c345 states_run_on_minions_8389 2014-01-31 12:43:51 -05:00
Sylvestre Ledru
03f14de476 Fix more typos in the documentation 2013-11-19 17:22:56 +01:00
Pedro Algarvio
c86d35e580 Add documentation about explicit module reload on states. 2013-08-23 12:50:36 +01:00
Erik Johnson
a099d8df57 Update renderer docs
Remove reference to the python renderer being added in the future, as it
has been around for some time.
2013-04-07 00:51:19 -05:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05: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
David Boucha
3a5bb0407d Various Doc fixes.
Mainly small typo fixes and clarifying some language
2012-03-08 21:05:52 -07:00
Seth House
b19bea572e Added a bunch of examples to the highstates docs
Also wording and formatting fixes.
2012-02-12 02:34:17 -07:00
Seth House
c019fa1291 wip: Split States tutorial into separate steps 2011-10-30 12:41:14 -06:00
Seth House
a336f6c15f Added shortcuts to hyperlink downloads, source files, and issues 2011-09-25 01:23:16 -06:00
Thomas S Hatch
146aa6b463 Add doc on rendering system 2011-07-01 00:46:57 -06:00
Thomas S Hatch
50d714433d Add top file docs 2011-07-01 00:24:50 -06:00
Thomas S Hatch
abbeac3dc2 Initial state system docs 2011-06-30 22:57:18 -06:00