Add a hint about how to merge existing SSH keys

diff --git a/debian/changelog b/debian/changelog
index e2909e6..40b62b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ userdir-ldap-cgi (0.3.40) UNRELEASED; urgency=medium
 
   [ Paul Wise ]
   * ravel is no longer recommended for general shell usage
 
   [ Paul Wise ]
   * ravel is no longer recommended for general shell usage

+  * Add a hint about how to merge existing SSH keys

 
  -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:56:47 +0100
 
 
  -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:56:47 +0100
 

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index b38b7fc..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.
 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
 
 Keys can be exported to a subset of machines by prepending
 <b>allowed_hosts=$fqdn,$fqdn2</b> to the specific key. The allowed machines