summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:05:35 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:05:35 +1100
commit9f67a21de62ca0b0e2db022abaeaf3f2faed5f0c (patch)
tree843feb7dc85819a9f14d7c4e5c396c9e064594ad
parentd1450dbe2ab1cc06fd54af265014dfcf68c08cc1 (diff)
- msf@cvs.openbsd.org 2006/02/06 15:54:07
[ssh.1] - typo fix ok jmc@
-rw-r--r--ChangeLog9
-rw-r--r--ssh.14
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f95f561f8..ab4173e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120060315
2 - (djm) OpenBSD CVS Sync:
3 - msf@cvs.openbsd.org 2006/02/06 15:54:07
4 [ssh.1]
5 - typo fix
6 ok jmc@
7
120060313 820060313
2 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 9 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
3 since not all platforms support it. Instead, use internal equivalent while 10 since not all platforms support it. Instead, use internal equivalent while
@@ -3898,4 +3905,4 @@
3898 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3905 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3899 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3906 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3900 3907
3901$Id: ChangeLog,v 1.4139 2006/03/13 08:06:51 dtucker Exp $ 3908$Id: ChangeLog,v 1.4140 2006/03/15 00:05:35 djm Exp $
diff --git a/ssh.1 b/ssh.1
index f4c677628..895008139 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.253 2006/01/30 13:37:49 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.254 2006/02/06 15:54:07 msf Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1087,7 +1087,7 @@ is set to
1087.Dq forced-commands-only : 1087.Dq forced-commands-only :
1088.Bd -literal -offset 2n 1088.Bd -literal -offset 2n
1089tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane 1089tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
1090tunnel="2",command="sh /etc/netstart tun1" ssh-rsa ... john 1090tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
1091.Ed 1091.Ed
1092.Pp 1092.Pp
1093Since a SSH-based setup entails a fair amount of overhead, 1093Since a SSH-based setup entails a fair amount of overhead,