From 0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b Mon Sep 17 00:00:00 2001
From: "jmc@openbsd.org@openbsd.org" <jmc@openbsd.org@openbsd.org>
Date: Wed, 25 Oct 2017 06:19:46 +0000
Subject: 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
---
 ssh.1 | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'ssh.1')

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).
-- 
cgit v1.2.1