6 files changed, 32 insertions, 27 deletions

diff --git a/src/mailman/docs/DATABASE.rst b/src/mailman/docs/DATABASE.rst
index f5fe39849..762d60a11 100644
--- a/src/mailman/docs/DATABASE.rst
+++ b/src/mailman/docs/DATABASE.rst
@@ -8,10 +8,10 @@ however, Storm is compatible with PostgreSQL_ and MySQL, among possibly
 others.
 
 Currently, Mailman is known to work with either the default SQLite3 database,
-or PostgreSQL.  (Volunteers to port it to MySQL are welcome!).  If you want to
-use SQLite3, you generally don't need to change anything, but if you want
-Mailman to use PostgreSQL, you'll need to set that up first, and then change a
-configuration variable in your `/etc/mailman.cfg` file.
+or PostgreSQL.  (Volunteers to port it to other databases are welcome!).  If
+you want to use SQLite3, you generally don't need to change anything, but if
+you want Mailman to use PostgreSQL, you'll need to set that up first, and then
+change a configuration variable in your `/etc/mailman.cfg` file.
 
 Two configuration variables control which database Mailman uses.  The first
 names the class implementing the database interface.  The second names the
diff --git a/src/mailman/docs/INTRODUCTION.rst b/src/mailman/docs/INTRODUCTION.rst
index fd64efb42..11d13c239 100644
--- a/src/mailman/docs/INTRODUCTION.rst
+++ b/src/mailman/docs/INTRODUCTION.rst
@@ -53,8 +53,8 @@ Warsaw, Ken Manheimer, Scott Cotton, Harald Meland, and John Viega.  Version
 1.0 and beyond have been primarily maintained by Barry Warsaw with
 contributions from many; see the ACKNOWLEDGMENTS file for details.  Jeremy
 Hylton helped considerably with the Pipermail code in Mailman 2.0.  Mailman
-2.1 is primarily maintained by Mark Sapiro and Tokio Kikuchi.  Barry Warsaw is
-the lead developer on Mailman 3.
+2.1 is primarily maintained by Mark Sapiro, with previous help by Tokio
+Kikuchi.  Barry Warsaw is the lead developer on Mailman 3.
 
 
 Help
diff --git a/src/mailman/docs/MTA.rst b/src/mailman/docs/MTA.rst
index f541d3838..c6d2230c4 100644
--- a/src/mailman/docs/MTA.rst
+++ b/src/mailman/docs/MTA.rst
@@ -2,9 +2,10 @@
 Hooking up your mail server
 ===========================
 
-Mailman needs to be hooked up to your mail server both to accept incoming mail
-and to deliver outgoing mail.  Mailman itself never delivers messages to the
-end user; it lets its immediate upstream mail server do that.
+Mailman needs to be hooked up to your mail server (a.k.a. *mail transport
+agent* or *MTA*) both to accept incoming mail and to deliver outgoing mail.
+Mailman itself never delivers messages to the end user; it lets its immediate
+upstream mail server do that.
 
 The preferred way to allow Mailman to accept incoming messages from your mail
 server is to use the `Local Mail Transfer Protocol`_ (LMTP_) interface.  Most
@@ -32,6 +33,9 @@ Contributions are welcome!
 Postfix
 =======
 
+Postfix_ is an open source mail server by Wietse Venema.
+
+
 Mailman settings
 ----------------
 
@@ -58,9 +62,9 @@ as shown above.
 Basic Postfix connections
 -------------------------
 
-There are several ways to hook Postfix_ up to Mailman, so here are the
-simplest instructions.  The following settings should be added to Postfix's
-`main.cf` file.
+There are several ways to hook Postfix up to Mailman, so here are the simplest
+instructions.  The following settings should be added to Postfix's `main.cf`
+file.
 
 Mailman supports a technique called `Variable Envelope Return Path`_ (VERP) to
 disambiguate and accurately record bounces.  By default Mailman's VERP
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 06e0afa1d..9b98742c8 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -10,7 +10,7 @@ Here is a history of user visible changes to Mailman.
 
 3.0 beta 2 -- "Freeze"
 ======================
