Jeff Schroeder b0467e2265 Add version added for pillar_source_merging_strategy ... Some of my coworkers tried to use this feature and realized it isn't available. git tag --contains for the commit which adds it shows: $ git tag --contains 3b9891b1 v2014.7		2014-08-07 15:30:24 -05:00
..
_ext	Disable the 'routing table' index from the httpdomain	2014-06-19 13:13:09 -06:00
_incl	Fix broken links and other sphinx errors	2014-03-17 17:17:18 -05:00
_static	Removed redundant docs files with Salt-core docs	2014-06-18 20:02:16 -06:00
_templates	Add missing <ul>[…]</ul> around list elements in sidebar TOC.	2014-07-10 20:59:43 +02:00
_themes/saltstack	Updated training image	2014-07-21 17:56:55 -06:00
.scripts	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
.tx	Update 'doc/.tx/config' - Build #136	2014-08-06 19:08:58 +01:00
cheatsheet	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
man	Fix copy-pasta error in user_update example.	2014-07-18 08:32:40 -04:00
ref	Add version added for pillar_source_merging_strategy	2014-08-07 15:30:24 -05:00
security	Spelling fix	2014-08-06 09:22:25 -06:00
topics	Merge remote-tracking branch 'upstream/2014.7' into develop	2014-08-07 15:51:49 -04:00
conf.py	Merge pull request #14215 from whiteinge/doc-fix-mailing-list-links	2014-07-14 17:14:15 -06:00
contents.rst	Added security disclosure proceedure page	2014-07-03 20:32:52 -06:00
faq.rst	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
gen_gource	Add script to gen the gource video to webm	2012-01-08 00:20:18 -07:00
glossary.rst	Update glossary.rst	2014-06-26 16:41:33 -06:00
index.rst	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
Makefile	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
spelling_wordlist.txt	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00