Module Name: src
Committed By: joerg
Date: Wed Oct 14 17:33:20 UTC 2009
Modified Files:
src/crypto/external/bsd/openssh/dist: sftp.1 ssh.1
Log Message:
Don't use .Xo/.Xc to work around ancient groff limits.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sftp.1
diff -u src/crypto/external/bsd/openssh/dist/sftp.1:1.2 src/crypto/external/bsd/openssh/dist/sftp.1:1.3
--- src/crypto/external/bsd/openssh/dist/sftp.1:1.2 Sun Jun 7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/sftp.1 Wed Oct 14 17:33:20 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: sftp.1,v 1.2 2009/06/07 22:38:47 christos Exp $
+.\" $NetBSD: sftp.1,v 1.3 2009/10/14 17:33:20 joerg Exp $
.\" $OpenBSD: sftp.1,v 1.69 2008/12/09 15:35:00 sobrado Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -274,10 +274,7 @@
characters and may match multiple files.
.Ar own
must be a numeric UID.
-.It Xo Ic df
-.Op Fl hi
-.Op Ar path
-.Xc
+.It Ic df Oo Fl hi Oc Oo Ar path Oc
Display usage information for the filesystem holding the current directory
(or
.Ar path
@@ -295,11 +292,7 @@
.It Ic exit
Quit
.Nm sftp .
-.It Xo Ic get
-.Op Fl P
-.Ar remote-path
-.Op Ar local-path
-.Xc
+.It Ic get Oo Fl P Oc Ar remote-path Oo Ar local-path Oc
Retrieve the
.Ar remote-file
and store it on the local machine.
@@ -348,10 +341,7 @@
.Ar newpath .
.It Ic lpwd
Print local working directory.
-.It Xo Ic ls
-.Op Fl 1aflnrSt
-.Op Ar path
-.Xc
+.It Ic ls Oo Fl 1aflnrSt Oc Oo Ar path Oc
Display a remote directory listing of either
.Ar path
or the current directory if
@@ -395,11 +385,7 @@
.Ar path .
.It Ic progress
Toggle display of progress meter.
-.It Xo Ic put
-.Op Fl P
-.Ar local-path
-.Op Ar remote-path
-.Xc
+.It Ic put Oo Fl P Oc Ar local-path Oo Ar remote-path Oc
Upload
.Ar local-path
and store it on the remote machine.
Index: src/crypto/external/bsd/openssh/dist/ssh.1
diff -u src/crypto/external/bsd/openssh/dist/ssh.1:1.2 src/crypto/external/bsd/openssh/dist/ssh.1:1.3
--- src/crypto/external/bsd/openssh/dist/ssh.1:1.2 Sun Jun 7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/ssh.1 Wed Oct 14 17:33:20 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: ssh.1,v 1.2 2009/06/07 22:38:47 christos Exp $
+.\" $NetBSD: ssh.1,v 1.3 2009/10/14 17:33:20 joerg Exp $
.\" -*- nroff -*-
.\"
.\" Author: Tatu Ylonen <[email protected]>
@@ -212,12 +212,7 @@
arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
aes192-ctr,aes256-ctr
.Ed
-.It Fl D Xo
-.Sm off
-.Oo Ar bind_address : Oc
-.Ar port
-.Sm on
-.Xc
+.It Fl D Oo Ar bind_address : Oc Ns Ar port
Specifies a local
.Dq dynamic
application-level port forwarding.
@@ -330,12 +325,7 @@
credentials to the server.
.It Fl k
Disables forwarding (delegation) of GSSAPI credentials to the server.
-.It Fl L Xo
-.Sm off
-.Oo Ar bind_address : Oc
-.Ar port : host : hostport
-.Sm on
-.Xc
+.It Fl L Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
Specifies that the given port on the local (client) host is to be
forwarded to the given host and port on the remote side.
This works by allocating a socket to listen to
@@ -518,12 +508,7 @@
.It Fl q
Quiet mode.
Causes most warning and diagnostic messages to be suppressed.
-.It Fl R Xo
-.Sm off
-.Oo Ar bind_address : Oc
-.Ar port : host : hostport
-.Sm on
-.Xc
+.It Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
Specifies that the given port on the remote (server) host is to be
forwarded to the given host and port on the local side.
This works by allocating a socket to listen to
@@ -611,9 +596,7 @@
.Fl v
options increase the verbosity.
The maximum is 3.
-.It Fl w Xo
-.Ar local_tun Ns Op : Ns Ar remote_tun
-.Xc
+.It Fl w Ar local_tun Ns Op : Ns Ar remote_tun
Requests
tunnel
device forwarding with the specified
