rallytime 9d049e28e5 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/win_pkg.py - salt/states/disk.py		2016-06-15 17:13:26 -06:00
..
index.rst	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
salt.renderers.cheetah.rst	adding renderers to doc salt.renderers reference	2015-01-24 22:41:54 +01:00
salt.renderers.dson.rst	Add dson renderer from SaltConf 16 presentation (#32894)	2016-04-27 11:19:22 -06:00
salt.renderers.genshi.rst	adding renderers to doc salt.renderers reference	2015-01-24 22:41:54 +01:00
salt.renderers.gpg.rst	Added generated new module docs	2014-07-24 15:56:19 -06:00
salt.renderers.hjson.rst	adding renderers to doc salt.renderers reference	2015-01-24 22:41:54 +01:00
salt.renderers.jinja.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
salt.renderers.json5.rst	Add json5 renderer (#32635)	2016-04-16 12:37:42 -06:00
salt.renderers.json.rst	Updated docs for new pipelined renderers	2012-11-14 12:41:52 -07:00
salt.renderers.mako.rst	Updated docs for new pipelined renderers	2012-11-14 12:41:52 -07:00
salt.renderers.msgpack.rst	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00
salt.renderers.py.rst	Revert "Merge branch 'doc-autosummary-headings' into develop"	2012-07-09 16:03:40 -07:00
salt.renderers.pydsl.rst	Fixed heading underline	2013-01-22 13:06:44 -07:00
salt.renderers.pyobjects.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
salt.renderers.stateconf.rst	Allow parent relative includes in state files	2015-07-21 16:32:38 +10:00
salt.renderers.wempy.rst	Updated docs for new pipelined renderers	2012-11-14 12:41:52 -07:00
salt.renderers.yaml.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
salt.renderers.yamlex.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00