Add a hint about how to merge existing SSH keys

[mirror/userdir-ldap-cgi.git] / html / doc-mail.wml

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index 55eea47..c498e59 100644 (file)
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -110,6 +110,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
@@ -181,6 +183,7 @@ 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
-and gets split please use a different mail origin or pass the mail to
-the MTA on a debian.org machine, e.g. ravel:
-<pre>cat .ssh/id_rsa.pub | gpg --clearsign | ssh ravel mail changes@db.debian.org</pre>
+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:
+<pre>cat .ssh/id_rsa.pub | gpg --armor --sign</pre>