-(20XX-XX-XX)
+(2012-09-05)
 
 Architecture
 ------------
@@ -19,13 +19,15 @@ Architecture
    address).  This is because while the posting address can change if the
    mailing list is moved to a new server, the list id is fixed.
    (LP: #1024509)
-   + IListManager.get_by_list_id() added.
-   + IListManager.list_ids added.
-   + IMailingList.list_id added.
-   + Several internal APIs that accepted fqdn list names now require list ids,
+
+   - IListManager.get_by_list_id() added.
+   - IListManager.list_ids added.
+   - IMailingList.list_id added.
+   - Several internal APIs that accepted fqdn list names now require list ids,
      e.g. ISubscriptionService.join() and .find_members().
-   + IMember.list_id attribute added; .mailing_list is now an alias that
+   - IMember.list_id attribute added; .mailing_list is now an alias that
      retrieves and returns the IMailingList.
+
  * `passlib`_ is now used for all password hashing instead of flufl.password.
    The default hash is `sha512_crypt`.  (LP: #1015758)
  * Internally, all datetimes are kept in the UTC timezone, however because of
@@ -72,6 +74,7 @@ Architecture
 Database
 --------
  * Schema migrations (LP: #971013)
+
    - mailinglist.include_list_post_header -> allow_list_posts
    - mailinglist.news_prefix_subject_too  -> nntp_prefix_subject_too
    - mailinglist.news_moderation          -> newsgroup_moderation
@@ -79,6 +82,7 @@ Database
      into archive_policy.
    - mailinglist.nntp_host has been removed.
    - mailinglist.generic_nonmember_action has been removed (LP: #975696)
+
  * Schema migrations (LP: #1024509)
    - member.mailing_list -> list_id
  * The PostgreSQL port of the schema accidentally added a moderation_callback
diff --git a/src/mailman/docs/START.rst b/src/mailman/docs/START.rst
index 57df48e30..da76feae0 100644
--- a/src/mailman/docs/START.rst
+++ b/src/mailman/docs/START.rst
@@ -9,11 +9,8 @@ Beta Release
 ============
 
 This is a beta release.  The developers believe it has sufficient
-functionality to provide full services to a mailing list, but it is not ready
-for production yet.  Interfaces and administration may differ substantially
-from the alpha series, but changes should be incremental going forward from
-beta 1.  Changes from the alpha series will be described in notes to the main
-text.
+functionality to provide full mailing list services, but it is not yet ready
+for production use.
 
 The Mailman 3 beta releases are being provided to give developers and other
 interested people an early look at the next major version, and site
@@ -40,9 +37,9 @@ $PATH or it can be accessible via the ``python2.6`` or ``python2.7`` binary.
 If your operating system does not include Python, see http://www.python.org
 downloading and installing it from source.  Python 3 is not yet supported.
 
-In this documentation, a bare ``python`` refers to the python used to invoke
-``bootstrap.py``, which might be ``python2.6`` or ``python2.7``, as well as
-the system ``python`` or an absolute path.
+In this documentation, a bare ``python`` refers to the Python executable used
+to invoke ``bootstrap.py``, which might be ``python2.6`` or ``python2.7``, as
+well as the system ``python`` or an absolute path.
 
 Mailman 3 is now based on the `zc.buildout`_ infrastructure, which greatly
 simplifies building and testing Mailman.
diff --git a/src/mailman/docs/STYLEGUIDE.rst b/src/mailman/docs/STYLEGUIDE.rst
index 32b2da72f..b744c6557 100644
--- a/src/mailman/docs/STYLEGUIDE.rst
+++ b/src/mailman/docs/STYLEGUIDE.rst
@@ -2,7 +2,7 @@
 GNU Mailman Coding Style Guide
 ==============================
 
-Copyright (C) 2002-2011 Barry A. Warsaw
+Copyright (C) 2002-2012 Barry A. Warsaw
 
 
 Python coding style guide for GNU Mailman