Merge branch 'master' into black

# Conflicts:
#	cmd2/__init__.py
#	cmd2/argparse_completer.py
#	cmd2/argparse_custom.py
#	cmd2/cmd2.py
#	cmd2/decorators.py
#	cmd2/exceptions.py
#	cmd2/utils.py
#	examples/arg_decorators.py
#	examples/argparse_completion.py
#	examples/modular_commands_main.py
#	tests/test_argparse_completer.py
#	tests/test_argparse_custom.py
#	tests/test_cmd2.py
#	tests/test_completion.py
#	tests/test_history.py

1 files changed, 1 insertions, 1 deletions

diff --git a/docs/features/modular_commands.rst b/docs/features/modular_commands.rst
index 8bd9ba2f..fa643080 100644
--- a/docs/features/modular_commands.rst
+++ b/docs/features/modular_commands.rst
@@ -44,7 +44,7 @@ functions with ``help_``, and completer functions with ``complete_``.
 
 A new decorator ``with_default_category`` is provided to categorize all commands within a CommandSet in the
 same command category.  Individual commands in a CommandSet may be override the default category by specifying a
-specific category with ``cmd.with_category``.
+specific category with ``cmd2.with_category``.
 
 CommandSet command methods will always expect the same parameters as when defined in a ``cmd2.Cmd`` sub-class,
 except that ``self`` will now refer to the ``CommandSet`` instead of the cmd2 instance. The cmd2 instance can