Added some very basic information about actually writing grains in the
"writiing grains" section
false positives
Docs on merging pillar keys

Refs #14916
Normalize the 2014.7.0 release notes

Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes 2014.7's copy.
Normalize the 2014.7.0 release notes

Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes develop's copy, as well as fixing some
formatting issues (chiefly among them replacing the use of markdown with
rST).
Documented JSON outputter config options and fixed 'null' case
Merge pull request #15300 from whiteinge/salt-json-line-out

Documented JSON outputter config options and fixed 'null' case
fix bullet list
fix bullet list
Update 'doc/.tx/config' - Build #152

  http://cookingwithsalt.org/job/salt/job/transifex/152/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #15294 from kellya/develop

Added some very basic information about actually writing grains in the
Merge pull request #15301 from cachedout/pillar_merge

Docs on merging pillar keys
Merge pull request #15302 from s0undt3ch/hotfix/transifex-updates

Hotfix/transifex updates
Merge pull request #15298 from terminalmage/update-release-notes

Normalize the 2014.7.0 release notes
Merge pull request #15299 from terminalmage/update-release-notes-2014.7

Normalize the 2014.7.0 release notes
Merge remote-tracking branch 'upstream/2014.7' into develop
disk: /etc/mtab is only used on Linux.
Merge pull request #15305 from ajacoutot/obsd-disk

disk: /etc/mtab is only used on Linux.
Set the route dst in the api maste_call interface
Merge pull request #15313 from thatch45/runner_sreq_fix

Set the route dst in the api maste_call interface