Merge "Update notes about password security"

[gigi.git] / src / org / cacert / gigi / pages / main / RegisterPage.templ

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.templ b/src/org/cacert/gigi/pages/main/RegisterPage.templ
index c792985abfc0d2be05f5b96bfbe82a4a9be82a09..fbf084d13321c08d5076bb4faa2bab6c23086288 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.templ
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.templ
@@ -6,6 +6,5 @@
 <?=_Your private information will be used for internal procedures only and will not be shared with third parties.?>
 </p>
 <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
-<?=_A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...?><br><br>
-<b><?=_Note: White spaces at the beginning and end of a password will be removed.?></b>
+<?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. Learn more in our !'<a href="http://wiki.cacert.org/wiki/FAQ" target="_new">'FAQ!'</a>'.?>
 </p>