summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 92b63f6f..d6d9d97c 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.75 2017/10/21 23:06:24 millert Exp $
+.\" $OpenBSD: scp.1,v 1.76 2017/10/25 06:19:46 jmc Exp $
.\"
-.Dd $Mdocdate: October 21 2017 $
+.Dd $Mdocdate: October 25 2017 $
.Dt SCP 1
.Os
.Sh NAME
@@ -18,7 +18,6 @@
.Nd secure copy (remote file copy program)
.Sh SYNOPSIS
.Nm scp
-.Bk -words
.Op Fl 346BCpqrv
.Op Fl c Ar cipher
.Op Fl F Ar ssh_config
@@ -27,8 +26,7 @@
.Op Fl o Ar ssh_option
.Op Fl P Ar port
.Op Fl S Ar program
-.Ar source ...
-.Ar target
+.Ar source ... target
.Sh DESCRIPTION
.Nm
copies files between hosts on a network.
@@ -42,15 +40,18 @@ will ask for passwords or passphrases if they are needed for
authentication.
.Pp
The
-.Ar target
+.Ar source
and
-.Ar destination
+.Ar target
may be specified as a local pathname, a remote host with optional path
in the form
-.Oo Ar user Ns @ Oc Ns Ar host Ns : Ns Oo Ar path Oc ,
-or an scp URI in the form
-.No scp:// Ns Oo Ar user Ns @ Oc Ns Ar host Ns
-.Oo : Ns Ar port Oc Ns Oo / Ns Ar path Oc .
+.Sm off
+.Oo user @ Oc host : Op path ,
+.Sm on
+or a URI in the form
+.Sm off
+.No scp:// Oo user @ Oc host Oo : port Oc Op / path .
+.Sm on
Local file names can be made explicit using absolute or relative pathnames
to avoid
.Nm
diff --git a/sftp.1 b/sftp.1
index 49f7febf..9b03280b 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.111 2017/10/21 23:06:24 millert Exp $
+.\" $OpenBSD: sftp.1,v 1.112 2017/10/25 06:19:46 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 21 2017 $
+.Dd $Mdocdate: October 25 2017 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -30,7 +30,6 @@
.Nd secure file transfer program
.Sh SYNOPSIS
.Nm sftp
-.Bk -words
.Op Fl 46aCfpqrv
.Op Fl B Ar buffer_size
.Op Fl b Ar batchfile
@@ -58,10 +57,13 @@ compression.
The
.Ar destination
may be specified either as
-.Oo Ar user Ns @ Oc Ns Ar host Ns Oo : Ns Ar path Oc
-or as an sftp URI in the form
-.No sftp:// Ns Oo Ar user Ns @ Oc Ns Ar host Ns
-.Oo : Ns Ar port Oc Ns Oo / Ns Ar path Oc .
+.Sm off
+.Oo user @ Oc host Op : path
+.Sm on
+or as a URI in the form
+.Sm off
+.No sftp:// Oo user @ Oc host Oo : port Oc Op / path .
+.Sm on
.Pp
If the
.Ar destination
diff --git a/ssh.1 b/ssh.1
index 093f1770..dbe21831 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.387 2017/10/23 05:08:00 djm Exp $
-.Dd $Mdocdate: October 23 2017 $
+.\" $OpenBSD: ssh.1,v 1.388 2017/10/25 06:19:46 jmc Exp $
+.Dd $Mdocdate: October 25 2017 $
.Dt SSH 1
.Os
.Sh NAME
@@ -42,7 +42,6 @@
.Nd OpenSSH SSH client (remote login program)
.Sh SYNOPSIS
.Nm ssh
-.Bk -words
.Op Fl 46AaCfGgKkMNnqsTtVvXxYy
.Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec
@@ -66,7 +65,6 @@
.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
.Ar destination
.Op Ar command
-.Ek
.Sh DESCRIPTION
.Nm
(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.
.Pp
.Nm
connects and logs into the specified
-.Ar destination
+.Ar destination ,
which may be specified as either
-.Oo Ar user Ns @ Oc Ns Ar hostname
-where the
-.Ar user
-is optional, or an ssh URI of the form
-.No ssh:// Ns Oo Ar user Ns @ Oc Ns Ar hostname Ns Oo : Ns Ar port Oc
-where the
-.Ar user
-and
-.Ar port
-are optional.
+.Sm off
+.Oo user @ Oc hostname
+.Sm on
+or a URI of the form
+.Sm off
+.No ssh:// Oo user @ Oc hostname Op : port .
+.Sm on
The user must prove
his/her identity to the remote machine using one of several methods
(see below).