diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-01-22 16:09:03 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-01-22 16:09:03 -0800 |
| commit | 4758a0d904a12d6be21972fa432ad89ed9c1a768 (patch) | |
| tree | 85d88b27697dd72a55d6470d9e88487bf29568c9 /Mailman/Cgi/confirm.py | |
| parent | ac22662b811ac9bcf58cf001c8fd5ad21e757c8b (diff) | |
| download | mailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.tar.gz mailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.tar.xz mailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.zip | |
A number of changes from the unofficial 2.2 branch have been backported to
the 2.1 branch for release with 2.1.19. The 2.2 branch is now no different
from the 2.1 branch and will no longer be maintained.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Cgi/confirm.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index bb529318..97297e10 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2014 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2015 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 @@ -99,8 +99,9 @@ def main(): %(safecookie)s. <p>Note that confirmation strings expire approximately - %(days)s days after the initial subscription request. If your - confirmation has expired, please try to re-submit your subscription. + %(days)s days after the initial request. They also expire if the + request has already been handled in some way. If your confirmation + has expired, please try to re-submit your request. Otherwise, <a href="%(confirmurl)s">re-enter</a> your confirmation string.''') |