Add CLI example to btrfs.version
base arg should be a key (string) of the given dict
Merge pull request #18122 from slafs/formula-docfix

small doc fix
Merge pull request #18112 from rallytime/cli_example

Add CLI example to btrfs.version
btrfs module: use new-style except-as syntax
Merge pull request #18125 from cvrebert/patch-1

btrfs module: use new-style except-as syntax
Remove heading from top-level docstrings

It makes sphinx's autosummary look off by showing up in the summary
text. For example:

http://docs.saltstack.com/en/latest/ref/modules/all/index.html
Merge pull request #18130 from terminalmage/quickfix

Remove heading from top-level docstrings
Revert "Add six to list of mocked modules"

This reverts commit 6ebf0fd3aa3c2b17a2ae324196f59c9e0e4614ab.

We need six installed in order for the docs to build. Six is too magical
to be mocked, at last, for now.
Merge pull request #18142 from s0undt3ch/hotfix/build-docs

Revert "Add six to list of mocked modules"
Add one additional folder and clarification to client_acl docs
Merge pull request #18157 from basepi/client_acl_docs

Add one additional folder and clarification to client_acl docs