howto/ldap.md

@@ -29,9 +29,19 @@ get SSH access to servers (see [ssh-jump-host](/doc/ssh-jump-host/)).
 
 ## How to change my email forward?
 
-Send an (inline!) signed OpenPGP email to `changes@db.torproject.org`
-to change your email forward. A command like this, in a UNIX shell,
-would do it:
+If you use Thunderbird and use it to manage your OpenPGP key, compose a new
+plain text (not HTML) message to `changes@db.torproject.org`, enter any subject
+line and write this in the message body:
+
+    emailForward: user@example.com
+
+Before sending the email, open the OpenPGP drop-down menu at the top of the
+compose window and click `Digitally Sign`.
+
+If you use GnuPG, send an (inline!) signed OpenPGP email to
+`changes@db.torproject.org` to change your email forward.
+
+A command like this, in a UNIX shell, would do it:
 
     echo "emailForward: user@example.com" | gpg --armor --sign
 
@@ -42,21 +52,31 @@ The email forward can also be changed in the [web interface][db.torproject.org].
 
 ## Password reset
 
-<!-- warning: this documentation is copied from `html/password.wml` -->
-<!-- in the userdir-ldap-cgi.git repository. It should be updated in -->
-<!-- both places if changes are made. -->
+If you have lost or forgotten your LDAP password, you can have it reset by
+sending a PGP signed message to the mail gateway.
 
-If you have lost or forgotten your LDAP password, you can have it
-reset by sending a PGP signed message to the mail gateway:
+If you use Thunderbird and use it to manage your OpenPGP key, compose a new
+plain text (not HTML) message to `chpasswd@db.torproject.org`, enter any subject
+line and write this in the message body:
+
+    Please change my Tor password
+
+Before sending the email, open the OpenPGP drop-down menu at the top of the
+compose window and click `Digitally Sign`.
+
+If you use GnuPG, send an (inline!) signed OpenPGP email to
+`chpasswd@db.torproject.org` to reset your password.
+
+A command like this, in a UNIX shell, would do it:
 
     echo "Please change my Tor password" | gpg --armor --sign
 
-And email the result to `chpasswd@db.torproject.org`. Make sure you
-send the email as plain text, not HTML.
+Then copy-paste that in your email client, making sure to avoid
+double-signing the email and sending in clear text (instead of HTML).
 
-The daemon will then respond with a new randomized password encrypted
-with your key. Then use the [update form](https://db.torproject.org/login.html) to change your password
-to a strong password you can remember or (preferably) a stronger
+The daemon will then respond with a new randomized password encrypted with your
+key. Then use the [update form](https://db.torproject.org/login.html) to change
+your password to a strong password you can remember or (preferably) a stronger
 password stored in your password manager.
 
 You cannot set a new password via the mail gateway.