? user_email_password_recovery_token_help_new_string.patch
? user_email_password_recovery_token_help_str_replace.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.91
diff -u -p -r1.91 user.admin.inc
--- modules/user/user.admin.inc	2 Dec 2009 17:04:25 -0000	1.91
+++ modules/user/user.admin.inc	15 Dec 2009 14:57:11 -0000
@@ -489,7 +489,7 @@ function user_admin_settings() {
     '#title' => t('Password recovery'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#description' => t('Customize e-mail messages sent to users who request a new password.') . ' ' . $email_token_help,
+    '#description' => t('Customize e-mail messages sent to users who request a new password.') . ' ' . str_replace('[user:password], ', '', $email_token_help),
     '#group' => 'email',
     '#weight' => 10,
   );