Merged A.M. Kuchling's 'Small Fixes' branch

9 files changed, 36 insertions, 49 deletions

diff --git a/FAQ b/FAQ
index f064ac72..2dacb43f 100644
--- a/FAQ
+++ b/FAQ
@@ -24,10 +24,11 @@ A. What's likely happening is that your MTA is doing DNS resolution on
    turn off synchronous DNS resolution for messages originating from
    the local host.
 
-   In Exim, the value to edit is receiver_verify_hosts.  See
-   README.EXIM for details.  Other MTAs have (of course) different
-   parameters and defaults that control this.  First check the README
-   file for your MTA and then consult your MTA's own documentation.
+   In Exim, the value to edit is receiver_verify_hosts.  Consult the
+   Mailman Installation Manual for details.  Other MTAs have (of
+   course) different parameters and defaults that control this.  First
+   check the README file for your MTA and then consult your MTA's own
+   documentation.
 
 Q. My list members are complaining about Mailman's List-* headers!
    What can I do about this?
@@ -83,7 +84,7 @@ A. The most likely cause of this is that the GID that is compiled into
    (The distributed syslog.conf forwards the message to the loghost,
    when present.  See the syslog man page for more details.)
 
-   If your system is set like this, and you get a failure trying to
+   If your system is set up like this, and you get a failure trying to
    visit the mailman/listinfo web page, and it's due to a UID or GID
    mismatch, then you should get an entry at the end of
    /var/log/syslog identifying the expected and received values.
@@ -131,12 +132,7 @@ A. Make sure that you are using "preline" before calling the "mailman"
        From somebody Mon Oct  9 12:27:34 MDT 2000
 
    before every message and re-running the archive command
-   "bin/arch listname".  The archives should now exist.  See README.QMAIL
-   for more information.
-
-Q. Still having problems?  Running on GNU/Linux?
-
-A. See the README.LINUX file.
+   "bin/arch listname".  The archives should now exist.
 
 Q. I want to get rid of some messages in my archive.  How do I do
    this?
diff --git a/INSTALL b/INSTALL
index 9485a392..7edbfe18 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,13 +6,13 @@ The installation and upgrading instructions are now completely contained in
 the Mailman Installation Guide.  Web, PostScript, PDF, and plaintext formats
 for this guide are available both within this source distribution and online.
 
-All manuals within this source distribution are provided in the admin/www
+All manuals within this source distribution are provided in the doc/
 directory:
 
-    HTML        : admin/www/mailman-install/index.html
-    PostScript  : admin/www/mailman-install.ps
-    PDF         : admin/www/mailman-install.pdf
-    plain text  : admin/www/mailman-install.txt
+    HTML        : doc/mailman-install/index.html
+    PostScript  : doc/mailman-install.ps
+    PDF         : doc/mailman-install.pdf
+    plain text  : doc/mailman-install.txt
 
 Or go online at http://www.list.org/site.html to find the online installation
 guide.
diff --git a/NEWS b/NEWS
index 5c7d0b2e..e69ee336 100644
--- a/NEWS
+++ b/NEWS
@@ -433,7 +433,7 @@ Internationalization
   Documentation
 
     - Most of the installation instructions have been moved to a latex
-      document.  See admin/www/mailman-install/index.html for details.
+      document.  See doc/mailman-install/index.html for details.
 
   Bug fixes and other patches
 
@@ -1947,7 +1947,7 @@ Internationalization
 
 2.0 release candidate 2 (10-Nov-2000)
 
-    - Documentation updates: start at admin/www/index.html
+    - Documentation updates: start in the doc/ directory.
 
     - bin/withlist accepts additional command line arguments when used
       with the --run flag; bin/mmsitepass and bin/newlist accept
diff --git a/README b/README
index 25175457..fe3a05b2 100644
--- a/README
+++ b/README
@@ -29,19 +29,15 @@ INTRODUCTION
         http://www.gnu.org/software/mailman
         http://mailman.sf.net
 
