2 files changed, 1 insertions, 122 deletions
diff --git a/src/mailman/app/commands.py b/src/mailman/app/commands.py
index 7cf3bc4c5..32e5438ea 100644
--- a/src/mailman/app/commands.py
+++ b/src/mailman/app/commands.py
@@ -26,4 +26,4 @@ from public import public
 @public
 def initialize():
     """Initialize the email commands."""
-    add_components('mailman.commands', IEmailCommand, config.commands)
+    add_components('commands', IEmailCommand, config.commands)
diff --git a/src/mailman/app/docs/hooks.rst b/src/mailman/app/docs/hooks.rst
deleted file mode 100644
index 07d0ec33c..000000000
--- a/src/mailman/app/docs/hooks.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-=====
-Hooks
-=====
-
-Mailman defines two initialization hooks, one which is run early in the
-initialization process and the other run late in the initialization process.
-Hooks name an importable callable so it must be accessible on ``sys.path``.
-::
-
-    >>> import os, sys
-    >>> from mailman.config import config
-    >>> config_directory = os.path.dirname(config.filename)
-    >>> sys.path.insert(0, config_directory)
-
-    >>> hook_path = os.path.join(config_directory, 'hooks.py')
-    >>> with open(hook_path, 'w') as fp:
-    ...     print("""\
-    ... counter = 1
-    ... def pre_hook():
-    ...     global counter
-    ...     print('pre-hook:', counter)
-    ...     counter += 1
-    ...
-    ... def post_hook():
-    ...     global counter
-    ...     print('post-hook:', counter)
-    ...     counter += 1
-    ... """, file=fp)
-    >>> fp.close()
-
-
-Pre-hook
-========
-
-We can set the pre-hook in the configuration file.
-
-    >>> config_path = os.path.join(config_directory, 'hooks.cfg')
-    >>> with open(config_path, 'w') as fp:
-    ...     print("""\
-    ... [meta]
-    ... extends: test.cfg
-    ...
-    ... [mailman]
-    ... pre_hook: hooks.pre_hook
-    ... """, file=fp)
-
-The hooks are run in the second and third steps of initialization.  However,
-we can't run those initialization steps in process, so call a command line
-script that will produce no output to force the hooks to run.
-::
-
-    >>> import subprocess
-    >>> from mailman.testing.layers import ConfigLayer
-    >>> def call():
-    ...     exe = os.path.join(os.path.dirname(sys.executable), 'mailman')
-    ...     env = os.environ.copy()
-    ...     env.update(
-    ...         MAILMAN_CONFIG_FILE=config_path,
-    ...         PYTHONPATH=config_directory,
-    ...         )
-    ...     test_cfg = os.environ.get('MAILMAN_EXTRA_TESTING_CFG')
-    ...     if test_cfg is not None:
-    ...         env['MAILMAN_EXTRA_TESTING_CFG'] = test_cfg
-    ...     proc = subprocess.Popen(
-    ...         [exe, 'lists', '--domain', 'ignore', '-q'],
-    ...         cwd=ConfigLayer.root_directory, env=env,
-    ...         universal_newlines=True,
-    ...         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    ...     stdout, stderr = proc.communicate()
-    ...     assert proc.returncode == 0, stderr
-    ...     print(stdout)
-
-    >>> call()
-    pre-hook: 1
-    <BLANKLINE>
-
-    >>> os.remove(config_path)
-
-
-Post-hook
-=========
-
-We can set the post-hook in the configuration file.
-::
-
-    >>> with open(config_path, 'w') as fp:
-    ...     print("""\
-    ... [meta]
-    ... extends: test.cfg
-    ...
-    ... [mailman]
-    ... post_hook: hooks.post_hook
-    ... """, file=fp)
-
-    >>> call()
-    post-hook: 1
-    <BLANKLINE>
-
-    >>> os.remove(config_path)
-
-
-Running both hooks
-==================
-
-We can set the pre- and post-hooks in the configuration file.
-::
-
-    >>> with open(config_path, 'w') as fp:
-    ...     print("""\
-    ... [meta]
-    ... extends: test.cfg
-    ...
-    ... [mailman]
-    ... pre_hook: hooks.pre_hook
-    ... post_hook: hooks.post_hook
-    ... """, file=fp)
-
-    >>> call()
-    pre-hook: 1
-    post-hook: 2
-    <BLANKLINE>