1 files changed, 38 insertions, 38 deletions
diff --git a/scp.0 b/scp.0
index 9536d236e..7a653c687 100644
--- a/scp.0
+++ b/scp.0
@@ -1,17 +1,17 @@
 SCP(1)                    BSD General Commands Manual                   SCP(1)
-^[[1mNAME^[[0m
+NAME
-     ^[[1mscp ^[[22mM-bMM-^R secure copy (remote file copy program)
+     scp - secure copy (remote file copy program)
-^[[1mSYNOPSIS^[[0m
+SYNOPSIS
-     ^[[1mscp ^[[22m[^[[1mM-bMM-^RpqrvBC1246^[[22m] [^[[1mM-bMM-^RF ^[[4m^[[22mssh_config^[[24m] [^[[1mM-bMM-^RS ^[[4m^[[22mprogram^[[24m] [^[[1mM-bMM-^RP ^[[4m^[[22mport^[[24m] [^[[1mM-bMM-^Rc ^[[4m^[[22mcipher^[[24m]
+     scp [-pqrvBC1246] [-F ssh_config] [-S program] [-P port] [-c cipher]
-         [^[[1mM-bMM-^Ri ^[[4m^[[22midentity_file^[[24m] [^[[1mM-bMM-^Rl ^[[4m^[[22mlimit^[[24m] [^[[1mM-bMM-^Ro ^[[4m^[[22mssh_option^[[24m] [[^[[4muser@^[[24m]^[[4mhost1^[[24m:]^[[4mfile1^[[0m
+         [-i identity_file] [-l limit] [-o ssh_option] [[user@]host1:]file1
-         [^[[4m...^[[24m] [[^[[4muser@^[[24m]^[[4mhost2^[[24m:]^[[4mfile2^[[0m
+         [...] [[user@]host2:]file2
-^[[1mDESCRIPTION^[[0m
+DESCRIPTION
-     ^[[1mscp ^[[22mcopies files between hosts on a network.  It uses ssh(1) for data
+     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), ^[[1mscp ^[[22mwill ask for passwords or passphrases if
+     as ssh(1).  Unlike rcp(1), scp will ask for passwords or passphrases if
     they are needed for authentication.
     Any file name may contain a host and user specification to indicate that
@@ -20,74 +20,74 @@ SCP(1)                    BSD General Commands Manual                   SCP(1)
     The options are as follows:
-     ^[[1mM-bMM-^Rc ^[[4m^[[22mcipher^[[0m
+     -c cipher
             Selects the cipher to use for encrypting the data transfer.  This
             option is directly passed to ssh(1).
-     ^[[1mM-bMM-^Ri ^[[4m^[[22midentity_file^[[0m
+     -i identity_file
             Selects the file from which the identity (private key) for RSA
             authentication is read.  This option is directly passed to
             ssh(1).
-     ^[[1mM-bMM-^Rl ^[[4m^[[22mlimit^[[0m
+     -l limit
             Limits the used bandwidth, specified in Kbit/s.
-     ^[[1mM-bMM-^Rp      ^[[22mPreserves modification times, access times, and modes from the
+     -p      Preserves modification times, access times, and modes from the
             original file.
-     ^[[1mM-bMM-^Rr      ^[[22mRecursively copy entire directories.
+     -r      Recursively copy entire directories.
-     ^[[1mM-bMM-^Rv      ^[[22mVerbose mode.  Causes ^[[1mscp ^[[22mand ssh(1) to print debugging messages
+     -v      Verbose mode.  Causes scp and ssh(1) to print debugging messages
             about their progress.  This is helpful in debugging connection,
             authentication, and configuration problems.
-     ^[[1mM-bMM-^RB      ^[[22mSelects batch mode (prevents asking for passwords or
+     -B      Selects batch mode (prevents asking for passwords or
             passphrases).
-     ^[[1mM-bMM-^Rq      ^[[22mDisables the progress meter.
+     -q      Disables the progress meter.
-     ^[[1mM-bMM-^RC      ^[[22mCompression enable.  Passes the ^[[1mM-bMM-^RC ^[[22mflag to ssh(1) to enable comM-bM-^@M-^P
+     -C      Compression enable.  Passes the -C flag to ssh(1) to enable com-
             pression.
-     ^[[1mM-bMM-^RF ^[[4m^[[22mssh_config^[[0m
+     -F ssh_config
-             Specifies an alternative perM-bM-^@M-^Puser configuration file for ^[[1mssh^[[22m.
+             Specifies an alternative per-user configuration file for ssh.
             This option is directly passed to ssh(1).
-     ^[[1mM-bMM-^RP ^[[4m^[[22mport^[[0m
+     -P port
             Specifies the port to connect to on the remote host.  Note that
-             this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because ^[[1mM-bMM-^Rp ^[[22mis already
+             this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because -p is already
             reserved for preserving the times and modes of the file in
             rcp(1).
-     ^[[1mM-bMM-^RS ^[[4m^[[22mprogram^[[0m
+     -S program
-             Name of ^[[4mprogram^[[24m to use for the encrypted connection.  The program
+             Name of program to use for the encrypted connection.  The program
             must understand ssh(1) options.
-     ^[[1mM-bMM-^Ro ^[[4m^[[22mssh_option^[[0m
+     -o ssh_option
-             Can be used to pass options to ^[[1mssh ^[[22min the format used in
+             Can be used to pass options to ssh in the format used in
             ssh_config(5).  This is useful for specifying options for which
-             there is no separate ^[[1mscp ^[[22mcommandM-bM-^@M-^Pline flag.
+             there is no separate scp command-line flag.
-     ^[[1mM-bMM-^R1      ^[[22mForces ^[[1mscp ^[[22mto use protocol 1.
+     -1      Forces scp to use protocol 1.
-     ^[[1mM-bMM-^R2      ^[[22mForces ^[[1mscp ^[[22mto use protocol 2.
+     -2      Forces scp to use protocol 2.
-     ^[[1mM-bMM-^R4      ^[[22mForces ^[[1mscp ^[[22mto use IPv4 addresses only.
+     -4      Forces scp to use IPv4 addresses only.
-     ^[[1mM-bMM-^R6      ^[[22mForces ^[[1mscp ^[[22mto use IPv6 addresses only.
+     -6      Forces scp to use IPv6 addresses only.
-^[[1mDIAGNOSTICS^[[0m
+DIAGNOSTICS
-     ^[[1mscp ^[[22mexits with 0 on success or >0 if an error occurred.
+     scp exits with 0 on success or >0 if an error occurred.
-^[[1mAUTHORS^[[0m
+AUTHORS
     Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
-^[[1mHISTORY^[[0m
+HISTORY
-     ^[[1mscp ^[[22mis based on the rcp(1) program in BSD source code from the Regents of
+     scp is based on the rcp(1) program in BSD source code from the Regents of
     the University of California.
-^[[1mSEE ALSO^[[0m
+SEE ALSO
-     rcp(1), sftp(1), ssh(1), sshM-bM-^@M-^Padd(1), sshM-bM-^@M-^Pagent(1), sshM-bM-^@M-^Pkeygen(1),
+     rcp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
     ssh_config(5), sshd(8)
 BSD                           September 25, 1999                           BSD

diff --git a/scp.0 b/scp.0 index 9536d236e..7a653c687 100644 --- a/scp.0 +++ b/scp.0
@@ -1,17 +1,17 @@
1	SCP(1) BSD General Commands Manual SCP(1)	1	SCP(1) BSD General Commands Manual SCP(1)
2		2
3	^[[1mNAME^[[0m	3	NAME
4	^[[1mscp ^[[22mM-bMM-^R secure copy (remote file copy program)	4	scp - secure copy (remote file copy program)
5		5
6	^[[1mSYNOPSIS^[[0m	6	SYNOPSIS
7	^[[1mscp ^[[22m[^[[1mM-bMM-^RpqrvBC1246^[[22m] [^[[1mM-bMM-^RF ^[[4m^[[22mssh_config^[[24m] [^[[1mM-bMM-^RS ^[[4m^[[22mprogram^[[24m] [^[[1mM-bMM-^RP ^[[4m^[[22mport^[[24m] [^[[1mM-bMM-^Rc ^[[4m^[[22mcipher^[[24m]	7	scp [-pqrvBC1246] [-F ssh_config] [-S program] [-P port] [-c cipher]
8	[^[[1mM-bMM-^Ri ^[[4m^[[22midentity_file^[[24m] [^[[1mM-bMM-^Rl ^[[4m^[[22mlimit^[[24m] [^[[1mM-bMM-^Ro ^[[4m^[[22mssh_option^[[24m] [[^[[4muser@^[[24m]^[[4mhost1^[[24m:]^[[4mfile1^[[0m	8	[-i identity_file] [-l limit] [-o ssh_option] [[user@]host1:]file1
9	[^[[4m...^[[24m] [[^[[4muser@^[[24m]^[[4mhost2^[[24m:]^[[4mfile2^[[0m	9	[...] [[user@]host2:]file2
10		10
11	^[[1mDESCRIPTION^[[0m	11	DESCRIPTION
12	^[[1mscp ^[[22mcopies files between hosts on a network. It uses ssh(1) for data	12	scp copies files between hosts on a network. It uses ssh(1) for data
13	transfer, and uses the same authentication and provides the same security	13	transfer, and uses the same authentication and provides the same security
14	as ssh(1). Unlike rcp(1), ^[[1mscp ^[[22mwill ask for passwords or passphrases if	14	as ssh(1). Unlike rcp(1), scp will ask for passwords or passphrases if
15	they are needed for authentication.	15	they are needed for authentication.
16		16
17	Any file name may contain a host and user specification to indicate that	17	Any file name may contain a host and user specification to indicate that
@@ -20,74 +20,74 @@ SCP(1) BSD General Commands Manual SCP(1)
20		20
21	The options are as follows:	21	The options are as follows:
22		22
23	^[[1mM-bMM-^Rc ^[[4m^[[22mcipher^[[0m	23	-c cipher
24	Selects the cipher to use for encrypting the data transfer. This	24	Selects the cipher to use for encrypting the data transfer. This
25	option is directly passed to ssh(1).	25	option is directly passed to ssh(1).
26		26
27	^[[1mM-bMM-^Ri ^[[4m^[[22midentity_file^[[0m	27	-i identity_file
28	Selects the file from which the identity (private key) for RSA	28	Selects the file from which the identity (private key) for RSA
29	authentication is read. This option is directly passed to	29	authentication is read. This option is directly passed to
30	ssh(1).	30	ssh(1).
31		31
32	^[[1mM-bMM-^Rl ^[[4m^[[22mlimit^[[0m	32	-l limit
33	Limits the used bandwidth, specified in Kbit/s.	33	Limits the used bandwidth, specified in Kbit/s.
34		34
35	^[[1mM-bMM-^Rp ^[[22mPreserves modification times, access times, and modes from the	35	-p Preserves modification times, access times, and modes from the
36	original file.	36	original file.
37		37
38	^[[1mM-bMM-^Rr ^[[22mRecursively copy entire directories.	38	-r Recursively copy entire directories.
39		39
40	^[[1mM-bMM-^Rv ^[[22mVerbose mode. Causes ^[[1mscp ^[[22mand ssh(1) to print debugging messages	40	-v Verbose mode. Causes scp and ssh(1) to print debugging messages
41	about their progress. This is helpful in debugging connection,	41	about their progress. This is helpful in debugging connection,
42	authentication, and configuration problems.	42	authentication, and configuration problems.
43		43
44	^[[1mM-bMM-^RB ^[[22mSelects batch mode (prevents asking for passwords or	44	-B Selects batch mode (prevents asking for passwords or
45	passphrases).	45	passphrases).
46		46
47	^[[1mM-bMM-^Rq ^[[22mDisables the progress meter.	47	-q Disables the progress meter.
48		48
49	^[[1mM-bMM-^RC ^[[22mCompression enable. Passes the ^[[1mM-bMM-^RC ^[[22mflag to ssh(1) to enable comM-bM-^@M-^P	49	-C Compression enable. Passes the -C flag to ssh(1) to enable com-
50	pression.	50	pression.
51		51
52	^[[1mM-bMM-^RF ^[[4m^[[22mssh_config^[[0m	52	-F ssh_config
53	Specifies an alternative perM-bM-^@M-^Puser configuration file for ^[[1mssh^[[22m.	53	Specifies an alternative per-user configuration file for ssh.
54	This option is directly passed to ssh(1).	54	This option is directly passed to ssh(1).
55		55
56	^[[1mM-bMM-^RP ^[[4m^[[22mport^[[0m	56	-P port
57	Specifies the port to connect to on the remote host. Note that	57	Specifies the port to connect to on the remote host. Note that
58	this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because ^[[1mM-bMM-^Rp ^[[22mis already	58	this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because -p is already
59	reserved for preserving the times and modes of the file in	59	reserved for preserving the times and modes of the file in
60	rcp(1).	60	rcp(1).
61		61
62	^[[1mM-bMM-^RS ^[[4m^[[22mprogram^[[0m	62	-S program
63	Name of ^[[4mprogram^[[24m to use for the encrypted connection. The program	63	Name of program to use for the encrypted connection. The program
64	must understand ssh(1) options.	64	must understand ssh(1) options.
65		65
66	^[[1mM-bMM-^Ro ^[[4m^[[22mssh_option^[[0m	66	-o ssh_option
67	Can be used to pass options to ^[[1mssh ^[[22min the format used in	67	Can be used to pass options to ssh in the format used in
68	ssh_config(5). This is useful for specifying options for which	68	ssh_config(5). This is useful for specifying options for which
69	there is no separate ^[[1mscp ^[[22mcommandM-bM-^@M-^Pline flag.	69	there is no separate scp command-line flag.
70		70
71	^[[1mM-bMM-^R1 ^[[22mForces ^[[1mscp ^[[22mto use protocol 1.	71	-1 Forces scp to use protocol 1.
72		72
73	^[[1mM-bMM-^R2 ^[[22mForces ^[[1mscp ^[[22mto use protocol 2.	73	-2 Forces scp to use protocol 2.
74		74
75	^[[1mM-bMM-^R4 ^[[22mForces ^[[1mscp ^[[22mto use IPv4 addresses only.	75	-4 Forces scp to use IPv4 addresses only.
76		76
77	^[[1mM-bMM-^R6 ^[[22mForces ^[[1mscp ^[[22mto use IPv6 addresses only.	77	-6 Forces scp to use IPv6 addresses only.
78		78
79	^[[1mDIAGNOSTICS^[[0m	79	DIAGNOSTICS
80	^[[1mscp ^[[22mexits with 0 on success or >0 if an error occurred.	80	scp exits with 0 on success or >0 if an error occurred.
81		81
82	^[[1mAUTHORS^[[0m	82	AUTHORS
83	Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>	83	Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
84		84
85	^[[1mHISTORY^[[0m	85	HISTORY
86	^[[1mscp ^[[22mis based on the rcp(1) program in BSD source code from the Regents of	86	scp is based on the rcp(1) program in BSD source code from the Regents of
87	the University of California.	87	the University of California.
88		88
89	^[[1mSEE ALSO^[[0m	89	SEE ALSO
90	rcp(1), sftp(1), ssh(1), sshM-bM-^@M-^Padd(1), sshM-bM-^@M-^Pagent(1), sshM-bM-^@M-^Pkeygen(1),	90	rcp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
91	ssh_config(5), sshd(8)	91	ssh_config(5), sshd(8)
92		92
93	BSD September 25, 1999 BSD	93	BSD September 25, 1999 BSD