Colton Myers ad89a752f8 Merge branch '2014.7' into develop ... Conflicts: salt/cloud/__init__.py salt/utils/cloud.py		2014-08-25 13:29:29 -06:00
..
cloud_controller.rst	rewrite some sentences	2014-07-10 11:28:18 +07:00
cron.rst	Docs formatting fixes	2013-08-24 23:19:54 -05:00
esky.rst	more copyediting	2014-04-30 13:55:48 -07:00
firewall.rst	Minor typo fix	2014-06-06 02:20:07 +00:00
gitfs.rst	Merge branch '2014.7' into develop	2014-08-25 13:29:29 -06:00
halite.rst	fix link scheme, default scheme is HTTPS, as used sample configs	2014-08-01 15:56:58 +07:00
http.rst	Typo correction	2014-08-14 14:31:25 -06:00
index.rst	Fix maxdepth TOC for Salt at Scale tutorials	2014-08-01 12:05:22 -06:00
intro_scale.rst	Fixing more sphinx warnings and errors	2014-08-11 12:33:55 -04:00
minionfs.rst	Removed the term "Hydrogen" from versionadded notation	2014-07-01 15:01:12 -06:00
modules.rst	Formatting fixes	2013-08-11 22:17:47 -05:00
multimaster_pki.rst	Add missing lines between the code block declaration and the body	2014-08-05 00:40:18 +01:00
multimaster.rst	add note that points to multimaster_pki as an alternative setup	2014-07-15 03:42:39 -07:00
pillar.rst	Add info about pillar refresh.	2014-08-25 10:56:55 -06:00
preseed_key.rst	Fix link to AWS credential distribution blog post	2014-04-30 18:03:18 +01:00
quickstart.rst	Add clarity note in the docs	2014-08-07 12:08:14 -06:00
salt_bootstrap.rst	Convert double-colon to code-block	2014-07-14 12:37:13 -05:00
standalone_minion.rst	Documentation for salting the salt master	2014-05-23 13:50:08 -06:00
starting_states.rst	Convert double-colon to code-block	2014-07-14 12:37:13 -05:00
states_pt1.rst	Add reactor example for syncing custom types on initial highstate	2014-06-07 14:27:26 -05:00
states_pt2.rst	Fix double-colon and remove redundant section	2014-07-14 12:34:03 -05:00
states_pt3.rst	Add sub-titles to other states tutorial pages	2014-03-13 21:02:33 -05:00
states_pt4.rst	Fix broken links and other sphinx errors	2014-03-17 17:17:18 -05:00
states_pt5.rst	Document match for overstates	2014-06-23 19:19:47 -05:00
syslog_ng-state-usage.rst	Fix numerous typos found via Lintian	2014-08-11 10:46:43 -07:00
walkthrough_macosx.rst	minor doc touchups	2014-05-24 23:42:00 -05:00
walkthrough.rst	Use code-block instead of double-colon + indent	2014-06-28 14:35:21 -05:00
writing_tests.rst	Updated the salt bootstra, and writing tests docs to fix some code block issues.	2014-07-10 15:47:51 -07:00