* New upstream release (http://www.openssh.com/txt/release-5.6):

  - Added a ControlPersist option to ssh_config(5) that automatically
    starts a background ssh(1) multiplex master when connecting.  This
    connection can stay alive indefinitely, or can be set to automatically
    close after a user-specified duration of inactivity (closes: #335697,
    #350898, #454787, #500573, #550262).
  - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
    HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
    Match blocks (closes: #549858).
  - sftp(1): fix ls in working directories that contain globbing
    characters in their pathnames (LP: #530714).

1 files changed, 10 insertions, 10 deletions

diff --git a/scp.0 b/scp.0
index fc9f75594..f5af8ccd5 100644
--- a/scp.0
+++ b/scp.0
@@ -6,7 +6,7 @@ NAME
 SYNOPSIS
      scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]
          [-l limit] [-o ssh_option] [-P port] [-S program]
-         [[user@]host1:]file1 ...  [[user@]host2:]file2
+         [[user@]host1:]file1 ... [[user@]host2:]file2
 
 DESCRIPTION
      scp copies files between hosts on a network.  It uses ssh(1) for data
@@ -15,8 +15,8 @@ DESCRIPTION
      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 ex-
-     plicit using absolute or relative pathnames to avoid scp treating file
+     file is to be copied to/from that host.  Local file names can be made
+     explicit using absolute or relative pathnames to avoid scp treating file
      names containing `:' as host specifiers.  Copies between two remote hosts
      are also permitted.
 
@@ -30,11 +30,11 @@ DESCRIPTION
 
      -6      Forces scp to use IPv6 addresses only.
 
-     -B      Selects batch mode (prevents asking for passwords or passphras-
-             es).
+     -B      Selects batch mode (prevents asking for passwords or
+             passphrases).
 
-     -C      Compression enable.  Passes the -C flag to ssh(1) to enable com-
-             pression.
+     -C      Compression enable.  Passes the -C flag to ssh(1) to enable
+             compression.
 
      -c cipher
              Selects the cipher to use for encrypting the data transfer.  This
@@ -120,8 +120,8 @@ DESCRIPTION
      -q      Quiet mode: disables the progress meter as well as warning and
              diagnostic messages from ssh(1).
 
-     -r      Recursively copy entire directories.  Note that scp follows sym-
-             bolic links encountered in the tree traversal.
+     -r      Recursively copy entire directories.  Note that scp follows
+             symbolic links encountered in the tree traversal.
 
      -S program
              Name of program to use for the encrypted connection.  The program
@@ -145,4 +145,4 @@ AUTHORS
      Timo Rinne <tri@iki.fi>
      Tatu Ylonen <ylo@cs.hut.fi>
 
-OpenBSD 4.7                    February 8, 2010                              3
+OpenBSD 4.8                    February 8, 2010                    OpenBSD 4.8