2 files changed, 5 insertions, 5 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 2608a76ab..665f1ca72 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -119,11 +119,11 @@ DEFAULT_MAX_NUM_RECIPIENTS = 10
 DEFAULT_MAX_MESSAGE_SIZE = 40		# KB
 
 # These format strings will be expanded w.r.t. the dictionary for the
-# maillist instance.
+# mailing list instance.
 DEFAULT_SUBJECT_PREFIX  = "[%(real_name)s] "
 DEFAULT_MSG_HEADER = ""
 DEFAULT_MSG_FOOTER = """_______________________________________________
-%(real_name)s maillist  -  %(real_name)s@%(host_name)s
+%(real_name)s mailing list  -  %(real_name)s@%(host_name)s
 %(web_page_url)slistinfo/%(_internal_name)s
 """
 
@@ -147,7 +147,7 @@ DEFAULT_REQUIRE_EXPLICIT_DESTINATION = 1
 # Alternate names acceptable as explicit destinations for this list.
 DEFAULT_ACCEPTABLE_ALIASES ="""
 """
-# For maillists that have only other maillists for members:
+# For mailing lists that have only other mailing lists for members:
 DEFAULT_UMBRELLA_LIST = 0
 # For umbrella lists, the suffix for the account part of address for
 # administrative notices (subscription confirmations, password reminders):
diff --git a/Mailman/Digester.py b/Mailman/Digester.py
index 17e57028f..fe3ca7dd9 100644
--- a/Mailman/Digester.py
+++ b/Mailman/Digester.py
@@ -29,7 +29,7 @@ import mm_cfg
 # See templates/masthead.txt
 # XXX: this needs conversion
 DIGEST_MASTHEAD = """
-Send %(real_name)s maillist submissions to
+Send %(real_name)s mailing list submissions to
 	%(got_list_email)s
 
 To subscribe or unsubscribe via the web, visit
@@ -304,7 +304,7 @@ class Digester:
                                remove_to=1, tmpfile_prefix = "mime.")
 
 class Digest:
-    "Represent a maillist digest, presentable in either plain or mime format."
+    "Represent a list digest, presentable in either plain or mime format."
     def __init__(self, list, toc, body):
         self.list = list
         self.toc = toc