merge fork

Author: rouilj

CHANGES.txt

@@ -39,7 +39,10 @@ Features:
   will work. This also fixes a bug. If assignedto.username had no
   matches, all issues would be returned.  This is also fixed.
   (John Rouillard)
-
+- issue2550716 - Email address displayed after password reset request.
+  This fix actually made it into 1.6 release. However this release
+  documents how password reset works in user_guide.txt. (John Rouillard)
+ 
 2020-07-13 2.0.0
 
 Fixed:

doc/images/reset.png

@@ -267,10 +267,22 @@ you where you are, a sidebar which contains useful navigation tools and a
 body which usually displays either a list of items or a single item from
 the tracker.
 
-You may either register or log in. Registration takes you to:
+You may register, reset your password or log in. Registration takes
+you to:
 
 .. image:: images/registration.png
 
+Clicking on the "Lost your login?" link allows you to reset your
+password. Resetting your password takes you to:
+
+.. image:: images/reset.png
+
+You can enter your username to get a reset email sent to your primary
+E-mail address. Otherwise you can enter your primary E-mail address or
+an Alternate E-mail address to get a reset email sent to that address.
+The reset email includes a verification link that can be used to
+complete the password reset.
+
 Once you're logged in, the sidebar changes to:
 
 .. image:: images/index_logged_in.png