rallytime a7dda5706e Merge branch '2016.3' into 'carbon' ... Conflicts: - salt/modules/cmdmod.py - salt/modules/win_service.py - salt/modules/x509.py - salt/utils/__init__.py - tests/unit/modules/win_service_test.py		2016-10-19 18:20:04 -06:00
..
auth/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
beacons/all	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
cli	Merge branch '2016.3' into 'carbon'	2016-10-12 15:26:27 -06:00
clients	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
clouds/all	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
configuration	Merge branch '2016.3' into 'carbon'	2016-10-19 18:20:04 -06:00
engines/all	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
executors/all	man pages updated (#33307)	2016-05-17 10:24:44 -06:00
file_server	Merge branch '2016.3' into 'develop'	2016-07-12 16:13:56 -06:00
grains/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
internals	Developer documentation for Unicode handling (#35593)	2016-08-25 15:30:31 -06:00
modules	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
netapi/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
output/all	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
pillar	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
proxy/all	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
queues/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
renderers	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
returners	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
roster/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
runners	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
sdb/all	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
serializers/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
states	Merge branch '2015.8' into '2016.3'	2016-10-12 12:36:00 -06:00
thorium/all	Add autodoc topics for new modules added in Carbon (#36933)	2016-10-12 09:31:07 -06:00
tops	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
wheel/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
index.rst	man pages updated (#33307)	2016-05-17 10:24:44 -06:00
peer.rst	Changed notes to indicate that functions are matched using regular expressions instead of minions	2016-01-12 11:55:36 -07:00
publisheracl.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
python-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00