rallytime
513058945c
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/states/requisites.rst
- doc/topics/cloud/profitbricks.rst
- doc/topics/cloud/vsphere.rst
- doc/topics/releases/0.9.8.rst
- doc/topics/releases/releasecandidate.rst
- salt/cloud/clouds/vsphere.py
- salt/minion.py
- salt/states/archive.py
- tests/unit/states/archive_test.py
2016-12-19 14:58:39 -07:00
rallytime
4aafa41d22
Remove ":doc:" references from a bunch of doc/* files
2016-12-15 16:09:27 -07:00
Erik Johnson
4cdc6cf5ec
Update earlier release channels' docs with Carbon release notes ( #37914 )
...
* Update reference to Carbon in vsphere docs
* Replace reference to Carbon in top file merging docs
* Include Carbon version number
* Replace references to Carbon with 2016.11.0
2016-11-28 10:33:31 -07:00
rallytime
c722a18468
Update Carbon versionadded tags to 2016.11.0 in doc/*
2016-10-27 15:26:30 -06:00
Erik Johnson
a56bf8bd2d
Update references to future default value change that was reverted ( #36924 )
2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c
Revert change in default value for top_file_merging_strategy ( #36922 )
...
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
2016-10-11 16:33:23 -06:00
Erik Johnson
f2f4482fa0
Update top file merging docs to reflect new strategy
2016-08-30 08:58:18 -05:00
Erik Johnson
e9e6ea8485
One more tweak to top file merging docs
...
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
2016-08-27 14:30:14 -05:00
Nicole Thomas
0ee237a9cb
Remove extra "to" in top.rst docs ( #35808 )
...
Refs #35774
2016-08-26 10:38:57 -06:00
Erik Johnson
2fc61763d8
Correct the top_file_merging_strategy documentation ( #35774 )
...
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.
These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
2016-08-26 10:25:56 -06:00
Erik Johnson
8722257b82
Improve top file merging documentation ( #34505 )
...
* Add top file config params to minion config file documentation
* Improve documentation on top file merging behavior
* Add recommendation on changing top_file_merging_strategy
* Improve the log message warning of multiple top files
2016-07-07 12:04:27 -04:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02:00
Jonathan Ballet
97e69ebb97
doc: fix state's top documentation typo
2015-09-25 12:16:48 -06:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6
add default_top description to docs
2015-08-26 01:44:33 -06:00
Seth House
4471c3f237
Add note about top-file only env assignment and the show_top() function
2015-08-11 11:29:33 -06:00
Seth House
5864111429
Minor spelling, style fixes
2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-11 11:28:40 -06:00
Forrest
552eb52c7b
Add details to first line.
...
We don't specify the top.sls in the first sentence which can be mildly confusing.
2015-05-11 12:24:15 -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
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
Chris Martin
d03a2bf753
Remove an awkward comma splice in the docs.
2014-11-10 20:02:02 -08:00
Seth House
c29f9205ad
Added ref anchors for the top file and environments
2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6
Removed old, scattered glossary entries
2014-02-27 19:38:56 -07:00
Elias Probst
e483404260
Corrected typos.
2013-10-22 19:38:31 +02:00
Thomas S Hatch
9268a344cc
Add note on environment option in the minion config file
2013-10-07 23:25:03 -06:00
Daniel Smith
d2a3bde793
Fixes typo
2013-09-30 12:31:05 -07:00
Colton Myers
374525f1f5
Update wording for top file compilation to avoid confusion
...
Ref #7285
The previous wording could make it sound like the base *environment* was
authoritative, rather than just the top file.
2013-09-17 14:32:07 -06:00
Erik Johnson
1a9f069bf0
Document how top files are compiled from different envs
2013-07-25 17:11:33 -05:00
Erik Johnson
7693cd3f6e
Fix typo in top.sls docs
...
The extra ':' here negates the code-block section. Removed it.
2013-07-13 22:30:18 -05:00
Joost Cassee
26edf918fb
Add documentation for shorthand syntax
2013-07-04 00:31:07 +02:00
Colton Myers
bad8ed6d28
Document that top files are combined from various environments
...
Ref #5440
2013-06-19 10:08:05 -06:00
Nicolas Kuttler
657878dcdc
Add missing colons
2012-12-20 16:51:30 +01:00
Seth House
1efeae5e6c
Misc rST fixes and minor text fixes
2012-10-11 00:11:06 -06:00
Seth House
2e0cfc1feb
Added a glossary entry for environments
2012-10-11 00:11:06 -06:00
Erik Johnson
0d08e4a137
Clarify match types in top.sls documentation
...
Examples of pillar, grain, grain_pcre, list, etc. are added.
2012-06-12 17:21:59 -05:00
L.C. Rees
3315dad9e7
documentation updates
2012-05-22 22:43:12 -06:00
vitaliyf
ba98b383f9
Minor documentation typo fix.
2012-04-07 11:15:09 -04:00
Thomas S Hatch
106f5d180d
Add match arguments to top file example
2012-04-03 09:38:01 -06:00
Jeff Schroeder
822170a99f
Fix a simple tyop I introduced in the docs
2012-04-02 22:19:30 -07:00
Jeff Schroeder
5591df2f20
Add a more complex top file example
2012-04-02 22:17:51 -07:00
Jeff Schroeder
4415963420
Add a blurb about nodegroups and compound stuff top.sls docs
...
More to come later
2012-04-02 22:17:34 -07:00
Gordon McAllister
72c2014767
War on typos
...
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
Erik Johnson
29ac92990f
fix syntax errors introduced in 0f776c13
2012-02-04 10:23:28 -06:00
Thomas S Hatch
0f776c13be
Add top file doc
2012-01-31 18:37:33 -07:00
