avoid shadowing module-level log in dockerio
Add inline function behavior tot he minion
First pass at refactoring Salt documentation.
Merge conflict and rebase.

Conflicts:
	doc/ref/renderers/index.rst
Wrapping up sub-TOCs.
Moving around Windows docs.
Now compiling cleanly except for GCE.
Fix GCE build errors.
Fix line length
Docs build cleanly! Yay!
Remove spurious heading. Thanks @gravyboat!
Merge pull request #10792 from cachedout/doc_toc

Documentation overhaul
Minor bug fix
Merge pull request #10795 from pwdng/develop

Fix misplaced parenthesis
Merge pull request #10797 from hulu/docker-log-shadowing

avoid shadowing module-level log in dockerio
Add salt-unity script

This script allows all salt commands to be called from a single top level
shell script
Add salt-unity to the base deployment
Don't fail the setup.py if zmq is a liile on the old side
Merge branch 'develop' into with-pylint-pragmas