diff options
| author | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
| commit | 518b3843c0117f24b1b277a724169fb616604e4d (patch) | |
| tree | 01ab5cbe392ff3a8e851dae1be4eb3a8cf8ed439 /Mailman/Gui | |
| parent | 42fcf522d7818e9e1ee922d1a68824b0f6dcc83d (diff) | |
| parent | c0da6af58657b1fe5730d3dea0e78bc17dac490a (diff) | |
| download | mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.gz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.xz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.zip | |
Merged from upstream
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Gui/Privacy.py | 6 | ||||
| -rw-r--r-- | Mailman/Gui/Topics.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index 635fef52..75eff2b5 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -160,7 +160,7 @@ class Privacy(GUIBase): adminurl = mlist.GetScriptURL('admin', absolute=1) sender_rtn = [ _("""When a message is posted to the list, a series of - moderation steps are take to decide whether the a moderator must + moderation steps are taken to decide whether a moderator must first approve the message or not. This section contains the controls for moderation of both member and non-member postings. @@ -185,7 +185,7 @@ class Privacy(GUIBase): <p>In the text boxes below, add one address per line; start the line with a ^ character to designate a <a href= - "http://www.python.org/doc/current/lib/module-re.html" + "http://docs.python.org/library/re.html" >Python regular expression</a>. When entering backslashes, do so as if you were using Python raw strings (i.e. you generally just use a single backslash). diff --git a/Mailman/Gui/Topics.py b/Mailman/Gui/Topics.py index a912f3c0..14fac968 100644 --- a/Mailman/Gui/Topics.py +++ b/Mailman/Gui/Topics.py @@ -48,7 +48,7 @@ class Topics(GUIBase): _("""The topic filter categorizes each incoming email message according to <a - href="http://www.python.org/doc/current/lib/module-re.html">regular + href="http://docs.python.org/library/re.html">regular expression filters</a> you specify below. If the message's <code>Subject:</code> or <code>Keywords:</code> header contains a match against a topic filter, the message is logically placed |