Commit Graph

22 Commits

Author SHA1 Message Date
Jack Kuan
cf7f7faba9 Merge branch 'develop' of github.com:saltstack/salt into develop
Conflicts:
	salt/renderers/jinja.py
	salt/renderers/json.py
	salt/renderers/mako.py
	salt/renderers/wempy.py
2012-11-15 01:29:34 -05:00
Jack Kuan
bc1183924f Doc updates, typo fixes. Add -s option for template renderers. 2012-11-15 01:20:10 -05:00
Seth House
702305902e Updated docs for new pipelined renderers 2012-11-14 12:41:52 -07:00
Jack Kuan
7f3ac3fe89 Add some docs on render pipe.
Also, added a stateconf state so that its stateconf.set function
can be used by the stateconf renderer.
2012-11-13 02:01:34 -05:00
Seth House
747c6ff6a8 Normalized the "all" modules pages to use the qualified module term 2012-10-29 18:23:56 -06:00
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
G. Clifford Williams
1c5042c2ec added wempy to list in ./doc/ref/renderers/index.rst 2012-10-16 11:21:00 -05:00
Alec Koumjian
eb907cb084 Update doc/ref/renderers/index.rst
Telling users where they can put their custom renderers.
2012-09-23 16:21:05 -07: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
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Jeff Schroeder
65fecfd79f Fix a few more sphinx warnings 2012-03-18 17:56:06 -07:00
Thomas S Hatch
fa03eebf15 Add some docs on the sls shebang line 2012-02-09 11:13:55 -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
Seth House
a912520cf8 Reorganized and reworded the contents page for better focus
Also moved the TOC to its own doc to provide a complete and
comprehensive overview. Removed some extra and unecessary toctree calls.
2011-10-30 12:41:14 -06:00
Seth House
f05fda1962 Added autodoc for Renderers 2011-10-16 02:02:31 -06:00