Merge remote-tracking branch 'upstream/develop' into develop
Allow user to use the '--global' flag for git config settings.

This resolves #7156
By default 'is_global' is set to False.
Side Effects: Each call to config_set includes the '--local' or '--global'
flags.
Audit module documentation (U to W)

This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
Merge pull request #7251 from terminalmage/docs

Audit module documentation (U to W)
Merge pull request #7248 from jcockhren/add_global_flag_git_config

Add global flag git config
Modify sys.doc to replace rst directives

This commit modifies sys.doc so that the rst directives within it look
better on the CLI when the docs are printed to the terminal.
Add halite startup hooks into the master
Adding an option to queue state commands instead of failing immediately
Merge pull request #7252 from terminalmage/sysdoc-rst-replace

Modify sys.doc to replace rst directives
Use raw strings with backslashes.
Merge pull request #7256 from s0undt3ch/develop

Use raw strings with backslashes.
Audit module documentation (X to Z + new mac modules)

This commit completes the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com. Combined with 5094719, this both improves the
documentation on the website, as well as the messages seen when using
sys.doc.
Fix regression in apt module

This fixes a regression introduced in bd72e44. Resolves #7257.
Don't make selinux state available if selinux module isn't

Also, add notes to top-level docstring explaining that the setsebool and
semanage commands need to be available in order for the module to work,
and note which packages provide these on RHEL-based distros.

Resolves #7253.
Fix docstring in alternatives module

This makes the autosummary in http://docs.saltstack.com/ref/modules/all/
have a proper summary text.
Fix docstring in eselect module

This also makes the autosummary used in
http://docs.saltstack.com/ref/modules/all/ look better.
Correct docstring for salt.modules.dnsutil.hosts_remove

It looks like this function might have changed names at one point and
the docstring was never updated, or the docstring was just incorrect to
begin. This fixes CLI example to match the correct function name.

Resolves #7255.
Merge pull request #7262 from terminalmage/issue7255

Correct docstring for salt.modules.dnsutil.hosts_remove
Add additional note to selinux state docstring
Add top docstring to portage_config module

This makes the autosummary on
http://docs.saltstack.com/ref/modules/all/index.html look better.