rallytime 74d9a36d5a Merge branch 'nitrogen' into 'develop' ... Conflicts: - pkg/salt-proxy@.service - salt/modules/npm.py - salt/modules/parted.py - tests/integration/modules/test_libcloud_dns.py		2017-06-13 15:01:51 -06:00
..
_ext	Add conf_proxy cross reference	2017-03-28 18:24:02 +03: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	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Add "Edit on GitHub" link to the docs	2017-03-01 00:34:22 -05: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	Fix comments about the "hash_type" option	2017-05-09 11:10:29 -06:00
ref	Create unique page tag for kernelpkg documentation	2017-06-09 13:06:55 -06:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge branch 'nitrogen' into 'develop'	2017-06-13 15:01:51 -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 pull request #41502 from whiteinge/epub-tocdup	2017-05-30 12:44:19 -05:00
contents.rst	Merge branch 'nitrogen' into 'develop'	2017-05-26 11:27:24 -06:00
faq.rst	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06: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 dockerio state/module (moved to salt-contrib)	2017-02-18 21:58:24 -06:00