- add proxyjump to the options list

- formatting fixes
- update usage()

ok djm

1 files changed, 5 insertions, 6 deletions

diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 86057702391..56d7798cad6 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -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_config.5,v 1.233 2016/07/15 00:24:30 djm Exp $
-.Dd $Mdocdate: July 15 2016 $
+.\" $OpenBSD: ssh_config.5,v 1.234 2016/07/16 06:57:55 jmc Exp $
+.Dd $Mdocdate: July 16 2016 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1362,9 +1362,9 @@ ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
 Specifies one or more jump proxies as
 .Xo
 .Sm off
-.Oo Ar user @ Oc
+.Op Ar user No @
 .Ar host
-.Ns Op : Ns Ar port
+.Op : Ns Ar port
 .Sm on
 .Xc .
 Multiple proxies may be separated by comma characters.
@@ -1375,13 +1375,12 @@ to connect to the target host by first making a
 connection to the specified
 .Cm ProxyJump
 host and then establishing a
-a TCP forwarding to the ultimate target from there.
+TCP forwarding to the ultimate target from there.
 .Pp
 Note that this option will compete with the
 .Cm ProxyCommand
 option - whichever is specified first will prevent later instances of the
 other from taking effect.
-.Pp
 .It Cm ProxyUseFdpass
 Specifies that
 .Cm ProxyCommand