summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org@openbsd.org <jmc@openbsd.org@openbsd.org>2017-10-25 06:19:46 +0000
committerDamien Miller <djm@mindrot.org>2017-10-31 09:08:50 +1100
commit0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b (patch)
treeec3a88cc08864babe83e1111c409f12c1d77403a
parent7530e77bdc9415386d2a8ea3d086e8b611b2ba40 (diff)
upstream commit
tweak the uri text, specifically removing some markup to make it a bit more readable; issue reported by - and diff ok - millert OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f
-rw-r--r--scp.123
-rw-r--r--sftp.116
-rw-r--r--ssh.125
3 files changed, 31 insertions, 33 deletions
diff --git a/scp.1 b/scp.1
index 92b63f6f4..d6d9d97c1 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.75 2017/10/21 23:06:24 millert Exp $ 11.\" $OpenBSD: scp.1,v 1.76 2017/10/25 06:19:46 jmc Exp $
12.\" 12.\"
13.Dd $Mdocdate: October 21 2017 $ 13.Dd $Mdocdate: October 25 2017 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -18,7 +18,6 @@
18.Nd secure copy (remote file copy program) 18.Nd secure copy (remote file copy program)
19.Sh SYNOPSIS 19.Sh SYNOPSIS
20.Nm scp 20.Nm scp
21.Bk -words
22.Op Fl 346BCpqrv 21.Op Fl 346BCpqrv
23.Op Fl c Ar cipher 22.Op Fl c Ar cipher
24.Op Fl F Ar ssh_config 23.Op Fl F Ar ssh_config
@@ -27,8 +26,7 @@
27.Op Fl o Ar ssh_option 26.Op Fl o Ar ssh_option
28.Op Fl P Ar port 27.Op Fl P Ar port
29.Op Fl S Ar program 28.Op Fl S Ar program
30.Ar source ... 29.Ar source ... target
31.Ar target
32.Sh DESCRIPTION 30.Sh DESCRIPTION
33.Nm 31.Nm
34copies files between hosts on a network. 32copies files between hosts on a network.
@@ -42,15 +40,18 @@ will ask for passwords or passphrases if they are needed for
42authentication. 40authentication.
43.Pp 41.Pp
44The 42The
45.Ar target 43.Ar source
46and 44and
47.Ar destination 45.Ar target
48may be specified as a local pathname, a remote host with optional path 46may be specified as a local pathname, a remote host with optional path
49in the form 47in the form
50.Oo Ar user Ns @ Oc Ns Ar host Ns : Ns Oo Ar path Oc , 48.Sm off
51or an scp URI in the form 49.Oo user @ Oc host : Op path ,
52.No scp:// Ns Oo Ar user Ns @ Oc Ns Ar host Ns 50.Sm on
53.Oo : Ns Ar port Oc Ns Oo / Ns Ar path Oc . 51or a URI in the form
52.Sm off
53.No scp:// Oo user @ Oc host Oo : port Oc Op / path .
54.Sm on
54Local file names can be made explicit using absolute or relative pathnames 55Local file names can be made explicit using absolute or relative pathnames
55to avoid 56to avoid
56.Nm 57.Nm
diff --git a/sftp.1 b/sftp.1
index 49f7febf1..9b03280be 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.111 2017/10/21 23:06:24 millert Exp $ 1.\" $OpenBSD: sftp.1,v 1.112 2017/10/25 06:19:46 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: October 21 2017 $ 25.Dd $Mdocdate: October 25 2017 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -30,7 +30,6 @@
30.Nd secure file transfer program 30.Nd secure file transfer program
31.Sh SYNOPSIS 31.Sh SYNOPSIS
32.Nm sftp 32.Nm sftp
33.Bk -words
34.Op Fl 46aCfpqrv 33.Op Fl 46aCfpqrv
35.Op Fl B Ar buffer_size 34.Op Fl B Ar buffer_size
36.Op Fl b Ar batchfile 35.Op Fl b Ar batchfile
@@ -58,10 +57,13 @@ compression.
58The 57The
59.Ar destination 58.Ar destination
60may be specified either as 59may be specified either as
61.Oo Ar user Ns @ Oc Ns Ar host Ns Oo : Ns Ar path Oc 60.Sm off
62or as an sftp URI in the form 61.Oo user @ Oc host Op : path
63.No sftp:// Ns Oo Ar user Ns @ Oc Ns Ar host Ns 62.Sm on
64.Oo : Ns Ar port Oc Ns Oo / Ns Ar path Oc . 63or as a URI in the form
64.Sm off
65.No sftp:// Oo user @ Oc host Oo : port Oc Op / path .
66.Sm on
65.Pp 67.Pp
66If the 68If the
67.Ar destination 69.Ar destination
diff --git a/ssh.1 b/ssh.1
index 093f17707..dbe21831c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.387 2017/10/23 05:08:00 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.388 2017/10/25 06:19:46 jmc Exp $
37.Dd $Mdocdate: October 23 2017 $ 37.Dd $Mdocdate: October 25 2017 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -42,7 +42,6 @@
42.Nd OpenSSH SSH client (remote login program) 42.Nd OpenSSH SSH client (remote login program)
43.Sh SYNOPSIS 43.Sh SYNOPSIS
44.Nm ssh 44.Nm ssh
45.Bk -words
46.Op Fl 46AaCfGgKkMNnqsTtVvXxYy 45.Op Fl 46AaCfGgKkMNnqsTtVvXxYy
47.Op Fl b Ar bind_address 46.Op Fl b Ar bind_address
48.Op Fl c Ar cipher_spec 47.Op Fl c Ar cipher_spec
@@ -66,7 +65,6 @@
66.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun 65.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
67.Ar destination 66.Ar destination
68.Op Ar command 67.Op Ar command
69.Ek
70.Sh DESCRIPTION 68.Sh DESCRIPTION
71.Nm 69.Nm
72(SSH client) is a program for logging into a remote machine and for 70(SSH client) is a program for logging into a remote machine and for
@@ -79,18 +77,15 @@ sockets can also be forwarded over the secure channel.
79.Pp 77.Pp
80.Nm 78.Nm
81connects and logs into the specified 79connects and logs into the specified
82.Ar destination 80.Ar destination ,
83which may be specified as either 81which may be specified as either
84.Oo Ar user Ns @ Oc Ns Ar hostname 82.Sm off
85where the 83.Oo user @ Oc hostname
86.Ar user 84.Sm on
87is optional, or an ssh URI of the form 85or a URI of the form
88.No ssh:// Ns Oo Ar user Ns @ Oc Ns Ar hostname Ns Oo : Ns Ar port Oc 86.Sm off
89where the 87.No ssh:// Oo user @ Oc hostname Op : port .
90.Ar user 88.Sm on
91and
92.Ar port
93are optional.
94The user must prove 89The user must prove
95his/her identity to the remote machine using one of several methods 90his/her identity to the remote machine using one of several methods
96(see below). 91(see below).