Import openssh_6.7p1.orig.tar.gz

1 files changed, 8 insertions, 9 deletions

diff --git a/scp.0 b/scp.0
index b9eeffc4e..0495f2555 100644
--- a/scp.0
+++ b/scp.0
@@ -1,4 +1,4 @@
-SCP(1)                     OpenBSD Reference Manual                     SCP(1)
+SCP(1)                      General Commands Manual                     SCP(1)
 
 NAME
      scp - secure copy (remote file copy program)
@@ -11,8 +11,8 @@ SYNOPSIS
 DESCRIPTION
      scp copies files between hosts on a network.  It uses ssh(1) for data
      transfer, and uses the same authentication and provides the same security
-     as ssh(1).  Unlike rcp(1), scp will ask for passwords or passphrases if
-     they are needed for authentication.
+     as ssh(1).  scp will ask for passwords or passphrases if they are needed
+     for authentication.
 
      File names may contain a user and host specification to indicate that the
      file is to be copied to/from that host.  Local file names can be made
@@ -125,8 +125,7 @@ DESCRIPTION
      -P port
              Specifies the port to connect to on the remote host.  Note that
              this option is written with a capital `P', because -p is already
-             reserved for preserving the times and modes of the file in
-             rcp(1).
+             reserved for preserving the times and modes of the file.
 
      -p      Preserves modification times, access times, and modes from the
              original file.
@@ -149,15 +148,15 @@ EXIT STATUS
      The scp utility exits 0 on success, and >0 if an error occurs.
 
 SEE ALSO
-     rcp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
-     ssh_config(5), sshd(8)
+     sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh_config(5),
+     sshd(8)
 
 HISTORY
-     scp is based on the rcp(1) program in BSD source code from the Regents of
+     scp is based on the rcp program in BSD source code from the Regents of
      the University of California.
 
 AUTHORS
      Timo Rinne <tri@iki.fi>
      Tatu Ylonen <ylo@cs.hut.fi>
 
-OpenBSD 5.5                    October 20, 2013                    OpenBSD 5.5
+OpenBSD 5.6                     March 19, 2014                     OpenBSD 5.6