--- ../_Dakar/data/TWiki/TWikiRegistration.txt	2005-09-30 12:32:30.000000000 +0200
+++ ./data/TWiki/TWikiRegistration.txt	2005-10-10 15:38:22.020788300 +0200
@@ -1,12 +1,16 @@
 %META:TOPICINFO{author="TWikiContributor" date="1111929255" format="1.0" version="9"}%
 ---+ Registration
 
-To edit pages on this TWikiSite, you must have a registered user name and password. 
+To edit pages on this TWikiSite, you must have a registered user name%IF{"not($ PASSWORDMANAGER='none')" then=" and password"}%. 
 
-	* %H% *NOTE:* Registered users can ChangePasswords and ResetPasswords.
+<!--
+   # optional hint for password, enabled by {PasswordManager} option in =configure=
+   * Set PASSWORD_HINT = *NOTE:* Registered users can ChangePasswords and ResetPasswords.
+-->
+%IF{"not ($ PASSWORDMANAGER='none')" then="%PASSWORD_HINT%"}%
 
 To register as a new user, simply fill out this form:
 
-*Important* the information provided in this form will be stored in a database on the TWiki server. This database is accessible to anyone who can access the server through the web (though passwords will be encrypted, and email addresses will be obfusticated to help prevent spamming). Your country, or the country where the server is hosted, may have Data Protection laws governing the maintenance of such databases. If you are in doubt, you should contact  <a href="mailto:%WIKIWEBMASTER%?subject=Data%20Protection%20Policy">%WIKIWEBMASTER%</a> for details of the Data Protection Policy of this TWiki server before registering.
+*Important* the information provided in this form will be stored in a database on the TWiki server. This database is accessible to anyone who can access the server through the web (though %IF{"not($ PASSWORDMANAGER='none')" then="passwords will be encrypted, and"}% email addresses will be obfusticated to help prevent spamming). Your country, or the country where the server is hosted, may have Data Protection laws governing the maintenance of such databases. If you are in doubt, you should contact  <a href="mailto:%WIKIWEBMASTER%?subject=Data%20Protection%20Policy">%WIKIWEBMASTER%</a> for details of the Data Protection Policy of this TWiki server before registering.
 
 <!-- IMPORTANT NOTE if you want to customize this form: You can delete or add new input variables in this form. The name="" parameter of the input tags must start with: "Twk0..." (if this is an optional entry), "Twk1..." (if this is a required entry). This will ensure that the fields are processed correctly. -->
@@ -34,11 +38,10 @@
   <td align="right"> Email address: </td>
   <td><input type="text" name="Twk1Email" size="40" value="" /> =<font color="red">**</font>= </td>
-</tr><tr>
-  <td align="right"> Your password: </td>
-  <td><input type="password" name="Twk1Password" size="40" value="" /> =<font color="red">**</font>= </td>
-</tr><tr>
-  <td align="right"> Retype password: </td>
-  <td><input type="password" name="Twk1Confirm" size="40" value="" /> =<font color="red">**</font>= </td>
 </tr>
+<!--
+   # optional rows for password, enabled by {PasswordManager} option in =configure=
+   * Set ASK_FOR_PASSWORD_ROWS = <tr><td align='right'> Your password: </td><td><input type='password' name='Twk1Password' size='40' value='' /> =<font color='red'>**</font>= </td></tr><tr><td align='right'> Retype password: </td><td><input type='password' name='Twk1Confirm' size='40' value='' /> =<font color='red'>**</font>= </td></tr>
+-->
+%IF{"not($ PASSWORDMANAGER='none')" then="%ASK_FOR_PASSWORD_ROWS%"}%
 <tr>
   <td align="right"> Company name: </td>
@@ -208,6 +211,9 @@
 </form>
 </div>
-When %WIKITOOLNAME% recives the form, it will mail an account activation code to the email address you gave above. Enter that activation code in the following screen, or follow the link in the email, to activate your account. Once your account is activated, %WIKITOOLNAME% will:
-	* Finished creating an account for you, so that you can start editing pages using your WikiName.
+<!-- what happens next depends on whether verification is active
+   * Set ANNOUNCE_WITH_VERIF = it will mail an account activation code to the email address you gave above. Enter that activation code in the following screen, or follow the link in the email, to activate your account. Once your account is activated, 
+-->
+When %WIKITOOLNAME% receives the form, %IF{"$ REGISTERNEEDVER" then="%ANNOUNCE_WITH_VERIF%"}% %WIKITOOLNAME% will:
+	* Finish creating an account for you, so that you can start editing pages using your WikiName.
 	* Create your personal <nop>%WIKITOOLNAME% topic using your WikiName as topic name, and add the data you submitted to the topic.
 	* Add your name to the list of users in the %MAINWEB%.%WIKIUSERSTOPIC% topic in the %MAINWEB% web.