Colton Myers f625c21d77 Merge branch '2014.7' into mergeforward ... Conflicts: salt/cloud/clouds/ec2.py salt/daemons/flo/worker.flo salt/master.py salt/minion.py salt/modules/lxc.py salt/states/win_update.py salt/states/zk_concurrency.py		2014-10-30 17:42:36 -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	Update Esky docs for clarity, and remove 2nd person	2014-08-30 19:50:32 -06:00
firewall.rst	Minor typo fix	2014-06-06 02:20:07 +00:00
gitfs.rst	Add further clarification that gitfs auth is pygit2-only	2014-10-19 17:01:13 -05: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	Merge branch '2014.7' into develop	2014-09-22 14:22:54 -06:00
intro_scale.rst	Merge branch '2014.7' into mergeforward	2014-10-30 17:42:36 -06: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	Spelling fixes for docs	2014-10-28 08:12:27 -07:00
multimaster.rst	Note the presence of master_alive_interval in MM docs.	2014-10-23 11:47:00 -06:00
pillar.rst	fix typos: retreived [sic]	2014-10-27 16:13:46 -07:00
preseed_key.rst	Fix link to AWS credential distribution blog post	2014-04-30 18:03:18 +01:00
quickstart.rst	updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master	2014-10-04 14:57:06 -05:00
salt_bootstrap.rst	Update instances of install_salt.sh.sh	2014-09-24 12:16:48 -04:00
standalone_minion.rst	updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master	2014-10-04 14:57:06 -05: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	Spelling fixes for docs	2014-10-28 08:12:27 -07:00
syslog_ng-state-usage.rst	Fixing sphinx violations and errors	2014-09-12 13:28:01 -04:00
walkthrough_macosx.rst	minor doc touchups	2014-05-24 23:42:00 -05:00
walkthrough.rst	Fix example command to one that exists	2014-10-21 09:51:54 +13: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