3 files changed, 26 insertions, 33 deletions

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/docs/ACKNOWLEDGMENTS.rst b/src/mailman/docs/ACKNOWLEDGMENTS.rst
index bb971a91d..36a386b57 100644
--- a/src/mailman/docs/ACKNOWLEDGMENTS.rst
+++ 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.rst b/src/mailman/docs/INTRODUCTION.rst
index b7a247de4..e67439613 100644
--- a/src/mailman/docs/README.rst
+++ 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/*