-    Mailman 2.1 requires Python 2.1.3 or greater, which can be downloaded from:
+    Mailman 2.1 requires Python 2.3 or greater, which can be downloaded from:
 
         http://www.python.org
 
-    It is recommended that you use Python 2.3.3, the latest release as of this
-    writing (31-Dec-2003).  Update: 15-May-2004, the Python 2.3.4 release is
-    imminent, see:
+    It is recommended that you use Python 2.5.2, the latest release as of this
+    writing (26-Feb-2008).  
 
-        http://www.python.org/2.3.4
-
-    Mailman will work with Python 2.2.3 as well, which is the latest release
-    on the Python 2.2 branch.  Mailman 2.1 is not compatible with Python 2.0
-    or any earlier version.
+    Mailman 2.1 is not compatible with Python 2.2 or any earlier
+    version.
 
     You will also need an ANSI C compiler to build both Python and Mailman;
     gcc (the GNU C compiler) works just fine.  Mailman currently works only on
@@ -59,7 +55,7 @@ FEATURES
     Read the NEWS file for a list of changes since version 0.9.  Read the TODO
     file for our (extensive) wish list.  You can see Mailman 2.1 in action at:
 
-        http://mail.python.org/mailman-21/listinfo
+        http://mail.python.org/mailman/listinfo
 
     Mailman has most of the standard features you'd expect in a mailing list
     manager, and more:
@@ -118,7 +114,7 @@ FOR MORE INFORMATION
 
     The online documentation can be found in
 
-        file:admin/www/index.html
+        file:doc/
 
     in the directory in which you unpacked Mailman.
 
@@ -131,7 +127,7 @@ FOR MORE INFORMATION
     to help you get going with Mailman.
 
     Mailman-Users
-        An list for users of Mailman, for posting questions or problems
+        A list for users of Mailman, for posting questions or problems
         related to installation, use, etc.  We'll try to keep the deep
         technical discussions off this list.
 
@@ -146,22 +142,17 @@ FOR MORE INFORMATION
         http://listowner.org
 
     Mailman-Announce
-        A read-only list for release announcements an other important news.
+        A read-only list for release announcements and other important news.
 
         http://mail.python.org/mailman/listinfo/mailman-announce
 
     Mailman-Developers
         A list for those of you interested in helping develop Mailman 2's
-        future direction.  This list will contain in-depth technical
+        future direction.  This list contains in-depth technical
         discussions.
 
         http://mail.python.org/mailman/listinfo/mailman-developers
 
-    Mailman3-Dev
-        Get involved now in the development of Mailman 3!
-
-        http://mail.python.org/mailman/listinfo/mailman3-dev
-
     Mailman-I18N
         A list for the discussion of the Mailman internationalization
         effort.  Mailman 2.1 is fully multi-lingual.
@@ -169,7 +160,7 @@ FOR MORE INFORMATION
         http://mail.python.org/mailman/listinfo/mailman-i18n
 
     Mailman-Checkins
-        A read-only list which is an adjunct to the public anonymous CVS
+        A read-only list which is an adjunct to the Bazaar
         repository.  You can stay on the bleeding edge of Mailman development
         by subscribing to this list.
 
diff --git a/STYLEGUIDE.txt b/STYLEGUIDE.txt
index 16663c90..94debfdf 100644
--- a/STYLEGUIDE.txt
+++ b/STYLEGUIDE.txt
@@ -10,7 +10,7 @@ This document contains a style guide for Python programming, as used in
 Mailman.  In general, Guido van Rossum's style guide should be taken as a
 basis, as embodied in PEP 8:
 
