saltstack/salt — pull request #16395 by timoguin (2014-10-05 20:05:15+00:00)
Title: Cherry-pick masterless doc clarifications for 2014.1

For issue #16345. Same changes as PR #16346 but for the 2014.1 branch.

I resolved the merge conflict for _doc/topics/tutorials/quickstart.rst_.