2 files changed, 6 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 0dcbc98e8..0d4707455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openssh (1:4.7p1-5) UNRELEASED; urgency=low
 
   * Recommends: xauth rather than Suggests: xbase-clients.
+  * Document in ssh(1) that '-S none' disables connection sharing
+    (closes: #471437).
   * debconf template translations:
     - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
 
diff --git a/ssh.1 b/ssh.1
index 04c79e148..8e666858c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -559,7 +559,10 @@ will only succeed if the server's
 option is enabled (see
 .Xr sshd_config 5 ) .
 .It Fl S Ar ctl_path
-Specifies the location of a control socket for connection sharing.
+Specifies the location of a control socket for connection sharing,
+or the string
+.Dq none
+to disable connection sharing.
 Refer to the description of
 .Cm ControlPath
 and