Thomas S Hatch
ecacdcbe75
Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop
2015-03-09 11:07:14 -06:00
Erik Johnson
0aa1029f24
correction to grains example
2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3
finish changing variable name
...
a partial edit, renaming a variable for clarity, missed some cases.
2015-03-06 23:33:05 -08:00
Colton Myers
9e9a2eab90
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileserver/gitfs.py
salt/loader.py
2015-01-23 16:13:30 -07:00
Colton Myers
a067e6ceba
Fix the grains precedence documentation
...
Fixes #19611
2015-01-21 16:10:18 -07:00
Thomas Jackson
2fa6dad350
Comma cleanup
2014-12-12 11:39:55 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Sandra Kosmalla
2096f2cafd
fix syntax error in writing grains code snippet
2014-11-05 15:13:51 -07:00
Sandra Kosmalla
de5baa14a2
fix syntax error in writing grains code snippet
2014-11-05 11:33:14 +01:00
Alex Kelly
1a943480e9
Added some very basic information about actually writing grains in the
...
"writiing grains" section
2014-08-26 16:45:31 -04:00
Sylvain Bellemare
9f6ecc4874
Removed duplicate occurrences of the word "the"
2014-08-11 16:05:29 +02:00
rallytime
1612be139f
Added note about grain lowercase resolution
2014-06-13 16:03:38 -06:00
Erik Johnson
3ca776a167
Add reactor example for syncing custom types on initial highstate
2014-06-07 14:27:26 -05:00
Michael Lustfield
5eab3db366
minor doc touchups
2014-05-24 23:42:00 -05:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Seth House
c9f2830637
Added ref anchors for the various targeting types
2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6
Removed old, scattered glossary entries
2014-02-27 19:38:56 -07:00
Erik Johnson
ccc7665c42
Tweak docs for consistency and correctness
...
The grains example would traceback if the grain was not defined, so I
have replaced this example with a better one. Also made a few changes
for consistency in formatting, and made a couple terms into links to the
relevant documentation.
2014-02-23 10:19:10 -08:00
Erik Johnson
3e7f48dd2c
Clarify grains precedence
...
Resolves #8107 .
2013-11-03 13:31:01 -06:00
Mike Place
d583554143
Documentation clarification to make the explanation of /etc/salt/grains more specific.
2013-10-17 15:49:14 -06:00
Marc Liyanage
1dfdd943af
Small documentation tweak, started out by replacing "it's" with "its" and added some other minor changes.
2013-08-23 13:38:10 -07:00
Erik Johnson
177d4009a2
Cleanup docstrings in modjk state/module
...
Fixed spelling/grammar errors, improved formatting, and introduced links
to improve doc navigation.
2013-08-13 11:39:26 -05:00
Erik Johnson
cf365f77cd
Convert shell command examples to bash code-block
...
This commit modifes a number of files which have command-line examples
so that the code-block directive is used. This provides more
visually-appealing syntax highlighting.
More commits like this will follow, this commit is part of an overall
documentation audit that I am performing.
2013-08-10 21:55:51 -05:00
Jason Swindle
4c5da1347e
Updating Grains doc to show JINJA in Top file matching with grains.
2013-07-27 16:51:07 -05:00
Pedro Algarvio
d7cbf107ce
Link dict to the python documentation.
2013-07-23 18:07:58 +01:00
Erik Johnson
11b79f9bce
Document defining custom grains in /etc/salt/grains
2013-07-07 23:23:27 -05:00
Erik Johnson
88d7839cef
Replace 2nd-person wording
...
This commit re-does the updates from #5536 without using 2nd-person
pronouns.
2013-06-13 21:05:19 -05:00
Erik Johnson
b26bf3e4a8
Add examples of targeting nested grains
2013-06-13 20:28:11 -05:00
Pete Emerson
4273fd5831
Fix typo in grains.rst
2013-03-07 14:27:22 -08:00
Pete Emerson
88d25814d0
Listing grains and grain data
2013-03-07 13:32:46 -08:00
Erik Johnson
d4b120a003
Replace hard-coded links w/relative ":mod:" links
2013-02-03 14:54:04 -06:00
Erik Johnson
5def1dd54c
Updated docs for grains, modules, and states
...
Added links to module function documentation, as well as to
"file_roots", and mentioned the saltutil.sync_* functions. Will probably
do the same for returners and renderers soon. This should help people
navigate through the docs easier.
2012-12-18 23:29:36 -06:00
Seth House
4d35f129f6
Added glossary entry for grains
2012-10-11 00:22:01 -06:00
L.C. Rees
3315dad9e7
documentation updates
2012-05-22 22:43:12 -06:00
Vitaliy Fuks
2991ab39d6
Targetting->Grains did not actually document how to target minions based on grains data.
2012-05-06 14:46:08 -04:00
Gordon McAllister
72c2014767
War on typos
...
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Seth House
084f8a7259
Added and organized documents on ways of targeting minions
2012-02-25 01:15:57 -07:00
