summaryrefslogtreecommitdiff
path: root/RFC.nroff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-03-01 02:25:32 +0000
committerColin Watson <cjwatson@debian.org>2004-03-01 02:25:32 +0000
commitea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch)
treed73ccdff78d8608e156465af42e6a1b3527fb2d6 /RFC.nroff
parente39b311381a5609cc05acf298c42fba196dc524b (diff)
parentf5bda272678ec6dccaa5f29379cf60cb855018e8 (diff)
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet. ProtocolKeepAlives is now just a compatibility alias for ServerAliveInterval.
Diffstat (limited to 'RFC.nroff')
-rw-r--r--RFC.nroff4
1 files changed, 2 insertions, 2 deletions
diff --git a/RFC.nroff b/RFC.nroff
index bf7146a70..d6baed652 100644
--- a/RFC.nroff
+++ b/RFC.nroff
@@ -137,7 +137,7 @@ pseudo tty, starting X11 [X11] or TCP/IP port forwarding, starting
137authentication agent forwarding, and executing the shell or a command. 137authentication agent forwarding, and executing the shell or a command.
138 138
139When a shell or command is executed, the connection enters interactive 139When a shell or command is executed, the connection enters interactive
140session mode. In this mode, data is passed in both directions, 140session mode. In this mode, data is passed in both directions,
141new forwarded connections may be opened, etc. The interactive session 141new forwarded connections may be opened, etc. The interactive session
142normally terminates when the server sends the exit status of the 142normally terminates when the server sends the exit status of the
143program to the client. 143program to the client.
@@ -372,7 +372,7 @@ previous versions keep the same major protocol version; changes that
372are not compatible increment the major version (which will hopefully 372are not compatible increment the major version (which will hopefully
373never happen). The version described in this document is 1.3. 373never happen). The version described in this document is 1.3.
374 374
375The client will 375The client will
376 376
377.ti 0 377.ti 0
378Key Exchange and Server Host Authentication 378Key Exchange and Server Host Authentication