1294 Commits

Author	SHA1	Message	Date
Jacob Hammons	6e323b6dd3	Update latest to 2015.8, 2015.5 is now previous ... Assorted style and minor updates	2015-09-14 16:32:22 -06:00
rallytime	00fe6a225c	Fix minor doc typo in client api	2015-09-07 12:55:39 -06:00
Jacob Hammons	ac3bd47440	states/pkgrepo examples, suse installation updates ... Refs #26644 Refs #26638	2015-09-02 11:37:40 -06:00
Jacob Hammons	0ec036350d	Updates to salt-ssh and salt-key ... #24510	2015-08-31 20:00:30 -06:00
Jacob Hammons	499bd66378	Minor doc bug fixes ... Refs #26403 Refs #26432 Refs #26233 Refs #26264 Refs #26329	2015-08-19 11:31:26 -06:00
Colton Myers	32f5345d7d	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: conf/minion doc/conf.py salt/modules/file.py	2015-08-10 10:56:40 -06:00
Jacob Hammons	d220c83f77	master_finger configuration docs ... switch a script to use https:// instead of http:// Refs #25751	2015-08-06 20:23:22 -06:00
Justin Findlay	a83059ca01	fix test mode logic in state docs	2015-08-05 11:29:56 -06:00
Justin Findlay	0fd180e106	add test logic to state reult doc	2015-08-05 09:36:08 -06:00
Justin Findlay	7e121de907	Update minion.rst	2015-07-31 17:34:07 -06:00
Jacob Hammons	ac0a8ff711	Doc on using syndic with multimaster	2015-07-31 15:25:15 -06:00
Jacob Hammons	3f3db4bd8e	Additions for #24042	2015-07-30 15:43:21 -06:00
Jacob Hammons	db2129b199	Minor doc bug fixes ... Refs #24042 Refs #25650 Refs #21296 Refs #23788	2015-07-30 14:39:15 -06:00
Thomas S Hatch	29c66d85a4	Merge pull request #25740 from rallytime/bp-25722 ... Back-port #25722 to 2015.5	2015-07-27 10:08:40 -06:00
Alexey Pakseykin	c33eb813ea	Change docs for --static option with JSON - text B	2015-07-27 09:00:59 -06:00
Alexey Pakseykin	89dd2ec8fb	Change docs for --static option with JSON - text A	2015-07-27 09:00:59 -06:00
Mike Place	0dc28ad3e4	Return to str for master_type for 2015.5	2015-07-24 11:55:56 -06:00
Joseph Hall	725d1a40d0	Merge pull request #25519 from rallytime/backport_vmware ... Backport vmware driver to 2015.5 branch	2015-07-20 09:11:26 -06:00
David\ Beitey	bfc4f9fd85	Fix typo in extend declaration doco	2015-07-18 14:39:29 +10:00
rallytime	0f4f560b38	Backport vmware driver to 2015.5 branch	2015-07-17 10:53:42 -06:00
Jeff Quast	e947d8ec5a	docfix: "cache_jobs: False" => grains_cache: False" ... At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"	2015-07-16 09:24:07 -06:00
Jarpy	da9c0eb673	Typo in client_acl ref doc.	2015-07-14 08:54:32 -06:00
Jarpy	50e0baf270	Demonstrate per-minion client_acl. ... The client_acl system supports setting restrictions based on minion name. Update the Client ACL System reference page to reflect this.	2015-07-14 08:54:32 -06:00
Arnold Bechtoldt	8eb2ac1dbe	set correct indention in states/requisites.rst (docs), fixes #25281	2015-07-11 18:25:20 +02:00
rallytime	c0c2463b64	Partial backport of #25019 ... Only backport the new .rst files for states that exist in the 2015.5 branch Refs #25019	2015-07-06 09:28:43 -06:00
Justin Findlay	44cb167744	adding sudo_user minion config docs	2015-06-30 03:10:56 -06:00
C. R. Oldham	90c73ff446	References to documentation.	2015-06-23 11:40:06 -06:00
Michael Steed	f92a769d35	Remove doc references to obsolete minion opt	2015-06-17 15:29:50 -06:00
Jacob Hammons	c7cdd416a2	Doc bug fixes ... Refs #24547 Refs #24275 Refs #24375 Refs #24560 Refs #24163	2015-06-12 11:23:52 -06:00
Jacob Hammons	f3f34ddff6	2015.5.2 release changes ... Refs #24250 Refs #24457	2015-06-11 10:01:30 -06:00
Thomas S Hatch	20ada1f8a1	Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment ... 2015.5 dont pollute environment	2015-06-10 20:13:06 -06:00
Jacob Hammons	8df5d53bb8	Refs #24235	2015-06-10 09:45:03 -06:00
Joe Julian	9cb7015568	Mark keyword version adds	2015-06-09 12:50:24 -07:00
Joe Julian	76e2583265	Merge tls changes from develop	2015-06-09 12:48:36 -07:00
Thomas S Hatch	0d9e0c2b8c	Merge pull request #24468 from jacobhammons/doc-fixes ... Bug fixes and build errors	2015-06-08 09:25:40 -06:00
Alexander Schwartz	7d6b60c79d	change "path" to "name" for "file" operations ... Path is no supported parameter for any file operation (maybe it has been in the past)	2015-06-07 13:14:26 +02:00
Jacob Hammons	d45c4ed11f	Bug fixes and build errors ... Refs #23211 Refs #24268 Refs #24235 Refs #24193 Refs #24172 Refs #19901 Refs #19801	2015-06-05 17:32:35 -06:00
Jacob Hammons	1f7a13d6f9	Salt cloud doc updates, build errors and bug fixes ... Refs #24309	2015-06-04 16:42:47 -06:00
rallytime	d8daa9dcd7	Merge #24185 with a couple of fixes ... Refs #24185	2015-05-27 15:25:27 -06:00
Jacob Hammons	0689815d0e	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
Jacob Hammons	16d8a753ad	saltstack2 sphinx theme and build settings	2015-05-11 17:29:12 -06:00
Colton Myers	1fb84450f4	Merge pull request #23396 from basepi/merge-forward-2015.2 ... [2015.2] Merge forward from 2014.7 to 2015.2	2015-05-06 15:42:35 -06:00
Erik Johnson	4fea5ba477	Add missing RST file	2015-05-06 12:06:49 -05:00
Erik Johnson	d395565bf7	Update Lithium docstrings in 2015.2 branch	2015-05-06 09:27:40 -05:00
Colton Myers	fd09cdae6f	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/ssh/roster.rst salt/client/ssh/__init__.py salt/client/ssh/wrapper/__init__.py salt/config.py salt/modules/file.py salt/runners/lxc.py	2015-05-05 16:26:39 -06:00
Colton Myers	cb69cd07de	Match the master config template in the master config reference	2015-05-04 15:05:21 -06:00
Colton Myers	91dd9dcbdc	Add ssh_minion_opts to master config ref	2015-05-04 15:00:28 -06:00
Steve Weber	97513b060a	include module_dirs ... include module_dirs	2015-05-04 13:00:31 -04:00
Colton Myers	a18e017619	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/man/salt.1 doc/ref/cli/salt.rst	2015-04-24 10:07:48 -06:00
Justin	8486e17ab3	Added retry_dns to minion doc.	2015-04-23 15:33:59 -06:00