Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core

Commits:
229ad59e by Mark Sapiro at 2019-01-12T20:23:20Z
Minor cleanup of the list welcome message template.

- - - - -
dcc4e34a by Mark Sapiro at 2019-01-12T20:40:35Z
Merge branch 'template' into 'master'

Minor cleanup of the list welcome message template.

Closes #530

See merge request mailman/mailman!425
- - - - -


3 changed files:

- src/mailman/docs/NEWS.rst
- src/mailman/rest/docs/templates.rst
- src/mailman/templates/en/list:user:notice:welcome.txt


Changes:

=====================================
src/mailman/docs/NEWS.rst
=====================================
@@ -43,6 +43,7 @@ Other
   generate a Results email.  (Closes #516)
 * An ``explicit_header_only`` option has been added to Reply-To: munging to
   avoid putting the list address in Cc:.  (Closes #531)
+* The default list welcome message has been cleaned up a bit.  (Closes #530)
 
 
 3.2.0 -- "La Villa Strangiato"


=====================================
src/mailman/rest/docs/templates.rst
=====================================
@@ -46,15 +46,16 @@ subscribed to the mailing list, she sees this plain welcome 
message.
     <BLANKLINE>
       a...@example.com
     <BLANKLINE>
-    You can make such adjustments via email by sending a message to:
+    You can unsubscribe or make adjustments to your options via email by
+    sending a message to:
     <BLANKLINE>
       ant-requ...@example.com
     <BLANKLINE>
     with the word 'help' in the subject or body (don't include the
     quotes), and you will get back a message with instructions.  You will
     need your password to change your options, but for security purposes,
-    this email is not included here.  If you have forgotten your password you
-    will need to click on the 'Forgot Password?' link on the login page.
+    this password is not included here.  If you have forgotten your
+    password you will need to reset it via the web UI.
 
 Let's say though that you wanted to provide a link to a Code of Conduct in the
 welcome message.  You publish both the code of conduct and the welcome message


=====================================
src/mailman/templates/en/list:user:notice:welcome.txt
=====================================
@@ -4,12 +4,13 @@ To post to this list, send your email to:
 
   $listname
 
-You can make such adjustments via email by sending a message to:
+You can unsubscribe or make adjustments to your options via email by sending
+a message to:
 
   $request_email
 
 with the word 'help' in the subject or body (don't include the quotes), and
 you will get back a message with instructions.  You will need your password to
-change your options, but for security purposes, this email is not included
-here.  If you have forgotten your password you will need to click on the
-'Forgot Password?' link on the login page.
+change your options, but for security purposes, this password is not included
+here.  If you have forgotten your password you will need to reset it via the
+web UI.



View it on GitLab: 
https://gitlab.com/mailman/mailman/compare/25e2228723e878ab1fba751db349ef363d213e65...dcc4e34a1f24e1b12da74e3ea64144b47ae217f7

-- 
View it on GitLab: 
https://gitlab.com/mailman/mailman/compare/25e2228723e878ab1fba751db349ef363d213e65...dcc4e34a1f24e1b12da74e3ea64144b47ae217f7
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to