1 files changed, 4 insertions, 11 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 0fe290c17..5979ae645 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -321,9 +321,9 @@ VERBATIM_ENCODING = ['iso-2022-jp']
 # delivery to the list via the smtpd, and to an individual user.  This value
 # must be a string naming a module in the Mailman.Handlers package.
 #
-# SECURITY WARNING: The Sendmail module is not secure!  Please read the
-# comments in Mailman/Handlers/Sendmail.py for details.  Use at your own
-# risk.  SMTPDirect is recommended.
+# WARNING: Sendmail has security holes and should be avoided.  In fact, you
+# must read the Mailman/Handlers/Sendmail.py file before it will work for
+# you.
 #
 #DELIVERY_MODULE = 'Sendmail'
 DELIVERY_MODULE = 'SMTPDirect'
@@ -656,14 +656,6 @@ DEFAULT_SERVER_LANGUAGE = 'en'
 # spoofed messages may get through.
 USE_ENVELOPE_SENDER = 0
 
-# When true, Mailman will consider user@host.domain to be the same address as
-# user@domain.  If set to 0, Mailman will consider user@host.domain to be the
-# same address as user@Host.DoMain, but different than user@domain.  Usernames
-# will always be case preserved, and host parts of addresses will all be
-# lowercased.
-# FIXME: NOT ALWAYS THE RIGHT THING TO DO FOR COUNTRY CODE TLDS
-SMART_ADDRESS_MATCH = 1
-
 # How many members to display at a time on the admin cgi to unsubscribe them
 # or change their options?
 DEFAULT_ADMIN_MEMBER_CHUNKSIZE = 30
@@ -1161,6 +1153,7 @@ add_language('cs',   _('Czech'),               'iso-8859-2')
 add_language('de',   _('German'),              'iso-8859-1')
 add_language('en',   _('English (USA)'),       'us-ascii')
 add_language('es',   _('Spanish (Spain)'),     'iso-8859-1')
+add_language('et',   _('Estonian'),            'iso-8859-15')
 add_language('fi',   _('Finnish'),             'iso-8859-1')
 add_language('fr',   _('French'),              'iso-8859-1')
 add_language('gb',   _('Simplified Chinese'),  'gb2312')