11 Commits

Author	SHA1	Message	Date
G. Clifford Williams	a4c0963340	fix missed merge error	2012-10-20 13:17:48 -05:00
G. Clifford Williams	d399da4259	Merge branch 'master' of https://github.com/saltstack/salt into develop ... Conflicts: doc/ref/renderers/all/index.rst	2012-10-20 11:54:50 -05:00
G. Clifford Williams	c45ad72284	updated man page and index.rst to include wempy	2012-10-16 14:44:31 -05:00
Seth House	01c654d8f1	Added missing modules/states/renderers docs to reference TOC	2012-07-30 00:53:21 -07:00
Seth House	36effed649	Revert "Merge branch 'doc-autosummary-headings' into develop" ... This reverts commit 7997ed4842, reversing changes made to 83c901a174.	2012-07-09 16:03:40 -07:00
Seth House	753ed3a500	Updated modules/states/renderers/returners with new autosummary layout	2012-06-18 00:45:15 -07:00
Seth House	fca05d214e	Updated autosummary template to output headings for the Contents sidebar	2012-06-18 00:42:19 -07:00
Thomas S Hatch	4c1cbcfb6e	Standardize renderer doc refs	2012-05-26 09:17:01 -06:00
Jeff Schroeder	65fecfd79f	Fix a few more sphinx warnings	2012-03-18 17:56:06 -07:00
Seth House	9cc2c166ac	Added all current autosummary-generated stub documentation	2011-11-13 03:25:34 -07:00
Seth House	0639489083	Replace manual & monolithic automodule with individual autosummary	2011-11-13 03:25:34 -07:00