4668 Commits

Author	SHA1	Message	Date
Pedro Algarvio	7a796440c0	Merge remote-tracking branch 'upstream/2015.8' into develop	2015-07-10 11:16:48 +01:00
jacobhammons	cd405b440e	Merge pull request #25257 from notpeter/SourceDestCheck ... Document SourceDestCheck added in #25242.	2015-07-09 17:29:48 -06:00
C. R. Oldham	58ca83cda1	Merge pull request #25254 from rallytime/change_beryllium_refs ... Change versionadded/changed references from Beryllium to 2015.8.0	2015-07-09 15:01:15 -06:00
Colton Myers	3a7289a0cb	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/states/all/salt.states.aptpkg.rst doc/ref/states/all/salt.states.etcd_mod.rst doc/topics/releases/releasecandidate.rst salt/client/mixins.py salt/modules/win_pkg.py tests/unit/modules/boto_vpc_test.py	2015-07-08 16:24:58 -06:00
Peter Tripp	72323fcac9	Document SourceDestCheck added in #25242.	2015-07-08 12:31:36 -07:00
rallytime	1b7efa91e0	Remove references to Beryllium in relevant docs	2015-07-08 11:17:01 -06:00
Nitin Madhok	d6d62c1160	Changing the way links look on the index page	2015-07-08 02:54:52 -04:00
Jacob Hammons	0a46dc4c40	Built man page for spm, added man page entry for spm to doc/conf.py ... Refs #25213	2015-07-07 20:48:58 -06:00
Jacob Hammons	98d7867957	Built man page for spm, added man page entry for spm to doc/conf.py ... Refs #25213	2015-07-07 16:54:26 -06:00
rallytime	d0b61f3fc1	A couple of doc fixes for the http tutorial	2015-07-07 15:12:36 -06:00
Joseph Hall	d7f6f3a2a9	Should be FORMULA, not FORMULA.yml	2015-07-07 10:23:45 -06:00
Colton Myers	452880d4aa	Update releasecandidate docs	2015-07-07 09:24:57 -06:00
Justin Findlay	fbafd39a46	Merge pull request #25187 from UtahDave/fix_misspelling ... Doc fixes: Fix misspelling and remove extraneous double spaces	2015-07-06 19:07:04 -06:00
Nicole Thomas	4a406aca45	Merge pull request #25180 from rallytime/bp-25088 ... Back-port #25088 to 2015.5	2015-07-06 14:33:45 -06:00
David Boucha	65abb63003	remove some extraneous double spaces	2015-07-06 10:48:04 -06:00
David Boucha	c423b62aa5	fix misspelling	2015-07-06 10:46:18 -06:00
Tom Melendez	4078c8db25	added message recommending JSON file be used if the libcloud version is >= 0.17.0	2015-07-06 10:07:16 -06: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
Nicole Thomas	8df67e14f4	Merge pull request #25088 from supertom/develop ... Update	2015-07-06 09:02:20 -06:00
Mark Lee	acc13b657f	Fix typos in execution module docs	2015-07-05 18:04:06 -07:00
Colton Myers	24d51fb8f1	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/configuration/minion.rst salt/config.py salt/modules/sudo.py tests/integration/states/file.py	2015-07-02 09:46:36 -06:00
Justin Findlay	576f1b8493	Merge pull request #25008 from basepi/merge-forward-develop ... Merge forward from 2015.5 to develop	2015-07-01 19:04:59 -06:00
Justin Findlay	3187d5d5aa	add 2015.5.3 release notes	2015-07-01 13:43:30 -06:00
Mike Place	7c8d2a8656	Merge pull request #25089 from jfindlay/fix_sudo ... fix minion sudo	2015-07-01 09:53:16 -06:00
Tom Melendez	c8e7b8fb7e	added message recommending JSON file be used if the libcloud version is >= 0.17.0	2015-06-30 19:29:22 +00:00
Joseph Hall	1e4f7aa574	Add man page for spm, change pillar to .orig	2015-06-30 09:45:13 -06:00
Joseph Hall	393cbf2114	Document pillars and loader modules	2015-06-30 07:16:58 -06:00
lorengordon	40a0c132d4	Add download links for 2015.5.1-3 and 2015.5.2, Fixes #25057	2015-06-30 07:48:21 -04:00
Justin Findlay	44cb167744	adding sudo_user minion config docs	2015-06-30 03:10:56 -06:00
Colton Myers	99fc7ecb4b	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt.7 salt/cloud/__init__.py salt/fileclient.py salt/modules/file.py salt/modules/gpg.py	2015-06-29 16:49:40 -06:00
Thomas S Hatch	337a5fe4e9	Merge pull request #24980 from UtahDave/templatize_winrepo ... Templatize winrepo on the minion	2015-06-29 09:44:49 -07:00
Joseph Hall	64cdd85584	Merge pull request #25023 from pengyao/schedule_typo ... fixed a typo	2015-06-28 07:25:48 -06:00
pengyao	083f879afd	a typo	2015-06-28 20:27:49 +08:00
Justin Findlay	8575192cc4	revise label and milestone documentation	2015-06-27 16:17:44 -06:00
Arnold Bechtoldt	689ba5686b	add missing module documentation to references	2015-06-27 19:12:50 +02:00
jacobhammons	91a60e198e	Merge pull request #25003 from jacobhammons/man-pages ... Updated man pages	2015-06-26 13:13:41 -06:00
Jacob Hammons	cf97a4ab17	Updated man pages	2015-06-26 12:21:26 -06:00
Jacob Hammons	f88f344a28	sphinx html theme updates	2015-06-26 11:13:56 -06:00
Jacob Hammons	30a907576c	rebuilt man pages, versioned html theme css	2015-06-26 11:06:21 -06:00
David Boucha	99d2fd109a	update docs to reflect new win rep changes	2015-06-26 09:58:47 -06:00
Jacob Hammons	1587d56bf0	Fixed doc/index.rst	2015-06-26 08:44:14 -06:00
Jacob Hammons	8be40d9d40	sphinx html theme updates - additional fix, updated index file	2015-06-26 08:35:20 -06:00
Jacob Hammons	01e96bca11	sphinx html theme updates - color changes for warning on development branch	2015-06-26 08:23:58 -06:00
Nicole Thomas	a15f9f8b56	Merge pull request #24971 from rallytime/azure_min_ver ... Add minimum Python Azure SDK version to azure docs.	2015-06-25 17:18:22 -06:00
Colton Myers	f65e663353	Merge pull request #24937 from basepi/merge-forward-develop ... Merge forward from 2015.5 to develop	2015-06-25 16:03:47 -06:00
Mike Place	fbea069319	Remove duplicate func doc ... Closes #23613	2015-06-25 15:48:44 -06:00
rallytime	4ac8a9460a	Add minimum Python Azure SDK verion to azure docs.	2015-06-25 15:26:50 -06:00
Justin Findlay	152a9b2a12	fix some malformed doc links and anchors	2015-06-24 16:56:52 -06:00
Colton Myers	acb7c6f52b	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/network.py salt/utils/cloud.py salt/utils/job.py	2015-06-24 11:44:04 -06:00
Thomas S Hatch	d63006773d	Merge pull request #24916 from daodennis/patch-1 ... broken link, adding /en/latest	2015-06-24 10:39:17 -06:00