-    http://www.python.org/peps/pep-0008.html
+    http://www.python.org/dev/peps/pep-0008/
 
 however, my (Barry Warsaw's) personal preferences differ from Guido's in a few
 places.  "When in Rome..." should apply meaning, when coding stuff for Python,
diff --git a/TODO b/TODO
index 0882fa09..785244b9 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,7 @@ The Mailman Wishlist
 
     Please also see the Mailman design notes wiki at
 
-    http://www.zope.org/Members/bwarsaw/MailmanDesignNotes/FrontPage
+    http://wiki.list.org/display/DEV/Home
 
 Email Handling
     - Re-implement the bulk mailer to do DNS lookups and remote MTA
diff --git a/UPGRADING b/UPGRADING
index 6f8ede6e..c6a19882 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -38,7 +38,7 @@ UPGRADING FROM 2.1.4 to 2.1.5
     site before you upgrade.  BE SURE TO TURN OFF MAILMAN AS DESCRIBED ABOVE
     BEFORE YOU UPGRADE.
 
-    Specifically, in MM2.1.4 every message in the queues were represented by
+    Specifically, in MM2.1.4 every message in the queues was represented by
     two files, a .msg or .pck file containing the email message, and a .db
     file containing metadata about the message.  In MM2.1.5 this has been made
     more efficient by using only one file (with a .pck extension) for both the
@@ -74,7 +74,7 @@ UPGRADING FROM 2.0.x to 2.1
 
     Check especially the values for (in Privacy -> Sender Filters)
     default_member_moderation, generic_nonmember_action, and
-    accept_these_nonmembers.  Check also the moderation flag on member
+    accept_these_nonmembers.  Also check the moderation flag on member
     accounts in the Membership Management screen.
 
     In Mailman 2.1, the qrunner subsystem has been completely
@@ -88,14 +88,14 @@ UPGRADING FROM 2.0.x to 2.1
     pre-MM2.1alpha2 system to a post-MM2.1alpha2 system that you let
     the old qrunner process clear any and all messages sitting in the
     qfiles/ directory *BEFORE* you upgrade.  Otherwise after the
-    upgrade, those messages will not get delivered, and I'm not
-    exactly sure yet how to upgrade those pending messages.
+    upgrade, those messages will not get delivered, and there is no
+    easy way to upgrade those pending messages.
 
     NOTE: When upgrading to Mailman 2.1, you will need to regenerate
     your aliases files.  There have been many changes to the alias
     names, the programs they map to, and the name of the wrapper
-    script.  See README.<yourMTA> for details of making Mailman work
-    with your mail server.
+    script.  See the Mailman Installation Manual for details of making
+    Mailman work with your mail server.
 
     To regenerate your aliases, use the bin/genaliases script.
 
@@ -119,7 +119,7 @@ UPGRADING FROM 2.0.x to 2.1
     Here are some instances we know about:
 
     - If you've applied patch #413752 (coerce to plaintext), then your
-      upgraded will not go smoothly.  Take a look at patch #651406 for
+      upgrade will not go smoothly.  Take a look at patch #651406 for
       an unofficial solution.
 
       http://sf.net/tracker/?group_id=103&atid=300103&func=detail&aid=413752
diff --git a/messages/hu/README.hu b/messages/hu/README.hu
index 4638b78e..3375ece6 100644
--- a/messages/hu/README.hu
+++ b/messages/hu/README.hu
@@ -194,7 +194,7 @@ EGYÉB INFORMÁCIÓK
 
     Az online dokumentáció elérhetõ a kicsomagolt Mailman könyvtárban a
 
-        file:admin/www/index.html
+        file:doc/
 
     címen.
 
diff --git a/messages/ja/README b/messages/ja/README
index a163742c..ccef7b7f 100644
--- a/messages/ja/README
+++ b/messages/ja/README
@@ -193,7 +193,7 @@ Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
 
     ¥ª¥ó¥é¥¤¥óʸ½ñ¤Ï, ¤¢¤Ê¤¿¤¬ Mailman ¤ò³«¤¤¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Î
 
-        file:admin/www/index.html
+        file:doc/
 
     ¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹.