90 files changed, 300 insertions, 52 deletions

diff --git a/README.rst b/README.rst
index d0f2a7377..37cee501c 100644
--- a/README.rst
+++ b/README.rst
@@ -6,12 +6,12 @@ Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
 
 This is GNU Mailman, a mailing list management system distributed under the
 terms of the GNU General Public License (GPL) version 3 or later.  The name of
-this software is spelled "Mailman" with a leading capital `M' but with a lower
-case second `m'.  Any other spelling is incorrect.
+this software is spelled "Mailman" with a leading capital 'M' but with a lower
+case second 'm'.  Any other spelling is incorrect.
 
 Mailman is written in Python which is available for all platforms that Mailman
 is supported on, including GNU/Linux and most other Unix-like operating
-systems (e.g. Solaris, *BSD, MacOSX, etc.).  Mailman is not supported on
+systems (e.g. Solaris, \*BSD, MacOSX, etc.).  Mailman is not supported on
 Windows, although web and mail clients on any platform should be able to
 interact with Mailman just fine.
 
@@ -25,3 +25,37 @@ and there is a community driven wiki at
 
 For more information on Mailman, see the above web sites, or the documentation
 provided with this software.  Start at src/mailman/docs/README.txt.
+
+
+Table of Contents
+=================
+
+.. toctree::
+    :glob:
+
+    src/mailman/docs/INTRODUCTION
+    src/mailman/docs/START
+    src/mailman/docs/MTA
+    src/mailman/bin/docs/*
+    src/mailman/commands/docs/*
+    src/mailman/model/docs/*
+    src/mailman/core/docs/*
+    src/mailman/app/docs/*
+    src/mailman/runners/docs/*
+    src/mailman/pipeline/docs/*
+    src/mailman/rest/docs/*
+    src/mailman/chains/docs/*
+    src/mailman/rules/docs/*
+    src/mailman/archiving/docs/*
+    src/mailman/mta/docs/*
+    src/mailman/docs/NEWS
+    src/mailman/docs/STYLEGUIDE
+    src/mailman/docs/ACKNOWLEDGMENTS
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/buildout.cfg b/buildout.cfg
index f12880fc2..ef5d619d2 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,7 +1,5 @@
 [buildout]
 parts =
-    docs
-#    filetemplates
     interpreter
     tags
     test
@@ -26,17 +24,3 @@ defaults = '--tests-pattern ^tests --exit-with-status'.split()
 # Hack in extra arguments to zope.testrunner.
 initialization = from mailman.testing import initialize;
     initialize('${buildout:directory}')
-
-[docs]
-recipe = z3c.recipe.sphinxdoc
-eggs = mailman [docs]
-index-doc = docs/README
-default.css =
-layout.html =
-extensions = sphinxconf
-
-[filetemplates]
-recipe = z3c.recipe.filetemplate
-source-directory = .buildout
-package = mailman
-eggs = mailman
diff --git a/conf.py b/conf.py
new file mode 100644
index 000000000..936bb4c0a
--- /dev/null
+++ b/conf.py
@@ -0,0 +1,235 @@
+# -*- coding: utf-8 -*-
+#
+# GNU Mailman documentation build configuration file, created by
+# sphinx-quickstart on Fri Sep 23 21:30:41 2011.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'README'
+
+# General information about the project.
+project = u'GNU Mailman'
+copyright = u'1998-2011 by the Free Software Foundation, Inc.'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+import sys; sys.path.append('src')
+from mailman.version import VERSION
+version = '.'.join(VERSION.split('.')[0:2])
+# The full version, including alpha/beta/rc tags.
+release = VERSION
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build', 'eggs']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'GNUMailmandoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'GNUMailman.tex', u'GNU Mailman Documentation',
+   u'Barry Warsaw', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'gnumailman', u'GNU Mailman Documentation',
+     [u'Barry Warsaw'], 1)
+]
+
+
+def index_html():
+    import errno
+    cwd = os.getcwd()
+    try:
+        os.chdir('build/sphinx/html')
+        os.symlink('README.html', 'index.html')
+        print 'index.html -> README.html'
+    except OSError as error:
+        if error.errno != errno.EEXIST:
+            raise
+    finally:
+        os.chdir(cwd)
+
+import atexit
+atexit.register(index_html)
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..19850ff78
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[upload_docs]
+upload_dir: build/sphinx/html
diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py
index ed51320ba..2c34e0971 100644
--- a/src/mailman/__init__.py
+++ b/src/mailman/__init__.py
@@ -41,8 +41,11 @@ except ImportError:
 # however, we'll initialize it differently for tests.  We have to do it this
 # early so that module contents is set up before anything that needs it is
 # imported.
-if sys.argv[0].split(os.sep)[-1] == 'test':
-    from mailman.testing.i18n import initialize
-else:
-    from mailman.core.i18n import initialize
-initialize()
+#
+# Do *not* do this if we're building the documentation.
+if 'build_sphinx' not in sys.argv:
+    if sys.argv[0].split(os.sep)[-1] == 'test':
+        from mailman.testing.i18n import initialize
+    else:
+        from mailman.core.i18n import initialize
+    initialize()
diff --git a/src/mailman/app/docs/bounces.txt b/src/mailman/app/docs/bounces.rst
index f825064e3..f825064e3 100644
--- a/src/mailman/app/docs/bounces.txt
+++ b/src/mailman/app/docs/bounces.rst
diff --git a/src/mailman/app/docs/chains.txt b/src/mailman/app/docs/chains.rst
index 8a8ac0cc2..8a8ac0cc2 100644
--- a/src/mailman/app/docs/chains.txt
+++ b/src/mailman/app/docs/chains.rst
diff --git a/src/mailman/app/docs/hooks.txt b/src/mailman/app/docs/hooks.rst
index 7e214f13f..7e214f13f 100644
--- a/src/mailman/app/docs/hooks.txt
+++ b/src/mailman/app/docs/hooks.rst
diff --git a/src/mailman/app/docs/lifecycle.txt b/src/mailman/app/docs/lifecycle.rst
index 4a8b732e1..4a8b732e1 100644
--- a/src/mailman/app/docs/lifecycle.txt
+++ b/src/mailman/app/docs/lifecycle.rst
diff --git a/src/mailman/app/docs/message.txt b/src/mailman/app/docs/message.rst
index 3e3293196..3e3293196 100644
--- a/src/mailman/app/docs/message.txt
+++ b/src/mailman/app/docs/message.rst
diff --git a/src/mailman/app/docs/pipelines.txt b/src/mailman/app/docs/pipelines.rst
index cf848f1d9..cf848f1d9 100644
--- a/src/mailman/app/docs/pipelines.txt
+++ b/src/mailman/app/docs/pipelines.rst
diff --git a/src/mailman/app/docs/styles.txt b/src/mailman/app/docs/styles.rst
index 63ec999bf..63ec999bf 100644
--- a/src/mailman/app/docs/styles.txt
+++ b/src/mailman/app/docs/styles.rst
diff --git a/src/mailman/app/docs/system.txt b/src/mailman/app/docs/system.rst
index 844db9ee6..844db9ee6 100644
--- a/src/mailman/app/docs/system.txt
+++ b/src/mailman/app/docs/system.rst
diff --git a/src/mailman/archiving/docs/common.txt b/src/mailman/archiving/docs/common.rst
index 330c8e307..330c8e307 100644
--- a/src/mailman/archiving/docs/common.txt
+++ b/src/mailman/archiving/docs/common.rst
diff --git a/src/mailman/commands/docs/echo.txt b/src/mailman/commands/docs/echo.rst
index ced483ea8..ced483ea8 100644
--- a/src/mailman/commands/docs/echo.txt
+++ b/src/mailman/commands/docs/echo.rst
diff --git a/src/mailman/commands/docs/end.txt b/src/mailman/commands/docs/end.rst
index a11bea095..a11bea095 100644
--- a/src/mailman/commands/docs/end.txt
+++ b/src/mailman/commands/docs/end.rst
diff --git a/src/mailman/commands/docs/import.txt b/src/mailman/commands/docs/import.rst
index 34521026d..34521026d 100644
--- a/src/mailman/commands/docs/import.txt
+++ b/src/mailman/commands/docs/import.rst
diff --git a/src/mailman/commands/docs/info.txt b/src/mailman/commands/docs/info.rst
index 83b3fe179..83b3fe179 100644
--- a/src/mailman/commands/docs/info.txt
+++ b/src/mailman/commands/docs/info.rst
diff --git a/src/mailman/commands/docs/lists.txt b/src/mailman/commands/docs/lists.rst
index 036147a23..036147a23 100644
--- a/src/mailman/commands/docs/lists.txt
+++ b/src/mailman/commands/docs/lists.rst
diff --git a/src/mailman/commands/docs/members.txt b/src/mailman/commands/docs/members.rst
index 18a916781..18a916781 100644
--- a/src/mailman/commands/docs/members.txt
+++ b/src/mailman/commands/docs/members.rst
diff --git a/src/mailman/commands/docs/membership.txt b/src/mailman/commands/docs/membership.rst
index d05f12eee..d05f12eee 100644
--- a/src/mailman/commands/docs/membership.txt
+++ b/src/mailman/commands/docs/membership.rst
diff --git a/src/mailman/commands/docs/qfile.txt b/src/mailman/commands/docs/qfile.rst
index 74ede1b64..74ede1b64 100644
--- a/src/mailman/commands/docs/qfile.txt
+++ b/src/mailman/commands/docs/qfile.rst
diff --git a/src/mailman/commands/docs/remove.txt b/src/mailman/commands/docs/remove.rst
index f0f4e64f6..f0f4e64f6 100644
--- a/src/mailman/commands/docs/remove.txt
+++ b/src/mailman/commands/docs/remove.rst
diff --git a/src/mailman/commands/docs/status.txt b/src/mailman/commands/docs/status.rst
index 7587157bc..7587157bc 100644
--- a/src/mailman/commands/docs/status.txt
+++ b/src/mailman/commands/docs/status.rst
diff --git a/src/mailman/commands/docs/unshunt.txt b/src/mailman/commands/docs/unshunt.rst
index ce9d70316..ce9d70316 100644
--- a/src/mailman/commands/docs/unshunt.txt
+++ b/src/mailman/commands/docs/unshunt.rst
diff --git a/src/mailman/commands/docs/version.txt b/src/mailman/commands/docs/version.rst
index 8032df20a..8032df20a 100644
--- a/src/mailman/commands/docs/version.txt
+++ b/src/mailman/commands/docs/version.rst
diff --git a/src/mailman/commands/docs/withlist.txt b/src/mailman/commands/docs/withlist.rst
index 7632c726a..7632c726a 100644
--- a/src/mailman/commands/docs/withlist.txt
+++ b/src/mailman/commands/docs/withlist.rst
diff --git a/src/mailman/core/docs/switchboard.txt b/src/mailman/core/docs/switchboard.rst
index 751b1e640..751b1e640 100644
--- a/src/mailman/core/docs/switchboard.txt
+++ b/src/mailman/core/docs/switchboard.rst
diff --git a/src/mailman/docs/ACKNOWLEDGMENTS.txt b/src/mailman/docs/ACKNOWLEDGMENTS.rst
index bb971a91d..36a386b57 100644
--- a/src/mailman/docs/ACKNOWLEDGMENTS.txt
+++ b/src/mailman/docs/ACKNOWLEDGMENTS.rst
@@ -37,20 +37,34 @@ Here is the list of other contributors who have donated large bits of
 code, and have assigned copyright for contributions to the FSF:
 
 * Juan Carlos Rey Anaya
+* Andrija Arsic
 * Richard Barrett
+* Jimmy Bergman
 * Stephan Berndts
 * Norbert Bollow
+* Joe Dugan
+* Ethan Mindlace Fremen
+* Florian Fuchs
 * Ben Gertzfield
 * Victoriano Giralt
+* Stephen Goss
 * Mads Kiilerich
+* Cedric Knight
+* Patrick Ben Koetter
 * The Dragon De Monsyne
 * Les Niles
+* Reed O'Brien
 * Terri Oda
 * Simone Piunno
+* Claudia Schmidt
+* Andreas Schosser
+* Richard Wackerbarth
+
 
+Special Thanks
+==============
 
-Other Thanks
-============
+Very special thanks to Andrija Arsic for his winning new GNU Mailman logos.
 
 Thanks also go to the following people for their important contributions in
 other aspects of the Mailman project:
@@ -59,7 +73,7 @@ other aspects of the Mailman project:
 * JC Dill
 * Clytie Siddall
 
-Thanks also to Dragon for his winning Mailman logo contribution, and to Terri
+Thanks also to Dragon for his original Mailman logo contribution, and to Terri
 Oda for the neat shortcut icon and the member documentation.
 
 Control.com sponsored development of several Mailman 2.1 features, including
@@ -68,7 +82,7 @@ support.  My thanks especially to Dan Pierson and Ken Crater from Control.com.
 
 Here is the list of other people who have contributed useful ideas,
 suggestions, bug fixes, testing, etc., or who have been very helpful in
-answering questions on mailman-users.  Please let me know if anybody's been
+answering questions on mailman-users.  Please let me know if you have been
 left off the list!
 
 * David Abrahams
diff --git a/src/mailman/docs/README.txt b/src/mailman/docs/INTRODUCTION.rst
index b7a247de4..e67439613 100644
--- a/src/mailman/docs/README.txt
+++ b/src/mailman/docs/INTRODUCTION.rst
@@ -91,27 +91,3 @@ Mailman 3.0 requires `Python 2.6`_ or newer.
 .. _Python: http://www.python.org
 .. _FAQ: http://wiki.list.org/display/DOC/Frequently+Asked+Questions
 .. _`Python 2.6`: http://www.python.org/download/releases/2.6.6/
-
-
-Table of Contents
-=================
-
-.. toctree::
-    :glob:
-
-    START
-    MTA
-    NEWS
-    STYLEGUIDE
-    ACKNOWLEDGMENTS
-    ../bin/docs/*
-    ../commands/docs/*
-    ../model/docs/*
-    ../app/docs/*
-    ../pipeline/docs/*
-    ../queue/docs/*
-    ../rest/docs/*
-    ../chains/docs/*
-    ../rules/docs/*
-    ../archiving/docs/*
-    ../mta/docs/*
diff --git a/src/mailman/docs/MTA.txt b/src/mailman/docs/MTA.rst
index f541d3838..f541d3838 100644
--- a/src/mailman/docs/MTA.txt
+++ b/src/mailman/docs/MTA.rst
diff --git a/src/mailman/docs/STYLEGUIDE.txt b/src/mailman/docs/STYLEGUIDE.rst
index 32b2da72f..32b2da72f 100644
--- a/src/mailman/docs/STYLEGUIDE.txt
+++ b/src/mailman/docs/STYLEGUIDE.rst
diff --git a/src/mailman/model/docs/addresses.txt b/src/mailman/model/docs/addresses.rst
index 01e68c954..01e68c954 100644
--- a/src/mailman/model/docs/addresses.txt
+++ b/src/mailman/model/docs/addresses.rst
diff --git a/src/mailman/model/docs/autorespond.txt b/src/mailman/model/docs/autorespond.rst
index 3a9ad01b2..3a9ad01b2 100644
--- a/src/mailman/model/docs/autorespond.txt
+++ b/src/mailman/model/docs/autorespond.rst
diff --git a/src/mailman/model/docs/languages.txt b/src/mailman/model/docs/languages.rst
index 21143f28b..21143f28b 100644
--- a/src/mailman/model/docs/languages.txt
+++ b/src/mailman/model/docs/languages.rst
diff --git a/src/mailman/model/docs/listmanager.txt b/src/mailman/model/docs/listmanager.rst
index b571d9680..b571d9680 100644
--- a/src/mailman/model/docs/listmanager.txt
+++ b/src/mailman/model/docs/listmanager.rst
diff --git a/src/mailman/model/docs/mailinglist.txt b/src/mailman/model/docs/mailinglist.rst
index 895068e52..895068e52 100644
--- a/src/mailman/model/docs/mailinglist.txt
+++ b/src/mailman/model/docs/mailinglist.rst
diff --git a/src/mailman/model/docs/messagestore.txt b/src/mailman/model/docs/messagestore.rst
index 3ee59129b..3ee59129b 100644
--- a/src/mailman/model/docs/messagestore.txt
+++ b/src/mailman/model/docs/messagestore.rst
diff --git a/src/mailman/model/docs/mlist-addresses.txt b/src/mailman/model/docs/mlist-addresses.rst
index 2a021f67f..2a021f67f 100644
--- a/src/mailman/model/docs/mlist-addresses.txt
+++ b/src/mailman/model/docs/mlist-addresses.rst
diff --git a/src/mailman/model/docs/registration.txt b/src/mailman/model/docs/registration.rst
index 9605fcbea..9605fcbea 100644
--- a/src/mailman/model/docs/registration.txt
+++ b/src/mailman/model/docs/registration.rst
diff --git a/src/mailman/mta/docs/authentication.txt b/src/mailman/mta/docs/authentication.rst
index 9f78859a0..9f78859a0 100644
--- a/src/mailman/mta/docs/authentication.txt
+++ b/src/mailman/mta/docs/authentication.rst
diff --git a/src/mailman/mta/docs/bulk.txt b/src/mailman/mta/docs/bulk.rst
index 8bacd4957..8bacd4957 100644
--- a/src/mailman/mta/docs/bulk.txt
+++ b/src/mailman/mta/docs/bulk.rst
diff --git a/src/mailman/mta/docs/connection.txt b/src/mailman/mta/docs/connection.rst
index 515a773bd..515a773bd 100644
--- a/src/mailman/mta/docs/connection.txt
+++ b/src/mailman/mta/docs/connection.rst
diff --git a/src/mailman/mta/docs/decorating.txt b/src/mailman/mta/docs/decorating.rst
index 05196eb78..05196eb78 100644
--- a/src/mailman/mta/docs/decorating.txt
+++ b/src/mailman/mta/docs/decorating.rst
diff --git a/src/mailman/mta/docs/personalized.txt b/src/mailman/mta/docs/personalized.rst
index 6c1c9eb4f..6c1c9eb4f 100644
--- a/src/mailman/mta/docs/personalized.txt
+++ b/src/mailman/mta/docs/personalized.rst
diff --git a/src/mailman/mta/docs/verp.txt b/src/mailman/mta/docs/verp.rst
index 2f2f09828..2f2f09828 100644
--- a/src/mailman/mta/docs/verp.txt
+++ b/src/mailman/mta/docs/verp.rst
diff --git a/src/mailman/pipeline/docs/ack-headers.txt b/src/mailman/pipeline/docs/ack-headers.rst
index dba2169e2..dba2169e2 100644
--- a/src/mailman/pipeline/docs/ack-headers.txt
+++ b/src/mailman/pipeline/docs/ack-headers.rst
diff --git a/src/mailman/pipeline/docs/acknowledge.txt b/src/mailman/pipeline/docs/acknowledge.rst
index 8c8552190..8c8552190 100644
--- a/src/mailman/pipeline/docs/acknowledge.txt
+++ b/src/mailman/pipeline/docs/acknowledge.rst
diff --git a/src/mailman/pipeline/docs/after-delivery.txt b/src/mailman/pipeline/docs/after-delivery.rst
index c3e393cf2..c3e393cf2 100644
--- a/src/mailman/pipeline/docs/after-delivery.txt
+++ b/src/mailman/pipeline/docs/after-delivery.rst
diff --git a/src/mailman/pipeline/docs/archives.txt b/src/mailman/pipeline/docs/archives.rst
index 323d121e8..323d121e8 100644
--- a/src/mailman/pipeline/docs/archives.txt
+++ b/src/mailman/pipeline/docs/archives.rst
diff --git a/src/mailman/pipeline/docs/avoid-duplicates.txt b/src/mailman/pipeline/docs/avoid-duplicates.rst
index 1e46793c2..1e46793c2 100644
--- a/src/mailman/pipeline/docs/avoid-duplicates.txt
+++ b/src/mailman/pipeline/docs/avoid-duplicates.rst
diff --git a/src/mailman/pipeline/docs/calc-recips.txt b/src/mailman/pipeline/docs/calc-recips.rst
index 6dca85816..6dca85816 100644
--- a/src/mailman/pipeline/docs/calc-recips.txt
+++ b/src/mailman/pipeline/docs/calc-recips.rst
diff --git a/src/mailman/pipeline/docs/cleanse.txt b/src/mailman/pipeline/docs/cleanse.rst
index 61dfa8f52..61dfa8f52 100644
--- a/src/mailman/pipeline/docs/cleanse.txt
+++ b/src/mailman/pipeline/docs/cleanse.rst
diff --git a/src/mailman/pipeline/docs/cook-headers.txt b/src/mailman/pipeline/docs/cook-headers.rst
index cd2acaae2..cd2acaae2 100644
--- a/src/mailman/pipeline/docs/cook-headers.txt
+++ b/src/mailman/pipeline/docs/cook-headers.rst
diff --git a/src/mailman/pipeline/docs/decorate.txt b/src/mailman/pipeline/docs/decorate.rst
index 1c94cff1e..1c94cff1e 100644
--- a/src/mailman/pipeline/docs/decorate.txt
+++ b/src/mailman/pipeline/docs/decorate.rst
diff --git a/src/mailman/pipeline/docs/digests.txt b/src/mailman/pipeline/docs/digests.rst
index d4d563180..d4d563180 100644
--- a/src/mailman/pipeline/docs/digests.txt
+++ b/src/mailman/pipeline/docs/digests.rst
diff --git a/src/mailman/pipeline/docs/file-recips.txt b/src/mailman/pipeline/docs/file-recips.rst
index 7d157ccc5..7d157ccc5 100644
--- a/src/mailman/pipeline/docs/file-recips.txt
+++ b/src/mailman/pipeline/docs/file-recips.rst
diff --git a/src/mailman/pipeline/docs/filtering.txt b/src/mailman/pipeline/docs/filtering.rst
index 5b54424e4..5b54424e4 100644
--- a/src/mailman/pipeline/docs/filtering.txt
+++ b/src/mailman/pipeline/docs/filtering.rst
diff --git a/src/mailman/pipeline/docs/nntp.txt b/src/mailman/pipeline/docs/nntp.rst
index 874712397..874712397 100644
--- a/src/mailman/pipeline/docs/nntp.txt
+++ b/src/mailman/pipeline/docs/nntp.rst
diff --git a/src/mailman/pipeline/docs/reply-to.txt b/src/mailman/pipeline/docs/reply-to.rst
index e08fea81d..e08fea81d 100644
--- a/src/mailman/pipeline/docs/reply-to.txt
+++ b/src/mailman/pipeline/docs/reply-to.rst
diff --git a/src/mailman/pipeline/docs/replybot.txt b/src/mailman/pipeline/docs/replybot.rst
index 208f6aae9..208f6aae9 100644
--- a/src/mailman/pipeline/docs/replybot.txt
+++ b/src/mailman/pipeline/docs/replybot.rst
diff --git a/src/mailman/pipeline/docs/scrubber.txt b/src/mailman/pipeline/docs/scrubber.rst
index 86a8161a7..86a8161a7 100644
--- a/src/mailman/pipeline/docs/scrubber.txt
+++ b/src/mailman/pipeline/docs/scrubber.rst
diff --git a/src/mailman/pipeline/docs/subject-munging.txt b/src/mailman/pipeline/docs/subject-munging.rst
index e7a6553ce..e7a6553ce 100644
--- a/src/mailman/pipeline/docs/subject-munging.txt
+++ b/src/mailman/pipeline/docs/subject-munging.rst
diff --git a/src/mailman/pipeline/docs/tagger.txt b/src/mailman/pipeline/docs/tagger.rst
index 80e682119..80e682119 100644
--- a/src/mailman/pipeline/docs/tagger.txt
+++ b/src/mailman/pipeline/docs/tagger.rst
diff --git a/src/mailman/pipeline/docs/to-outgoing.txt b/src/mailman/pipeline/docs/to-outgoing.rst
index 816aa4ca6..816aa4ca6 100644
--- a/src/mailman/pipeline/docs/to-outgoing.txt
+++ b/src/mailman/pipeline/docs/to-outgoing.rst
diff --git a/src/mailman/rest/docs/basic.txt b/src/mailman/rest/docs/basic.rst
index cf02fa4ec..cf02fa4ec 100644
--- a/src/mailman/rest/docs/basic.txt
+++ b/src/mailman/rest/docs/basic.rst
diff --git a/src/mailman/rest/docs/helpers.txt b/src/mailman/rest/docs/helpers.rst
index 4f0b1c804..4f0b1c804 100644
--- a/src/mailman/rest/docs/helpers.txt
+++ b/src/mailman/rest/docs/helpers.rst
diff --git a/src/mailman/rules/docs/administrivia.txt b/src/mailman/rules/docs/administrivia.rst
index bfc5efdcc..bfc5efdcc 100644
--- a/src/mailman/rules/docs/administrivia.txt
+++ b/src/mailman/rules/docs/administrivia.rst
diff --git a/src/mailman/rules/docs/approve.txt b/src/mailman/rules/docs/approve.rst
index 3e1206563..3e1206563 100644
--- a/src/mailman/rules/docs/approve.txt
+++ b/src/mailman/rules/docs/approve.rst
diff --git a/src/mailman/rules/docs/emergency.txt b/src/mailman/rules/docs/emergency.rst
index f28f9eed9..f28f9eed9 100644
--- a/src/mailman/rules/docs/emergency.txt
+++ b/src/mailman/rules/docs/emergency.rst
diff --git a/src/mailman/rules/docs/header-matching.txt b/src/mailman/rules/docs/header-matching.rst
index b07118e11..b07118e11 100644
--- a/src/mailman/rules/docs/header-matching.txt
+++ b/src/mailman/rules/docs/header-matching.rst
diff --git a/src/mailman/rules/docs/implicit-dest.txt b/src/mailman/rules/docs/implicit-dest.rst
index b0464d0a5..b0464d0a5 100644
--- a/src/mailman/rules/docs/implicit-dest.txt
+++ b/src/mailman/rules/docs/implicit-dest.rst
diff --git a/src/mailman/rules/docs/loop.txt b/src/mailman/rules/docs/loop.rst
index 716029065..716029065 100644
--- a/src/mailman/rules/docs/loop.txt
+++ b/src/mailman/rules/docs/loop.rst
diff --git a/src/mailman/rules/docs/max-size.txt b/src/mailman/rules/docs/max-size.rst
index 87856f0f1..87856f0f1 100644
--- a/src/mailman/rules/docs/max-size.txt
+++ b/src/mailman/rules/docs/max-size.rst
diff --git a/src/mailman/rules/docs/moderation.txt b/src/mailman/rules/docs/moderation.rst
index eacc1cff3..eacc1cff3 100644
--- a/src/mailman/rules/docs/moderation.txt
+++ b/src/mailman/rules/docs/moderation.rst
diff --git a/src/mailman/rules/docs/news-moderation.txt b/src/mailman/rules/docs/news-moderation.rst
index c695740fa..c695740fa 100644
--- a/src/mailman/rules/docs/news-moderation.txt
+++ b/src/mailman/rules/docs/news-moderation.rst
diff --git a/src/mailman/rules/docs/no-subject.txt b/src/mailman/rules/docs/no-subject.rst
index 4876bc82c..4876bc82c 100644
--- a/src/mailman/rules/docs/no-subject.txt
+++ b/src/mailman/rules/docs/no-subject.rst
diff --git a/src/mailman/rules/docs/recipients.txt b/src/mailman/rules/docs/recipients.rst
index aabf397a5..aabf397a5 100644
--- a/src/mailman/rules/docs/recipients.txt
+++ b/src/mailman/rules/docs/recipients.rst
diff --git a/src/mailman/rules/docs/rules.txt b/src/mailman/rules/docs/rules.rst
index 3c2eab04d..3c2eab04d 100644
--- a/src/mailman/rules/docs/rules.txt
+++ b/src/mailman/rules/docs/rules.rst
diff --git a/src/mailman/rules/docs/suspicious.txt b/src/mailman/rules/docs/suspicious.rst
index 9eb8ae7ae..9eb8ae7ae 100644
--- a/src/mailman/rules/docs/suspicious.txt
+++ b/src/mailman/rules/docs/suspicious.rst
diff --git a/src/mailman/rules/docs/truth.txt b/src/mailman/rules/docs/truth.rst
index c715b98aa..c715b98aa 100644
--- a/src/mailman/rules/docs/truth.txt
+++ b/src/mailman/rules/docs/truth.rst
diff --git a/src/mailman/runners/docs/OVERVIEW.txt b/src/mailman/runners/docs/OVERVIEW.rst
index 41ccc18c9..41ccc18c9 100644
--- a/src/mailman/runners/docs/OVERVIEW.txt
+++ b/src/mailman/runners/docs/OVERVIEW.rst
diff --git a/src/mailman/runners/docs/archiver.txt b/src/mailman/runners/docs/archiver.rst
index a6f5ccd24..a6f5ccd24 100644
--- a/src/mailman/runners/docs/archiver.txt
+++ b/src/mailman/runners/docs/archiver.rst
diff --git a/src/mailman/runners/docs/command.txt b/src/mailman/runners/docs/command.rst
index f2fa86fcf..f2fa86fcf 100644
--- a/src/mailman/runners/docs/command.txt
+++ b/src/mailman/runners/docs/command.rst
diff --git a/src/mailman/runners/docs/digester.txt b/src/mailman/runners/docs/digester.rst
index 5a20db556..5a20db556 100644
--- a/src/mailman/runners/docs/digester.txt
+++ b/src/mailman/runners/docs/digester.rst
diff --git a/src/mailman/runners/docs/incoming.txt b/src/mailman/runners/docs/incoming.rst
index df45d4716..df45d4716 100644
--- a/src/mailman/runners/docs/incoming.txt
+++ b/src/mailman/runners/docs/incoming.rst
diff --git a/src/mailman/runners/docs/lmtp.txt b/src/mailman/runners/docs/lmtp.rst
index 1ab42410b..1ab42410b 100644
--- a/src/mailman/runners/docs/lmtp.txt
+++ b/src/mailman/runners/docs/lmtp.rst
diff --git a/src/mailman/runners/docs/news.txt b/src/mailman/runners/docs/news.rst
index 71febf95c..71febf95c 100644
--- a/src/mailman/runners/docs/news.txt
+++ b/src/mailman/runners/docs/news.rst
diff --git a/src/mailman/runners/docs/outgoing.txt b/src/mailman/runners/docs/outgoing.rst
index b1ffb06a0..b1ffb06a0 100644
--- a/src/mailman/runners/docs/outgoing.txt
+++ b/src/mailman/runners/docs/outgoing.rst
diff --git a/src/mailman/runners/docs/rest.txt b/src/mailman/runners/docs/rest.rst
index 9e8851eca..9e8851eca 100644
--- a/src/mailman/runners/docs/rest.txt
+++ b/src/mailman/runners/docs/rest.rst