Docs patch for bug 87795: You now get an email with a URL containing a random token to confirm your registration - Patch by me, r=justdave

1 files changed, 61 insertions, 20 deletions

diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index e6b51b53c..da271519e 100644
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -26,39 +26,80 @@
 
     <orderedlist>
       <listitem>
-        <para>Click the 
-        <quote>Open a new Bugzilla account</quote>
+        <para>
+          On the home page <filename>index.cgi</filename>, click the
+          <quote>Open a new Bugzilla account</quote> link, or the
+          <quote>New Account</quote> link available in the footer of pages.
+          Now enter your email address, then click the <quote>Send</quote>
+          button.
+        </para>
+
+        <note>
+          <para>
+            If none of these links is available, this means that the
+            administrator of the installation has disabled self-registration.
+            This means that only an administrator can create accounts
+            for other users. One reason could be that this installation is
+            private.
+          </para>
+        </note>
 
-        link, enter your email address and, optionally, your name in the
-        spaces provided, then click 
-        <quote>Create Account</quote>
+        <note>
+          <para>
+            Also, if only some users are allowed to create an account on
+            the installation, you may see these links but your registration
+            may fail if your email address doesn't match the ones accepted
+            by the installation. This is another way to restrict who can
+            access and edit bugs in this installation.
+          </para>
+        </note>
+      </listitem>
 
-        .</para>
+      <listitem>
+        <para>
+          Within moments, and if your registration is accepted, you should
+          receive an email to the address you provided, which contains your
+          login name (generally the same as the email address), and two URLs
+          with a token (a random string generated by the installation) to
+          confirm, respectively cancel, your registration. This is a way to
+          prevent users from abusing the generation of user accounts, for
+          instance by entering inexistent email addresses, or email addresses
+          which do not belong to them.
+        </para>
       </listitem>
 
       <listitem>
-        <para>Within moments, you should receive an email to the address
-        you provided, which contains your login name (generally the
-        same as the email address), and a password. 
-        This password is randomly generated, but can be
-        changed to something more memorable.</para>
+        <para>
+          By default, you have 3 days to confirm your registration. Past this
+          timeframe, the token is invalidated and the registration is
+          automatically cancelled. You can also cancel this registration sooner
+          by using the appropriate URL in the email you got.
+        </para>
       </listitem>
 
       <listitem>
-        <para>Click the 
-        <quote>Log In</quote>
-        link in the footer at the bottom of the page in your browser,
-        enter your email address and password into the spaces provided, and
-        click 
-        <quote>Login</quote>.
+        <para>
+          If you confirm your registration, Bugzilla will ask you your real name
+          (optional, but recommended) and your password, which must be between
+          3 and 16 characters long.
         </para>
+      </listitem>
 
+      <listitem>
+        <para>
+          Now all you need to do is to click the <quote>Log In</quote>
+          link in the footer at the bottom of the page in your browser,
+          enter your email address and password you just chose into the
+          login form, and click the <quote>Log in</quote> button.
+        </para>
       </listitem>
     </orderedlist>
 
-    <para>You are now logged in. Bugzilla uses cookies to remember you are
-    logged in so, unless you have cookies disabled or your IP address changes, 
-    you should not have to log in again.</para>
+    <para>
+      You are now logged in. Bugzilla uses cookies to remember you are
+      logged in so, unless you have cookies disabled or your IP address changes,
+      you should not have to log in again during your session.
+    </para>
   </section>
 
   <section id="bug_page">