aboutsummaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2010-04-28 08:37:00 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2010-04-28 08:37:00 +0000
commitf276912e6fa1da1174ba900a7e5d6447d71fc8e7 (patch)
treef6bc9905e05497f1cb98b09c2e6df135d3c6abbf /ssh.1
parent5fe13e2e9be32fe8299a3a2da8e829bb2af78918 (diff)
downloadsrc-f276912e6fa1da1174ba900a7e5d6447d71fc8e7.tar.gz
src-f276912e6fa1da1174ba900a7e5d6447d71fc8e7.zip
Vendor import of OpenSSH 5.5p1vendor/openssh/5.5p1
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=207311 svn path=/vendor-crypto/openssh/5.5p1/; revision=207312; tag=vendor/openssh/5.5p1
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 3f815b8e7161..c03771a3eba3 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $
-.Dd $Mdocdate: March 5 2010 $
+.\" $OpenBSD: ssh.1,v 1.303 2010/03/26 00:26:58 djm Exp $
+.Dd $Mdocdate: March 26 2010 $
.Dt SSH 1
.Os
.Sh NAME
@@ -558,7 +558,10 @@ argument is
the listen port will be dynamically allocated on the server and reported
to the client at run time.
.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