===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.1,v
retrieving revision 1.14.2.2
retrieving revision 1.15
diff -u -r1.14.2.2 -r1.15
--- src/usr.bin/ssh/scp.1	2002/03/09 00:20:44	1.14.2.2
+++ src/usr.bin/ssh/scp.1	2001/07/29 17:02:46	1.15
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.14.2.2 2002/03/09 00:20:44 miod Exp $
+.\" $OpenBSD: scp.1,v 1.15 2001/07/29 17:02:46 mouring Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -19,13 +19,12 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
-.Op Fl pqrvBC46
-.Op Fl F Ar ssh_config
+.Op Fl pqrvC46
 .Op Fl S Ar program
 .Op Fl P Ar port
 .Op Fl c Ar cipher
 .Op Fl i Ar identity_file
-.Op Fl o Ar ssh_option
+.Op Fl o Ar option
 .Sm off
 .Oo
 .Op Ar user@
@@ -93,12 +92,6 @@
 flag to
 .Xr ssh 1
 to enable compression.
-.It Fl F Ar ssh_config
-Specifies an alternative
-per-user configuration file for
-.Nm ssh .
-This option is directly passed to
-.Xr ssh 1 .
 .It Fl P Ar port
 Specifies the port to connect to on the remote host.
 Note that this option is written with a capital
@@ -114,17 +107,10 @@
 The program must understand
 .Xr ssh 1
 options.
-.It Fl o Ar ssh_option
-Can be used to pass options to
-.Nm ssh
-in the format used in the
-.Xr ssh 1
-configuration file. This is useful for specifying options
-for which there is no separate
-.Nm scp
-command-line flag.  For example, forcing the use of protocol
-version 1 is specified using
-.Ic scp -oProtocol=1 .
+.It Fl o Ar option
+Can be used to give options in the format used in the config file.
+Theses options are passed directly to
+.Xr ssh 1 .
 .It Fl 4
 Forces
 .Nm
@@ -134,9 +120,6 @@
 .Nm
 to use IPv6 addresses only.
 .El
-.Sh DIAGNOSTICS
-.Nm
-exits with 0 on success or >0 if an error occurred.
 .Sh AUTHORS
 Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
 .Sh HISTORY