rallytime
7554d0f42d
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
...
Resolves #32037 .
2016-03-21 22:56:17 -05:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Jacob Hammons
a72dc15720
Assorted doc issues
...
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
2016-02-24 16:56:52 -07:00
David\ Beitey
f65397036f
Fix doc around Include/Exclude for states
2015-07-24 09:42:25 +10:00
David\ Beitey
9ad0ddc549
Allow parent relative includes in state files
...
This implements the solution to #25477 . Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.
This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html ),
which supported relative includes, excludes, and prefixed states. This
PR expands on existing tests for stateconf.
This also updates the documentation accordingly.
2015-07-21 16:32:38 +10:00
Drew Malone
fb0f1080dd
Quick note on usability of 'include' statement.
2015-05-20 10:46:03 -04:00
Nitin Madhok
9dc1e0b3ae
Fixing sphinx errors and warnings
2015-05-18 12:12:07 -04:00
twellspring
e62e36dd57
Update include.rst
2015-01-19 21:02:26 -08:00
Thomas Jackson
d12677156e
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas S Hatch
856eeb7746
Add docs for #5035
2013-05-16 17:51:50 -06:00
Thomas S Hatch
2affd3ee2a
Add extra include docs, fix #4274
2013-04-28 20:19:43 -06:00
Thomas S Hatch
ec1df1769d
Add exclude docs
2012-09-22 15:55:32 -06:00
