Clarified instructions for changing subscriber options, including

specifying the URL for the actual user options page.  (Provoked by a
suggestion conveyed by jim hugunin.)

1 files changed, 13 insertions, 13 deletions

diff --git a/cron/mailpasswds b/cron/mailpasswds
index e7028ad81..56a6529a9 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -22,19 +22,19 @@ This is a reminder, sent out once a month, about your %s
 mailing list memberships.  It includes your subscription info and
 how to use it to change it or unsubscribe from a list.
 
-Passwords for address %s:
+Passwords for %s:
 
 %s
 %s
+You can visit the URLs to change your membership status or configuration,
+including unsubscribing, setting digest-style delivery or disabling
+delivery altogether (e.g., for a vacation), and so on.
 
-The URLs have web-based interfaces for changing your membership status or
-configuration for the respective list.
-
-In addition to the URL web interfaces, you can also use email to make the
+In addition to the URL interfaces, you can also use email to make such
 changes.  For more info, send a message to the '-request' address of the
-list (for example, %s-request@%s) containing just the
-word 'help' in the message body, and an email message will be sent to you
-with instructions.
+list (for example, %s-request@%s) containing just
+the word 'help' in the message body, and an email message will be sent to
+you with instructions.
 
 If you have questions, problems, comments, etc, send them to
 mailman-owner@%s.  Thanks!
@@ -50,11 +50,11 @@ def MailAllPasswords(list, users):
 	table = []
 	for l, p, u in data:
 	    if len(l) > 9:
-		table.append("%s\n           %-10s  %s" % (l, p, u))
+		table.append("%s\n           %-10s\n%s\n" % (l, p, u))
 	    else:
-		table.append("%-10s %-10s  %s" % (l, p, u))
-	header = ("%-10s %-10s  %s\n%-10s %-10s  %s"
-		  % ("List", "Password", "URL", "----", "--------", "---"))
+		table.append("%-10s %-10s\n%s\n" % (l, p, u))
+	header = ("%-10s %-10s\n%-10s %-10s"
+		  % ("List", "Password // URL", "----", "--------"))
 	text = USERPASSWORDSTEXT % (list.host_name,
                                     user,
 				    header,
@@ -72,9 +72,9 @@ def MailAllPasswords(list, users):
 list = None
 for name in mm_utils.list_names():
     list = maillist.MailList(name)
-    url = list.GetScriptURL('listinfo')
     list_name = list.real_name
     for user, password in list.passwords.items():
+	url = list.GetOptionsURL(user)
 	if users.has_key(user):
 	    users[user].append(list_name, password, url)
 	else: