rallytime 3c298afa72 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/modules/pip.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/runners/manage.py - salt/states/pkg.py - salt/transport/zeromq.py - salt/utils/event.py - tests/integration/modules/test_pip.py - tests/integration/states/test_user.py - tests/unit/grains/test_core.py - tests/unit/states/test_archive.py - tests/unit/utils/test_boto.py		2018-01-23 13:26:43 -05:00
..
_ext	Adding Jinja cross ref	2017-06-19 09:49:45 +00:00
_incl	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
_static	Add NAPALM logo	2017-05-04 09:09:08 +00:00
_templates
_themes	Merge branch '2016.11' into '2017.7'	2017-10-05 12:09:40 -04:00
.scripts
.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	Fixing a typo in the troubleshooting document	2017-10-12 22:28:25 -07:00
ref	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05:00
security
topics	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05: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	[develop] Bump latest and previous versions	2017-09-27 12:31:20 -04:00
contents.rst	Slots documentation.	2018-01-11 14:05:58 +03:00
faq.rst	Fixed Jinja typo in faq.rst	2017-10-02 10:15:02 -05:00
gen_gource	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
glossary.rst	Merge branch '2016.11' into 'develop'	2017-02-09 10:29:40 -07:00
Makefile	Do not require sphinx-build for cleaning docs	2017-05-23 17:14:11 +02:00
spelling_wordlist.txt	remove Stormpath module, states and docs	2017-08-14 16:03:00 -06:00