From efe56d6ed33012c51ce2c4980c4555ec6321ee30 Mon Sep 17 00:00:00 2001
From: Britt Gresham
Date: Mon, 22 May 2017 09:59:44 -0700
Subject: Update welcome template with correct password reset instructions

Before this commit the welcome template included older instructions on
how to reset a users password.

This commit updates the documentation to reflect the new way of
resetting a users password by clicking on a link when logging in.
---
 src/mailman/rest/docs/templates.rst                   | 4 ++--
 src/mailman/templates/en/list:user:notice:welcome.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mailman/rest/docs/templates.rst b/src/mailman/rest/docs/templates.rst
index eefff09b7..4fa3fb8c2 100644
--- a/src/mailman/rest/docs/templates.rst
+++ b/src/mailman/rest/docs/templates.rst
@@ -53,8 +53,8 @@ subscribed to the mailing list, she sees this plain welcome message.
     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.  There is also a button on your
-    options page that will send your current password to you.
+    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.
 
 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
diff --git a/src/mailman/templates/en/list:user:notice:welcome.txt b/src/mailman/templates/en/list:user:notice:welcome.txt
index d3d557179..ad86e5e40 100644
--- a/src/mailman/templates/en/list:user:notice:welcome.txt
+++ b/src/mailman/templates/en/list:user:notice:welcome.txt
@@ -11,5 +11,5 @@ You can make such adjustments via email by sending a message to:
 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.  There is also a button on your options page that will send your current
-password to you.
+here.  If you have forgotten your password you will need to click on the
+'Forgot Password?' link on the login page.
-- 
cgit v1.2.3-70-g09d2