2 files changed, 14 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c8ecb194..c7017089e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
     are no longer particularly feasible anyway (closes: #420682).
   * Cope with insserv reordering of init script links.
   * Remove init script stop link in rc1, as killprocs handles it already.
+  * Adjust short descriptions to avoid relying on previous experience with
+    rsh, based on suggestions from Reuben Thomas (closes: #512198).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 12 Nov 2009 21:31:44 +0000
 
diff --git a/debian/control b/debian/control
index 25df28c5c..18b55e9f7 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4
 Replaces: ssh, ssh-krb5
 Suggests: ssh-askpass, libpam-ssh, keychain
 Provides: rsh-client, ssh-client
-Description: secure shell client, an rlogin/rsh/rcp replacement
+Description: secure shell (SSH) client, for secure access to remote machines
  This is the portable version of OpenSSH, a free implementation of
  the Secure Shell protocol as specified by the IETF secsh working
  group.
@@ -26,8 +26,8 @@ Description: secure shell client, an rlogin/rsh/rcp replacement
  It provides secure encrypted communications between two untrusted
  hosts over an insecure network. X11 connections and arbitrary TCP/IP
  ports can also be forwarded over the secure channel.
- It is intended as a replacement for rlogin, rsh and rcp, and can be
- used to provide applications with a secure communication channel.
+ It can be used to provide applications with a secure communication
+ channel.
  .
  This package provides the ssh, scp and sftp clients, the ssh-agent
  and ssh-add programs to make public key authentication more convenient,
@@ -35,6 +35,9 @@ Description: secure shell client, an rlogin/rsh/rcp replacement
  .
  In some countries it may be illegal to use any encryption at all
  without a special permit.
+ .
+ ssh replaces the insecure rsh, rcp and rlogin programs, which are
+ obsolete for most purposes.
 
 Package: openssh-server
 Priority: optional
@@ -45,7 +48,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-c
 Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
 Suggests: ssh-askpass, rssh, molly-guard, ufw
 Provides: ssh-server
-Description: secure shell server, an rshd replacement
+Description: secure shell (SSH) server, for secure access from remote machines
  This is the portable version of OpenSSH, a free implementation of
  the Secure Shell protocol as specified by the IETF secsh working
  group.
@@ -55,13 +58,16 @@ Description: secure shell server, an rshd replacement
  It provides secure encrypted communications between two untrusted
  hosts over an insecure network. X11 connections and arbitrary TCP/IP
  ports can also be forwarded over the secure channel.
- It is intended as a replacement for rlogin, rsh and rcp, and can be
- used to provide applications with a secure communication channel.
+ It can be used to provide applications with a secure communication
+ channel.
  .
  This package provides the sshd server.
  .
  In some countries it may be illegal to use any encryption at all
  without a special permit.
+ .
+ sshd replaces the insecure rshd program, which is obsolete for most
+ purposes.
 
 Package: ssh
 Priority: extra