- Fix up SYNOPSIS sections.

- Remove refereces to /etc/environment and /etc/default/login; markus@
- Document X11DisplayOffset in sshd(8).
- Some other fixes...

1 files changed, 22 insertions, 21 deletions

diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 13c926fc8ca..064d1ed344f 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: ssh.1,v 1.11 1999/10/02 21:35:47 deraadt Exp $
+.\" $Id: ssh.1,v 1.12 1999/10/03 18:46:12 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH 1
@@ -25,14 +25,28 @@
 .Pp
 .Nm ssh
 .Op Fl agknqtvxXC
-.Op Fl c Ar blowfish|3des
+.Op Fl c Ar blowfish | 3des
 .Op Fl e Ar escape_char
 .Op Fl i Ar identity_file
 .Op Fl l Ar login_name
 .Op Fl o Ar option
 .Op Fl p Ar port
-.Op Fl L Ar port:host:hostport
-.Op Fl R Ar port:host:hostport
+.Oo Fl L Xo
+.Sm off
+.Ar host :
+.Ar port :
+.Ar hostport
+.Sm on
+.Xc
+.Oc
+.Oo Fl R Xo
+.Sm off
+.Ar host :
+.Ar port :
+.Ar hostport
+.Sm on
+.Xc
+.Oc
 .Op Ar hostname | user@hostname
 .Op Ar command
 .Sh DESCRIPTION 
@@ -592,10 +606,6 @@ somewhere.  Host key management will be done using the
 HostName of the host being connected (defaulting to the name typed by
 the user).
 .Pp
-Note that
-.Nm
-can also be configured to support the SOCKS system using the
---with-socks compile-time configuration option.
 .It Cm RemoteForward
 Specifies that a TCP/IP port on the remote machine be forwarded over
 the secure channel to given host:port from the local machine.  The
@@ -692,19 +702,15 @@ manually copy any required authorization cookies).
 Set to the path of the user's home directory.
 .It Ev LOGNAME
 Synonym for
-.Ev USER ; set for compatibility with systems that use
-this variable.
+.Ev USER ;
+set for compatibility with systems that use this variable.
 .It Ev MAIL
 Set to point the user's mailbox.
 .It Ev  PATH
 Set to the default
 .Ev PATH ,
 as specified when compiling
-.Nm
-or, on some systems, 
-.Pa /etc/environment 
-or 
-.Pa /etc/default/login .
+.Nm ssh .
 .It Ev SSH_AUTHENTICATION_FD
 This is set to an integer value if you are using the authentication
 agent and a connection to it has been forwarded.  The value indicates
@@ -734,15 +740,10 @@ Set to the name of the user logging in.
 Additionally, 
 .Nm
 reads 
-.Pa /etc/environment 
-and 
 .Pa $HOME/.ssh/environment , 
 and adds lines of the format
 .Dq VARNAME=value
-to the environment.  Some systems may have
-still additional mechanisms for setting up the environment, such as
-.Pa /etc/default/login
-on Solaris.
+to the environment.
 .Sh FILES
 .Bl -tag -width $HOME/.ssh/known_hosts
 .It Pa $HOME/.ssh/known_hosts