From 2fb8dbca8338e24e7018355295d8248eba6e1132 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 14 Jun 2008 02:22:32 +0200
Subject: Sync with ikiwiki 2.49.

---
 passwordmail.tmpl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'passwordmail.tmpl')

diff --git a/passwordmail.tmpl b/passwordmail.tmpl
index 8484d39..aa8a68c 100644
--- a/passwordmail.tmpl
+++ b/passwordmail.tmpl
@@ -1,10 +1,15 @@
-Someone[1], possibly you, requested that you be emailed the password for user
-<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2].
+Someone[1], possibly you, requested that the password for
+<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2] be reset.
 
-The password is: <TMPL_VAR USER_PASSWORD>
+To change your password, visit the following url, and enter a new password:
+
+<TMPL_VAR PASSWORDURL>
+
+This url can only be used once to change your password, and it will also
+stop working the next time you successfully log in.
 
 -- 
 ikiwiki
 
-[1] The user requesting the password was at IP address <TMPL_VAR REMOTE_ADDR>
+[1] Their IP address was <TMPL_VAR REMOTE_ADDR>
 [2] Located at <TMPL_VAR WIKIURL>
-- 
cgit v1.2.3