master
refactor: tidy and harden highstate colordiff colorizer
Deprecating and removing salt-unity.
Add a few more nice to have hooks
docs(resources): comprehensive Sphinx coverage for the resources framework
Corrected grammar in cloud docs
Merge branch '2016.11' into '2017.7'
Remove ":doc:" references from a bunch of doc/* files
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py Added salt-proxy release notes topic Added note to pip state for Refs #21845 Regenerated and versioned man pages
Fix broken URL in docs
Correct wording for batch-safe-limit functionality
Added note regarding missing spm exe on Debian/Ubuntu Minor fixes to spm docs