Index: mailman/NEWS
===================================================================
RCS file: /cvsroot/mailman/mailman/NEWS,v
retrieving revision 2.45
diff -u -r2.45 NEWS
--- mailman/NEWS	8 Feb 2003 16:27:15 -0000	2.45
+++ mailman/NEWS	29 Aug 2003 06:28:56 -0000
@@ -20,6 +20,8 @@
       attachments would screw up plaintext digests.  MIME digests
       include the attachments inline.
 
+    - Deprecated: encode_ascii_prefixes. 
+
 2.1 final (30-Dec-2002)
 
     Last minute bug fixes and language updates.
Index: mailman/Mailman/MailList.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailList.py,v
retrieving revision 2.108
diff -u -r2.108 MailList.py
--- mailman/Mailman/MailList.py	6 Jun 2003 18:24:28 -0000	2.108
+++ mailman/Mailman/MailList.py	29 Aug 2003 06:28:56 -0000
@@ -372,12 +372,6 @@
         self.subject_prefix = mm_cfg.DEFAULT_SUBJECT_PREFIX % self.__dict__
         self.msg_header = mm_cfg.DEFAULT_MSG_HEADER
         self.msg_footer = mm_cfg.DEFAULT_MSG_FOOTER
-        # Set this to Never if the list's preferred language uses us-ascii,
-        # otherwise set it to As Needed
-        if Utils.GetCharSet(self.preferred_language) == 'us-ascii':
-            self.encode_ascii_prefixes = 0
-        else:
-            self.encode_ascii_prefixes = 2
 
 
     #
Index: mailman/Mailman/versions.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/versions.py,v
retrieving revision 2.38
diff -u -r2.38 versions.py
--- mailman/Mailman/versions.py	19 Oct 2002 17:27:15 -0000	2.38
+++ mailman/Mailman/versions.py	29 Aug 2003 06:28:56 -0000
@@ -63,6 +63,8 @@
                  'minimum_post_count_before_bounce_action',
                  'automatic_bounce_action',
                  'max_posts_between_bounces',
+                 # deprecated (2.1.2)
+                 'encode_ascii_prefixes',
                  ):
         if hasattr(mlist, name):
             delattr(mlist, name)
@@ -386,12 +388,6 @@
     add_only_if_missing('emergency', 0)
     add_only_if_missing('hold_and_cmd_autoresponses', {})
     add_only_if_missing('news_prefix_subject_too', 1)
-    # Should prefixes be encoded?
-    if Utils.GetCharSet(l.preferred_language) == 'us-ascii':
-        encode = 0
-    else:
-        encode = 2
-    add_only_if_missing('encode_ascii_prefixes', encode)
     add_only_if_missing('news_moderation', 0)
 
 
Index: mailman/Mailman/Gui/Language.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Gui/Language.py,v
retrieving revision 2.7
diff -u -r2.7 Language.py
--- mailman/Mailman/Gui/Language.py	7 Dec 2002 16:36:30 -0000	2.7
+++ mailman/Mailman/Gui/Language.py	29 Aug 2003 06:28:56 -0000
@@ -85,32 +85,6 @@
              Note that the
              <a href="?VARHELP=language/preferred_language">default
              language</a> must be included.''')),
-
-            ('encode_ascii_prefixes', mm_cfg.Radio,
-             (_('Never'), _('Always'), _('As needed')), 0,
-             _("""Encode the
-             <a href="?VARHELP=general/subject_prefix">subject
-             prefix</a> even when it consists of only ASCII characters?"""),
-
-             _("""If your mailing list's default language uses a non-ASCII
-             character set and the prefix contains non-ASCII characters, the
-             prefix will always be encoded according to the relevant
-             standards.  However, if your prefix contains only ASCII
-             characters, you may want to set this option to <em>Never</em> to
-             disable prefix encoding.  This can make the subject headers
-             slightly more readable for users with mail readers that don't
-             properly handle non-ASCII encodings.
-
-             <p>Note however, that if your mailing list receives both encoded
-             and unencoded subject headers, you might want to choose <em>As
-             needed</em>.  Using this setting, Mailman will not encode ASCII
-             prefixes when the rest of the header contains only ASCII
-             characters, but if the original header contains non-ASCII
-             characters, it will encode the prefix.  This avoids an ambiguity
-             in the standards which could cause some mail readers to display
-             extra, or missing spaces between the prefix and the original
-             header.""")),
-
             ]
 
     def _setValue(self, mlist, property, val, doc):
Index: mailman/doc/mailman-admin.tex
===================================================================
RCS file: /cvsroot/mailman/mailman/doc/mailman-admin.tex,v
retrieving revision 1.6
diff -u -r1.6 mailman-admin.tex
--- mailman/doc/mailman-admin.tex	8 Feb 2003 04:38:51 -0000	1.6
+++ mailman/doc/mailman-admin.tex	29 Aug 2003 06:28:59 -0000
@@ -661,26 +661,6 @@
     Select any language that you'd either like your members to be able
     to view the list in, or that you'd like to be able to use in your
     list's \code{preferred_language} variable.
-
-\item[encode_ascii_prefixes]
-    If your mailing list's preferred language uses a non-ASCII
-    character set and the \code{subject_prefix} contains non-ASCII
-    characters, the prefix will always be encoded according to the
-    relevant standards.  However, if your subject prefix contains only
-    ASCII characters, you may want to set this option to \emph{Never}
-    to disable prefix encoding.  This can make the subject headers
-    slightly more readable for users with mail readers that don't
-    properly handle non-ASCII encodings.
-
-    Note however, that if your mailing list receives both encoded and
-    unencoded subject headers, you might want to choose \emph{As
-    needed}.  Using this setting, Mailman will not encode ASCII
-    prefixes when the rest of the header contains only ASCII
-    characters, but if the original header contains non-ASCII
-    characters, it will encode the prefix.  This avoids an ambiguity
-    in the standards which could cause some mail readers to display
-    extra, or missing spaces between the prefix and the original
-    header.
 \end{description}
 
 \subsection{The Membership Management Category}