Update docs to 2014.1.6 release
Update docs to 2014.1.7 release
Merge branch 'develop' into solaris-smf-fmri
smf.py: use FMRI instead of SVC in Solaris svcs commands
Portfile and .plist files for MacPorts
Started refactor to integrated SaltKeep from SaltSafe
Merge remote-tracking branch 'upstream/develop' into solaris-smf-fmri
add sphinx spelling extension. enforce en_us
minor
lxc: Conservative and explicit network type change

This refs #14192 and replaces it.
Fix "here" link on requisites doc
Fix requisite documentation links
Remove old-style env= tests.
Warn user about deprecatd option
Fix missing docstring
More explicit exception handling
Fix double-colon and remove redundant section

There is a section in part 2 that is already covered in-depth in part 1,
this commit removes it.
Convert double-colon to code-block
Remove stale code
Add configuration file location for minion (and FreeBSD for master)