Bug 1304882 - Create help page describing how to migrate from Persona to

either internal or Github authentication (revised)

diff --git a/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl b/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl
index 072937c7f844591ecf6273b181ea396758eba54a..18b7a3f601af517aae5e19e8b91641d15fa3758c 100644 (file)
--- a/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl
@@ -22,16 +22,16 @@
 
 <p>
   For users of Persona on BMO, there are two other methods for authentication that are supported and you will need to switch
-  over to one of them before October 25th, 2016.
+  over to one of them after your current session expires starting October 25th, 2016.
 </p>
 
 <h3>Native Login</h3>
 
 <p>
   BMO has always supported native authentication using a password securely stored in our database. If you have used Persona since
-  first creating your BMO account, you will probably not know this password. But you can reset it to something you do know by clicking
-  on 'Forgot Password' at the right-hand top of the page. Enter your email you used with Persona in the text field and click
-  'Reset Password'.
+  first creating your BMO account, you will probably not know this password. But you can reset it to something you do know by first
+  logging out, and then clicking on 'Forgot Password' at the right-hand top of the page. Enter your email you used with Persona in
+  the text field and click 'Reset Password'.
 </p>
 
 <p>
@@ -42,12 +42,12 @@
 <h3>Github Login</h3>
 
 <p>
-  <a href="https://github.com">Github</a> is also a BMO supported method of authentication. To use Github, click 'Login' at the top
-  of any BMO page and then click on the 'Github' login image. You will need to have a Github account that has an email address the same
-  as the Persona email you were using, otherwise a different BMO account will be created. You will be able to choose the email address
-  you want to use for BMO if you have more than one configured in your Github profile. If none of the email addresses you have
-  configured in Github match what you were using for Persona, native login described above may be your best choice if you want to
-  retain your BMO data.
+  <a href="https://github.com">Github</a> is also a BMO supported method of authentication. To use Github, first log out and then
+  click 'Login' at the top of any BMO page and then click on the 'Github' login image. You will need to have a Github account that
+  has an email address the same as the Persona email you were using, otherwise a different BMO account will be created. You will
+  be able to choose the email address you want to use for BMO if you have more than one configured in your Github profile. If none
+  of the email addresses you have configured in Github match what you were using for Persona, native login described above may be
+  your best choice if you want to retain your BMO data.
 </p>
 
 [% PROCESS global/footer.html.tmpl %]