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, 2 insertions, 6 deletions

diff --git a/docs/features/argument_processing.rst b/docs/features/argument_processing.rst
index abe9a183..bcc68633 100644
--- a/docs/features/argument_processing.rst
+++ b/docs/features/argument_processing.rst
@@ -389,11 +389,7 @@ argparse arguments.
 
 - ``cmd2_statement`` - ``cmd2.Cmd2AttributeWrapper`` object containing
   ``cmd2.Statement`` object that was created when parsing the command line.
-- ``__statement__`` - ``cmd2.Statement`` object that was created when parsing
-  the command line. (This is deprecated and will be removed in 2.0.0.) Use
-  ``cmd2_statement`` instead.
-
-- ``__subcmd_handler__`` - used by cmd2 to identify the handler for a
-  subcommand created with ``@cmd2.as_subcommand_to`` decorator.
 - ``cmd2_handler`` - ``cmd2.Cmd2AttributeWrapper`` object containing
   a subcommand handler function or ``None`` if one was not set.
+- ``__subcmd_handler__`` - used by cmd2 to identify the handler for a
+  subcommand created with ``@cmd2.as_subcommand_to`` decorator.