rallytime
|
494a06bee2
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/configuration/minion.rst
|
2016-12-20 10:03:44 -07:00 |
|
rallytime
|
8f80916432
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/configuration/master.rst
- doc/topics/cloud/index.rst
- salt/states/cron.py
|
2016-12-19 14:00:52 -07:00 |
|
Mike Place
|
c83db5a785
|
Merge pull request #38320 from rallytime/cleanup-doc-refs
Cleanup doc internal markup references
|
2016-12-18 05:31:27 -07:00 |
|
rallytime
|
02bfe7912c
|
Remove more ":doc:" references from doc/* files
|
2016-12-15 15:36:44 -07:00 |
|
rallytime
|
4a62d01577
|
Add docs for syndic_wait setting
Fixes #38174
|
2016-12-15 10:40:01 -07:00 |
|
Eric Radman
|
3f2e13d1fc
|
Remove repeated words in docs (#37871)
Found using
find . -name '*.rst' | xargs igor -R -r
|
2016-11-23 14:53:17 -07:00 |
|
Jacob Hammons
|
b192a9ba38
|
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
2016-01-31 20:10:02 -07:00 |
|
C. R. Oldham
|
2de9672e95
|
Doc updates
|
2015-08-14 11:52:19 -06:00 |
|
C. R. Oldham
|
e79a182108
|
More proxy minion updates
|
2015-08-08 14:42:57 -06:00 |
|
Jacob Hammons
|
ac0a8ff711
|
Doc on using syndic with multimaster
|
2015-07-31 15:25:15 -06:00 |
|
Justin Findlay
|
4795952847
|
rework syndic doc
|
2015-07-30 16:33:18 -06:00 |
|
Justin Findlay
|
a25d0eabef
|
update syndic doc to conform to style
|
2015-07-30 03:02:19 -06:00 |
|
Jacob Hammons
|
0689815d0e
|
Fixes for doc build errors
|
2015-05-27 11:40:31 -06:00 |
|
Colton Myers
|
2b1f400ab4
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
doc/topics/topology/syndic.rst
salt/client/__init__.py
salt/daemons/masterapi.py
salt/minion.py
salt/modules/dockerio.py
|
2015-03-19 16:03:29 -06:00 |
|
rallytime
|
f56cdd5489
|
Update syndic documentation
Add some docs about installing a minion on the syndic to help reduce the amount of time spent waiting for the CLI to return.
|
2015-03-18 16:05:07 -06:00 |
|
Thomas Jackson
|
d5d0a35297
|
Comma cleanup
|
2014-12-12 11:38:50 -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 |
|
Thomas Jackson
|
9f7dac0674
|
Spelling fixes for docs
|
2014-10-28 08:12:27 -07:00 |
|
Chris Rebert
|
177c168a21
|
Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
|
2014-08-11 10:46:43 -07:00 |
|
Erik Johnson
|
fa24e3c7fe
|
Fix paths in proxyminion example
Default pillar root is /srv/pillar, not /srv/salt/pillar.
|
2014-07-20 18:34:13 -05:00 |
|
Joseph Hall
|
b1c1d88d55
|
Remove docs which describe unintentional behavior
|
2014-05-23 13:29:46 -06:00 |
|
Joseph Hall
|
4ad99d822c
|
Rewrite syndic topology for clarification
|
2014-05-23 13:16:51 -06:00 |
|
Colton Myers
|
a7741e61a3
|
Clarify some syndic points
|
2014-05-23 10:15:59 -06:00 |
|
Michael Lustfield
|
290cc87163
|
Adjusted wording and point of view.
|
2014-05-23 08:29:01 -05:00 |
|
Michael Lustfield
|
bb91f7b428
|
Added more information about how salt-syndic works.
|
2014-05-22 23:20:31 -05:00 |
|
Seth House
|
373caf5b2e
|
Added ref anchor for syndic docs
|
2014-02-27 19:38:57 -07:00 |
|
Mike Place
|
826bad4cfb
|
Merge conflict and rebase.
Conflicts:
doc/ref/renderers/index.rst
|
2014-02-26 13:32:08 -07:00 |
|