3 files changed, 8 insertions, 8 deletions

diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index e3c6e607c..e36d33c10 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -27,11 +27,10 @@
 # a human.
 site_owner: changeme@example.com
 
-# This address is used as the from address whenever a message comes from some
-# entity to which there is no natural reply recipient.  Set this to a real
-# human or to /dev/null.  It will be appended with the host name of the list
-# involved.  This address must not bounce and it must not point to a Mailman
-# process.
+# This is the local-part of an email address used in the From field whenever a
+# message comes from some entity to which there is no natural reply recipient.
+# Mailman will append '@' and the host name of the list involved.  This
+# address must not bounce and it must not point to a Mailman process.
 noreply_address: noreply
 
 # The default language for this server.
diff --git a/src/mailman/docs/ACKNOWLEDGMENTS.rst b/src/mailman/docs/ACKNOWLEDGMENTS.rst
index b6c6cc16c..740dfcb27 100644
--- a/src/mailman/docs/ACKNOWLEDGMENTS.rst
+++ b/src/mailman/docs/ACKNOWLEDGMENTS.rst
@@ -58,6 +58,7 @@ code, and have assigned copyright for contributions to the FSF:
 * Simone Piunno
 * Claudia Schmidt
 * Andreas Schosser
+* Stephen J. Turnbull
 * Richard Wackerbarth
 
 
diff --git a/src/mailman/testing/testing.cfg b/src/mailman/testing/testing.cfg
index 0be01298b..141d74a8f 100644
--- a/src/mailman/testing/testing.cfg
+++ b/src/mailman/testing/testing.cfg
@@ -18,9 +18,9 @@
 # A testing configuration.
 
 # For testing against PostgreSQL.
-[database]
-class: mailman.database.postgresql.PostgreSQLDatabase
-url: postgres://barry:barry@localhost/mailman
+# [database]
+# class: mailman.database.postgresql.PostgreSQLDatabase
+# url: postgres://barry:barry@localhost/mailman
 
 [mailman]
 site_owner: noreply@example.com