Daniel Wozniak f12a3d2bc0 Merge branch 'master' into docs/fix-alphabetic-ordering %!s(int64=4) %!d(string=hai) anos
..
_includes a3830dadfa the note only applies to SALT and SALT_SSH commands %!s(int64=4) %!d(string=hai) anos
index.rst 5deb21a631 docs(index.rst): fix alphabetical ordering and remove duplicates %!s(int64=4) %!d(string=hai) anos
salt-api.rst 8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 %!s(int64=9) %!d(string=hai) anos
salt-call.rst f577681f0b Update docs to match log_level warning default %!s(int64=8) %!d(string=hai) anos
salt-cloud.rst a5fef26906 Corrected grammar in cloud docs %!s(int64=5) %!d(string=hai) anos
salt-cp.rst 84829a6f8c Merge branch '2016.11' into '2017.7' %!s(int64=7) %!d(string=hai) anos
salt-extend.rst c6e191ad0d Remove doc markup references from 2016.11 branch %!s(int64=8) %!d(string=hai) anos
salt-key.rst 4aafa41d22 Remove ":doc:" references from a bunch of doc/* files %!s(int64=8) %!d(string=hai) anos
salt-master.rst 68c0dc0717 Whitespace cleanup %!s(int64=10) %!d(string=hai) anos
salt-minion.rst 68c0dc0717 Whitespace cleanup %!s(int64=10) %!d(string=hai) anos
salt-proxy.rst 701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py %!s(int64=9) %!d(string=hai) anos
salt-run.rst c6e191ad0d Remove doc markup references from 2016.11 branch %!s(int64=8) %!d(string=hai) anos
salt-ssh.rst 0c365c19a4 add --pre-flight ssh option %!s(int64=4) %!d(string=hai) anos
salt-syndic.rst 68c0dc0717 Whitespace cleanup %!s(int64=10) %!d(string=hai) anos
salt-unity.rst 0b1eb00dc4 Replaced `test.ping` with `test.version` %!s(int64=5) %!d(string=hai) anos
salt.rst a3830dadfa the note only applies to SALT and SALT_SSH commands %!s(int64=4) %!d(string=hai) anos
spm.rst cfadda0c0c Added note regarding missing spm exe on Debian/Ubuntu %!s(int64=9) %!d(string=hai) anos