===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd.8,v
retrieving revision 1.153
retrieving revision 1.153.2.2
diff -u -r1.153 -r1.153.2.2
--- src/usr.bin/ssh/sshd.8	2001/09/27 17:53:24	1.153
+++ src/usr.bin/ssh/sshd.8	2001/12/05 19:31:48	1.153.2.2
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: sshd.8,v 1.153 2001/09/27 17:53:24 camield Exp $
+.\" $OpenBSD: sshd.8,v 1.153.2.2 2001/12/05 19:31:48 jason Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -402,11 +402,11 @@
 .Nm
 will disconnect the client, terminating the session. It is important
 to note that the use of client alive messages is very different from
-.Cm Keepalive
+.Cm KeepAlive
 (below). The client alive messages are sent through the
 encrypted channel and therefore will not be spoofable. The TCP keepalive
 option enabled by
-.Cm Keepalive
+.Cm KeepAlive
 is spoofable. The client alive mechanism is valuable when the client or
 server depend on knowing when a connection has become inactive.
 .Pp
@@ -1006,6 +1006,9 @@
 Environment variables set this way
 override other default environment values.
 Multiple options of this type are permitted.
+This option is automatically disabled if
+.Cm UseLogin
+is enabled.
 .It Cm no-port-forwarding
 Forbids TCP/IP forwarding when this key is used for authentication.
 Any port forward requests by the client will return an error.