From b370ca9313b02581a5afff20d7555a34cf1f662d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 15 Oct 2003 15:59:26 +1000
Subject: [PATCH]    - markus@cvs.openbsd.org 2003/10/13 08:22:25      [scp.1
 sftp.1]      don't refer to options related to forwarding; ok jmc@

---
 ChangeLog |  5 ++++-
 scp.1     | 11 +----------
 sftp.1    | 11 +----------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 439a5b4bc..486a2a981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
      note that EnableSSHKeySign should be in the non-hostspecific section;
      remove unnecessary .Pp;
      ok markus@
+   - markus@cvs.openbsd.org 2003/10/13 08:22:25
+     [scp.1 sftp.1]
+     don't refer to options related to forwarding; ok jmc@
 
 20031009
  - (dtucker) [sshd_config.5] UsePAM defaults to "no".  ok djm@
@@ -1344,4 +1347,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3075 2003/10/15 05:58:18 dtucker Exp $
+$Id: ChangeLog,v 1.3076 2003/10/15 05:59:26 dtucker Exp $
diff --git a/scp.1 b/scp.1
index bdc413337..4dab2a1db 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.29 2003/10/08 08:27:36 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.30 2003/10/13 08:22:25 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -124,16 +124,10 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Cipher
 .It Ciphers
-.It ClearAllForwardings
 .It Compression
 .It CompressionLevel
 .It ConnectionAttempts
 .It ConnectionTimeout
-.It DynamicForward
-.It EscapeChar
-.It ForwardAgent
-.It ForwardX11
-.It GatewayPorts
 .It GlobalKnownHostsFile
 .It GSSAPIAuthentication
 .It GSSAPIDelegateCredentials
@@ -144,7 +138,6 @@ For full details of the options listed below, and their possible values, see
 .It HostName
 .It IdentityFile
 .It KeepAlive
-.It LocalForward
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost
@@ -155,7 +148,6 @@ For full details of the options listed below, and their possible values, see
 .It Protocol
 .It ProxyCommand
 .It PubkeyAuthentication
-.It RemoteForward
 .It RhostsRSAAuthentication
 .It RSAAuthentication
 .It SmartcardDevice
@@ -164,7 +156,6 @@ For full details of the options listed below, and their possible values, see
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
-.It XAuthLocation
 .El
 .It Fl P Ar port
 Specifies the port to connect to on the remote host.
diff --git a/sftp.1 b/sftp.1
index 05b972e46..00253037d 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.46 2003/10/08 08:27:36 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.47 2003/10/13 08:22:25 markus Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -145,16 +145,10 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Cipher
 .It Ciphers
-.It ClearAllForwardings
 .It Compression
 .It CompressionLevel
 .It ConnectionAttempts
 .It ConnectionTimeout
-.It DynamicForward
-.It EscapeChar
-.It ForwardAgent
-.It ForwardX11
-.It GatewayPorts
 .It GlobalKnownHostsFile
 .It GSSAPIAuthentication
 .It GSSAPIDelegateCredentials
@@ -165,7 +159,6 @@ For full details of the options listed below, and their possible values, see
 .It HostName
 .It IdentityFile
 .It KeepAlive
-.It LocalForward
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost
@@ -176,7 +169,6 @@ For full details of the options listed below, and their possible values, see
 .It Protocol
 .It ProxyCommand
 .It PubkeyAuthentication
-.It RemoteForward
 .It RhostsRSAAuthentication
 .It RSAAuthentication
 .It SmartcardDevice
@@ -185,7 +177,6 @@ For full details of the options listed below, and their possible values, see
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
-.It XAuthLocation
 .El
 .It Fl P Ar sftp_server_path
 Connect directly to a local sftp server