Thomas S Hatch f0009be6c2 Merge branch '2014.7' into develop		2014-08-21 17:20:26 -06:00
..
logging	Changed conf-log to conf_log to match the other conf_* roles	2013-12-13 17:34:59 -07:00
examples.rst	Removed line numbers from master/minion conf file examples	2013-06-12 12:15:40 -06:00
index.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
master.rst	Merge branch '2014.7' into develop	2014-08-21 17:20:26 -06:00
minion.rst	Fixing more sphinx warnings and errors	2014-08-11 13:56:43 -04:00
nonroot.rst	Fix typo	2014-03-30 15:48:15 +00:00