X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=html%2Fdoc-mail.wml;h=a1455d10c2d708194c44defc621dfe31c41ed49a;hb=HEAD;hp=b38b7fc5cbf8d583c6d007354594abfcab0d6957;hpb=d8d371e75473f1c7702afefc1a1df700cac0b1aa;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index b38b7fc..a1455d1 100644
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -28,7 +28,7 @@ record. In future this address might 'freshen' the record to indicate the
 user is alive. Any PGP signed message will produce a reply.
 
 <h1>New Password</h1>
-If a user looses their password they can request that a new one be generated 
+If a user loses their password they can request that a new one be generated
 for them. This is done by sending the phrase "Please change my Debian 
 password" to chpasswd@db.debian.org. The phrase is required to prevent the 
 daemon from triggering on arbitrary signed email. The best way to invoke this
@@ -67,8 +67,7 @@ be changed are:
 <b>mailContentInspectionAction</b> (markup|blackhole|reject)
 <b>mailDefaultOptions</b> (TRUE|FALSE),
 <b>bATVToken</b>,
-<b>VoIP</b>,
-and <b>gender</b> (1|2|9|male|female|unspecified).
+and <b>VoIP</b>
 
 <li>A line of the form <tt>'del field'</tt> will completly remove all
 occurrences of a field. Useful e.g. to unset your vacation status.
@@ -110,6 +109,8 @@ to use this function will be
 which will set the authentication key to the identity you are using.
 
 Multiple keys per user are supported, but they must all be sent at once.
+To retrieve the existing SSH keys in order to merge existing keys
+with new ones, use the 'show' command documented below.
 
 Keys can be exported to a subset of machines by prepending
 <b>allowed_hosts=$fqdn,$fqdn2</b> to the specific key. The allowed machines
@@ -154,7 +155,9 @@ Like the SSH function above, multiple hosts are supported, but they must all
 be sent at once. The debian.net zone is reloaded hourly.
 
 <li>If the single word <b>show</b> appears on a line then a PGP encrypted version
-of the entire record will be attached to the resulting email.
+of the entire record will be attached to the resulting email. For example:
+<pre>echo show | gpg --clearsign | mail changes@db.debian.org</pre>
+
 </ul>
 
 After processing the requests the daemon will generate a report which contains
@@ -180,7 +183,7 @@ Debian.org machines rely on secured replication to transfer login data out
 of the database. Replication is performed at 15 min intervals so it can take
 a short while before any changes made take effect.
 <p>
-If the mail you're sending to the mail robot is too long for your MTA
+If the mail you're sending to the mail robot is too long for your MUA
 and gets split, or if you want something that is more robust while copy pasting
 into a web-mailer, you can try to create a non-clearsigned message and mail
 that to changes@db.debian.org: