Mike Place 13d544b675 Adding some dictupdate merge tests ... Add new option for top_file_merging_strategy to config Add master config file option Adding additional tests Lexicographical test works Make default strategy Simplify to just an option about whether or not to merge Changes Implement ordered top files Implement merge strategies and default top files Lint Doc rewrite and start on ordering Remove debugging Moving to env_order Adding env_order Still writing tests More tests and docs		2015-08-07 10:43:19 -06:00
..
_ext	Fix custom Sphinx formatter for aliased functions	2015-03-29 01:08:26 +01:00
_incl	Create sls_filename_cant_contain_period.rst	2015-01-19 20:56:49 -08:00
_static	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
_templates	Remove the rc sidebar entry	2015-05-11 16:32:47 -06:00
_themes	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-14 10:57:36 -06:00
.scripts	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
.tx	Update 'doc/.tx/config' - Build #213	2014-11-26 20:01:25 +00:00
cheatsheet	rooted config	2015-01-01 07:07:09 -06:00
man	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-07-30 16:58:19 -06:00
ref	Adding some dictupdate merge tests	2015-08-07 10:43:19 -06:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-05 15:32:11 -06:00
conf.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-14 10:57:36 -06:00
contents-1.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents-2.rst	References to documentation.	2015-06-23 11:40:06 -06:00
contents-3.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents-4.rst	removed TOC numbering, additional tweaks to layout.html	2015-05-13 21:18:00 -06:00
contents.rst	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
faq.rst	Deprecate Halite from the Salt docs	2015-05-05 16:01:35 -06:00
gen_gource
glossary.rst	Remove overstate documentation	2015-06-12 13:00:08 -06:00
index.rst	Changing the way links look on the index page	2015-07-08 02:54:52 -04:00
Makefile	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-21 10:33:39 -06:00
spelling_wordlist.txt	Change Github to GitHub	2015-02-15 15:19:54 +01:00