rallytime 9b3e4414c8 Merge branch '2016.3' into 'carbon' ... Conflicts: - pkg/windows/modules/get-settings.psm1 - salt/modules/mac_power.py - salt/modules/win_dsc.py - salt/modules/win_servermanager.py - salt/states/file.py - salt/utils/event.py - salt/utils/gitfs.py		2016-11-04 15:23:49 -06:00
..
_ext	Remove docs mocks for msgpack and psutils	2016-08-24 22:55:11 +09:00
_incl	Spelling correction. (#33406)	2016-05-20 13:15:08 -07:00
_static	Add ability to clone from a snapshot to salt-cloud vmware driver	2016-09-12 14:49:20 -04:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865)	2016-08-31 09:51:36 -06:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Merge branch '2016.3' into 'carbon'	2016-10-28 09:25:00 -06:00
ref	Update Carbon versionadded tags to 2016.11.0 in doc/*	2016-10-27 15:26:30 -06:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge branch '2016.3' into 'carbon'	2016-11-04 15:23:49 -06:00
apidoc-saltmods.sh	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
conf.py	Merge branch '2016.3' into 'carbon'	2016-11-04 15:23:49 -06:00
contents.rst	Add utility modules doc page to the TOC	2016-07-27 11:56:49 -05:00
faq.rst	Merge branch '2015.8' into '2016.3'	2016-09-30 16:13:08 -06:00
gen_gource	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
glossary.rst	Merge branch '2016.3' into 'carbon'	2016-10-10 10:19:50 -06:00
Makefile	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
spelling_wordlist.txt	Change Github to GitHub	2015-02-15 15:19:54 +01:00