Commit Graph

12 Commits

Author SHA1 Message Date
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
C. R. Oldham
63fafe961e Clarify the nature of auth and start events. 2015-04-24 12:46:32 -06:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Seth House
4d974d9676 Improved presence docs; added cross-references and localhost caveat
Closes #18436.
2015-02-28 19:22:38 -07:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
2015-02-18 11:33:10 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten
Easier than downloading an external script.
2015-02-12 17:24:22 -07: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
rallytime
91538d7ec1 Add information about salt-cloud events to master events doc 2014-11-21 15:57:59 -07:00
Seth House
0a55e39683 Added documentation for key events 2014-11-14 13:07:34 -05:00
Seth House
d80a5c4886 Added salt-cloud events to the event list 2014-06-13 23:23:55 -06:00
Seth House
59f2d07ffb Bunch of misc rST fixes 2014-05-14 12:02:55 -06:00
Seth House
d1c20e4496 Added intial docs for various events 2014-04-29 21:43:13 -06:00