diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Mailman/Cgi/private.py | 2 | ||||
| -rw-r--r-- | Mailman/HTMLFormatter.py | 6 | ||||
| -rw-r--r-- | Mailman/MailCommandHandler.py | 2 | ||||
| -rw-r--r-- | Mailman/MailList.py | 29 | ||||
| -rw-r--r-- | NEWS | 16 | ||||
| -rw-r--r-- | README | 13 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | scripts/mailowner | 2 | ||||
| -rwxr-xr-x | scripts/owner | 2 | ||||
| -rw-r--r-- | templates/masthead.txt | 2 |
11 files changed, 43 insertions, 37 deletions
@@ -257,7 +257,7 @@ if you want to keep your existing installation intact. % $prefix/bin/mmsitepass <your-site-password> This password can be used anywhere that individual user or - maillist administrator passwords are required, giving the + mailing list administrator passwords are required, giving the mailman site administrator the ability to adjust these things when necessary. diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py index a52af90f2..0fbdcede0 100644 --- a/Mailman/Cgi/private.py +++ b/Mailman/Cgi/private.py @@ -74,7 +74,7 @@ login_attempted = 0 _list = None def GetListobj(list_name): - """Return an unlocked instance of the named maillist, if found.""" + """Return an unlocked instance of the named mailing list, if found.""" global _list if _list: return _list diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index e1bded148..4cf695cb6 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -153,8 +153,8 @@ class HTMLFormatter: def FormatUmbrellaNotice(self, user, type): if self.umbrella_list: - return ("(Note - you are subscribing to a list of maillists, so" - " the %s notice will be sent to the admin address" + return ("(Note - you are subscribing to a list of mailing lists," + " so the %s notice will be sent to the admin address" " for your membership, %s.)<p>" % (type, self.GetMemberAdminEmail(user))) else: @@ -201,7 +201,7 @@ class HTMLFormatter: if self.umbrella_list: msg = msg + ("<p>(Note that this is an umbrella list, intended to" - " have only other maillists as members. Among" + " have only other mailing lists as members. Among" " other things, this means that your confirmation" " request will be sent to the '%s' account for" " your address.)" % self.umbrella_member_suffix) diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py index 74cdb9eab..c7ec1db1c 100644 --- a/Mailman/MailCommandHandler.py +++ b/Mailman/MailCommandHandler.py @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""Process maillist user commands arriving via email.""" +"""Process mailing list user commands arriving via email.""" # Try to stay close to majordomo commands, but accept common mistakes. # Not implemented: get / index / which. diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 37bfd5b59..d43025283 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -119,10 +119,10 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, def GetMemberAdminEmail(self, member): """Usually the member addr, but modified for umbrella lists. - Umbrella lists have other maillists as members, and so admin stuff + Umbrella lists have other mailing lists as members, and so admin stuff like confirmation requests and passwords must not be sent to the - member addresses - the sublists - but rather to the administrators - of the sublists. This routine picks the right address, considering + member addresses - the sublists - but rather to the administrators of + the sublists. This routine picks the right address, considering regular member address to be their own administrative addresses. """ @@ -362,8 +362,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, ('description', mm_cfg.String, 50, 0, 'A terse phrase identifying this list.', - "This description is used when the maillist is listed with" - " other maillists, or in headers, and so forth. It should" + "This description is used when the mailing list is listed with" + " other mailing lists, or in headers, and so forth. It should" " be as succinct as you can get it, while still identifying" " what the list is."), @@ -384,10 +384,10 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'Prefix for subject line of list postings.', "This text will be prepended to subject lines of messages" - " posted to the list, to distinguish maillist messages in" + " posted to the list, to distinguish mailing list messages in" " in mailbox summaries. Brevity is premium here, it's ok" - " to shorten long maillist names to something more concise," - " as long as it still identifies the maillist."), + " to shorten long mailing list names to something more concise," + " as long as it still identifies the mailing list."), ('welcome_msg', mm_cfg.Text, (4, 50), 0, 'List-specific text prepended to new-subscriber welcome message', @@ -395,7 +395,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, "This value, if any, will be added to the front of the" " new-subscriber welcome message. The rest of the" " welcome message already describes the important addresses" - " and URLs for the maillist, so you don't need to include" + " and URLs for the mailing list, so you don't need to include" " any of that kind of stuff here. This should just contain" " mission-specific kinds of things, like etiquette policies" " or team orientation, or that kind of thing."), @@ -433,7 +433,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, ' directly to user.', "Set this to yes when this list is intended to cascade only to" - " other maillists. When set, meta notices like confirmations" + " other mailing lists. When set, meta notices like confirmations" " and password reminders will be directed to an address derived" " from the member\'s address - it will have the value of" ' \"umbrella_member_suffix\" appended to the' @@ -444,8 +444,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, ' according to setting of previous "umbrella_list" setting.', 'When \"umbrella_list\" is set to indicate that this list has' - " other maillists as members, then administrative notices like" - " confirmations and password reminders need to not be sent" + " other mailing lists as members, then administrative notices" + " like confirmations and password reminders need to not be sent" " to the member list addresses, but rather to the owner of those" " member lists. In that case, the value of this setting is" " appended to the member\'s account name for such notices." @@ -507,7 +507,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'Base URL for Mailman web interface', "This is the common root for all mailman URLs concerning this" - " list. It is also used in the listinfo overview of maillists" + " list. It is also used in the listinfo overview of mailing" + " lists" " to identify whether or not this list resides on the virtual" " host identified by the overview URL - if this value is found" " (anywhere) in the URL, then this list is considered to be" @@ -646,7 +647,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, "Alternate list names (the stuff before the '@') that are to be" " accepted when the explicit-destination constraint (a prior" " option) is active. This enables things like cascading" - " maillists and relays while the constraint is still" + " mailing lists and relays while the constraint is still" " preventing random spams."), ('max_num_recipients', mm_cfg.Number, 3, 0, @@ -285,10 +285,11 @@ DONE for mailman 1.0b3 specific list) - Admin interface broken into sections, with help elaboration for complicated configuration options - Maillist Archives + Mailing List Archives - Integrated with a newer, *much* improved, external pipermail - to be found at http://starship.skyport.net/crew/amk/maintained/pipermail.html - - Private archives protected with maillist members passwords, cookie-fied. + - Private archives protected with mailing list members passwords, + cookie-fied. Spam prevention - New spam prevention measures catch most if not all spam without operator intervention or general constraints on who can post to @@ -299,7 +300,7 @@ DONE for mailman 1.0b3 spam. Other options (forbidden_posters, bounce_matching_headers) provide for filtering of known transgressors. - - Option obscure_addresses (default on) causes maillist subscriber + - Option obscure_addresses (default on) causes mailing list subscriber lists on the web to be slightly mangled so they're not directly recognizable as email address by web spiders, which might be seeking targets for spammers. @@ -396,14 +397,17 @@ DONE for mailman 1.0b3 - Added an option to clobber the date in the archives to the date the list resent the post, so that the archive doesn't get mail from people sending bad dates clumped up at the beginning or end. - - Added automatic error message processing as an option. Currently logging to /tmp/bounce.log + - Added automatic error message processing as an option. Currently + logging to /tmp/bounce.log - Changed archive to take a list as an argument, (the old way was broken) - Remove (ignore) spaces in email addresses - Allow user passwords to be case insensitive. - Removed the cleanup script since it was now redundant. - Fixed archives if there were no archives. - - Added a Lock() call to Load() and Create(). This fixes the problem of loading then locking. - - Removed all occurances of Lock() except for the ones in maillist since creating a list + - Added a Lock() call to Load() and Create(). This fixes the + problem of loading then locking. + - Removed all occurances of Lock() except for the ones in mailing + list since creating a list now implicitly locks it. - Quote single periods in message text. - Made bounce system handle digest users fairly. @@ -105,13 +105,14 @@ How to add a new user option 7) Update templates if the options have replacements 8) Use your option wherever appropriate... -Interactive python sessions with maillists +Interactive python sessions with mailing lists - You can do substantial things with maillists from the interpreter! - Include the mailman homedir on your shell python path, or manually - insert it on sys.path from within python, and import Mailman.MailList - and Mailman.Utils from within the interpreter. You can instantiate - the maillist of your choice, eg for a list named postal: + You can do substantial things with mailing lists from the + interpreter! Include the mailman homedir on your shell python + path, or manually insert it on sys.path from within python, and + import Mailman.MailList and Mailman.Utils from within the + interpreter. You can instantiate the mailing list of your choice, + e.g. for a list named postal: >>> sys.path.insert(0, '/local/mailman') >>> from Mailman import MailList, Utils @@ -118,8 +118,8 @@ The Mailman TODO list - Turn standard mailman exceptions into class exceptions. (In particular, categorize into, eg, message-hold vs other sorts of exceptions.) -- Make error messages indicate the file, maillist, etc at fault, when - possible. +- Make error messages indicate the file, mailing list, etc at fault, + when possible. - Seperate edit-options from the subscribe script. - Remove dead code, etc. diff --git a/scripts/mailowner b/scripts/mailowner index fd5894a36..c3d747d92 100755 --- a/scripts/mailowner +++ b/scripts/mailowner @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""Send a message to the maillist owner. +"""Send a message to the mailing list owner. This script gets called by the wrapper. diff --git a/scripts/owner b/scripts/owner index fd5894a36..c3d747d92 100755 --- a/scripts/owner +++ b/scripts/owner @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""Send a message to the maillist owner. +"""Send a message to the mailing list owner. This script gets called by the wrapper. diff --git a/templates/masthead.txt b/templates/masthead.txt index 99bae04ba..43f5d9a6d 100644 --- a/templates/masthead.txt +++ b/templates/masthead.txt @@ -1,4 +1,4 @@ -Send %(real_name)s maillist submissions to +Send %(real_name)s mailing list submissions to %(got_list_email)s |