Commit Graph

368 Commits

Author SHA1 Message Date
Seth House
ef3893d4de Updated module index pages for each of the module types 2015-04-03 12:39:13 -06:00
Joseph Hall
ba3f6bc32c Merge pull request #22258 from nmadhok/vmware-cloud-driver
Creating vmware cloud driver
2015-04-02 07:31:50 -06:00
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Clint Armstrong
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05:00
Clint Armstrong
12fa6950fc added state docs 2015-03-26 13:24:07 -04:00
Clint Armstrong
b17eb94168 added state docs 2015-03-26 13:24:03 -04:00
John Syrinek
6558d9e6d7 Fix unless example
The second `unless` example failed to compile
2015-03-24 14:02:27 -05:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01:00
Seth House
714921a5dc Added autosummary placeholders for new models 2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f Added new modules to the module indexes 2015-03-02 22:13:42 -07:00
Ryan Lane
1bc840a3a9 Add missing boto docs 2015-02-25 12:50:44 -08:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +01:00
Thomas S Hatch
dca509eb0d Merge pull request #19859 from twellspring/develop
Documentation fix for Issue 19513.
2015-01-20 16:06:03 -07:00
twellspring
e62e36dd57 Update include.rst 2015-01-19 21:02:26 -08:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08: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
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -05:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Seth House
54d8760d2d Added docs for the state-level aggregate keyword
Also added clarification on the two ways to invoke the aggregation
function.
2014-12-02 18:33:10 -05:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
2014-12-01 23:07:39 +00:00
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Mike Place
988b8e621d Update docs for unless
Note that unless is run for each associate state dec.
2014-11-26 09:17:14 -07:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation
Ref #12483
2014-11-24 14:33:37 -07:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
2014-10-25 08:54:42 -06:00
Thomas S Hatch
cb14a8660e fix docs for mod_aggregate per #16575 2014-10-21 16:37:34 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
2014-10-13 15:03:33 -06:00
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs
This fixes some grammar weirdness.
2014-10-10 22:25:55 -05:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Colton Myers
000b391f2f State Module, not State Declaration 2014-10-07 19:25:44 -06:00
Jeremy Rosenbaum
4668480dff fixes inconsistent bar/baz variable name in state module example 2014-10-01 21:53:45 -07:00
Thomas S Hatch
3f82e3664a Merge branch '2014.7' into develop 2014-09-23 14:41:58 -06:00
rallytime
872b312770 Clarify unless and onlyif docs 2014-09-22 16:03:04 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
2014-09-22 14:22:54 -06:00
Wolodja Wentland
3925df10d3 Fix indentation errors and inconsistencies
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
2014-09-18 21:02:56 +02:00