Thomas S Hatch 1468c26ec1 Merge branch '2014.7' into develop ... Conflicts: doc/faq.rst doc/ref/configuration/minion.rst salt/minion.py salt/states/pkg.py salt/transport/__init__.py		2014-10-13 15:03:33 -06:00
..
cloud	Correct formatting of PagerDuty	2014-10-02 13:27:13 -06:00
development	ipython log to look for	2014-10-06 12:54:36 -04:00
eauth	Merge branch '2014.7' into develop	2014-09-03 14:43:07 -06:00
event	documentation: add salt/ event prefix and explain how to get event tag while listening	2014-10-03 16:37:08 -04:00
installation	Merge branch '2014.7' into develop	2014-10-13 15:03:33 -06:00
jobs	Fixing sphinx violations and errors	2014-09-12 13:28:01 -04:00
master_tops	Restore master_tops functionality and add more documentation.	2014-07-09 14:37:59 -06:00
mine	Documented the mine_function alises	2014-08-09 11:14:25 -06:00
netapi	Change more affected docs from Helium to 2014.7.0	2014-07-15 17:02:19 -06:00
pillar	doc fix	2014-09-26 09:28:16 -04:00
projects	Add info on projects using Salt	2012-05-22 22:34:38 -06:00
reactor	Use custom returner from a reactor.	2014-09-10 10:00:06 +03:00
releases	Merge branch '2014.7' into develop	2014-10-13 15:03:33 -06:00
sdb	Change more affected docs from Helium to 2014.7.0	2014-07-15 17:02:19 -06:00
ssh	Salt ssh is no longer beta	2014-09-18 15:47:17 -06:00
targeting	More sphinx errors and violations	2014-09-03 16:05:07 -06:00
topology	Fix numerous typos found via Lintian	2014-08-11 10:46:43 -07:00
transports/raet	update raet install docs for 2014.7	2014-08-12 11:16:53 -06:00
troubleshooting	Merge branch '2014.7' into develop	2014-09-22 14:22:54 -06:00
tutorials	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
virt	Fixed typo	2014-08-08 12:16:47 +02:00
windows	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
yaml	more copyediting	2014-04-30 13:55:48 -07:00
best_practices.rst	Update best_practices to resolve issue where slspath is used, but not yet implemented/explained.	2014-08-13 04:57:14 +00:00
index.rst	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00