16 Commits

Author	SHA1	Message	Date
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
Mike Place	33bfdf3b0b	Remove debug from docs	2015-07-28 11:35:32 -06:00
Thomas S Hatch	1dcc05b049	Merge branch '2014.7' into develop ... Conflicts: salt/modules/yumpkg.py	2014-12-17 15:00:26 -07:00
rallytime	926c486587	Correct master_sign_key_name reference ... Fixes #19053	2014-12-17 11:32:23 -07:00
Thomas Jackson	c18e834be1	Fix trailing whitespace ... Conflicts: doc/topics/tutorials/states_pt2.rst	2014-12-11 07:53:19 -08:00
Thomas Jackson	9f7dac0674	Spelling fixes for docs	2014-10-28 08:12:27 -07:00
Ed Kern	3933cdb72a	pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst	2014-09-29 16:21:08 -06:00
Erik Johnson	36d59944d1	Fix sphinx build error	2014-09-17 18:00:18 -05:00
vs	f1a4b30020	add note that points to mulitmaster as an alternative setup	2014-07-15 03:42:21 -07:00
Volker Schwicking	d7b46395ff	headings increased	2014-07-14 17:32:16 +02:00
Volker Schwicking	0f984aaf26	rewording, re-formatting	2014-07-14 17:21:12 +02:00
Volker Schwicking	3da7bf5fc9	rewording	2014-07-10 17:27:31 +02:00
vs	79589a2b0c	added \n	2014-07-09 02:05:10 -07:00
Volker Schwicking	71d3ba021b	more formatting fixes	2014-07-02 19:25:01 +02:00
Volker Schwicking	2b30ab119b	add missing log messages	2014-07-02 18:29:09 +02:00
vs	e9796459fb	first draft of multimaster pki tutorial	2014-07-02 02:52:19 -07:00