wrap new GSSAPI code (from Simon) in #ifdef GSSAPI

[gssapi-openssh.git] / openssh / scp.1

diff --git a/openssh/scp.1 b/openssh/scp.1
index a3ec2e0c61e6f64e8eb884bb6711b8fdfd5b2c61..d51e680c77796f8894e7271ac95c3ab5334d2225 100644 (file)
--- a/openssh/scp.1
+++ b/openssh/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.27 2003/03/28 10:11:43 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.20 2001/09/17 23:56:07 stevesk Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -19,14 +19,12 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
-.Bk -words
-.Op Fl pqrvBC1246
+.Op Fl pqrvBC46
 .Op Fl F Ar ssh_config
 .Op Fl S Ar program
 .Op Fl P Ar port
 .Op Fl c Ar cipher
 .Op Fl i Ar identity_file
-.Op Fl l Ar limit
 .Op Fl o Ar ssh_option
 .Sm off
 .Oo
@@ -41,7 +39,6 @@
 .Ar host2 No :
 .Oc Ar file2
 .Sm on
-.Ek
 .Sh DESCRIPTION
 .Nm
 copies files between hosts on a network.
@@ -71,8 +68,6 @@ Selects the file from which the identity (private key) for RSA
 authentication is read.
 This option is directly passed to
 .Xr ssh 1 .
-.It Fl l Ar limit
-Limits the used bandwidth, specified in Kbit/s.
 .It Fl p
 Preserves modification times, access times, and modes from the
 original file.
@@ -122,20 +117,14 @@ options.
 .It Fl o Ar ssh_option
 Can be used to pass options to
 .Nm ssh
-in the format used in
-.Xr ssh_config 5 .
-This is useful for specifying options
+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.
-.It Fl 1
-Forces
-.Nm
-to use protocol 1.
-.It Fl 2
-Forces
-.Nm
-to use protocol 2.
+command-line flag.  For example, forcing the use of protocol
+version 1 is specified using
+.Ic scp -oProtocol=1 .
 .It Fl 4
 Forces
 .Nm
@@ -145,9 +134,6 @@ Forces
 .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
@@ -163,5 +149,4 @@ California.
 .Xr ssh-add 1 ,
 .Xr ssh-agent 1 ,
 .Xr ssh-keygen 1 ,
-.Xr ssh_config 5 ,
 .Xr sshd 8