upstream: tweak previous; ok djm

OpenBSD-Commit-ID: 229c493452766d70a78b0f02f6ff9894f9028858

diff --git a/sshd_config.5 b/sshd_config.5
index 853ba94c5e4b2b06e249a257a5a171ce3116bf02..16f1c7130344ed9d04d66bb4415ca5f261cf9652 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,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_config.5,v 1.344 2023/01/06 02:47:19 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.345 2023/01/06 08:44:11 jmc Exp $
 .Dd $Mdocdate: January 6 2023 $
 .Dt SSHD_CONFIG 5
 .Os
@@ -399,7 +399,7 @@ public key or host-based authentication.
 Specifies whether and how quickly
 .Xr sshd 8
 should close inactive channels.
-Timeouts for specified as one or more
+Timeouts are specified as one or more
 .Dq type=interval
 pairs separated by whitespace, where the
 .Dq type
@@ -421,20 +421,21 @@ The available channel types include:
 .It Cm agent-connection
 Open connections to
 .Xr ssh-agent 1 .
-.It Cm direct-tcpip Cm direct-streamlocal@openssh.com
+.It Cm direct-tcpip , Cm direct-streamlocal@openssh.com
 Open TCP or Unix socket (respectively) connections that have
 been established from a
 .Xr ssh 1
-local forwarding, i.e.
-.Cm LocalForward or
+local forwarding, i.e.\&
+.Cm LocalForward
+or
 .Cm DynamicForward .
-.It Cm forwarded-tcpip Cm forwarded-streamlocal@openssh.com
+.It Cm forwarded-tcpip , Cm forwarded-streamlocal@openssh.com
 Open TCP or Unix socket (respectively) connections that have been
 established to a
 .Xr sshd 8
 listening on behalf of a
 .Xr ssh 1
-remote forwarding, i.e.
+remote forwarding, i.e.\&
 .Cm RemoteForward .
 .It Cm session:command
 Command execution sessions.
@@ -449,11 +450,11 @@ which could be identified as
 Open X11 forwarding sessions.
 .El
 .Pp
-Note that, in all the above cases, terminating an inactive session does not
+Note that in all the above cases, terminating an inactive session does not
 guarantee to remove all resources associated with the session, e.g. shell
 processes or X11 clients relating to the session may continue to execute.
 .Pp
-Moreover, terminating an inactive channel or session does necessarily
+Moreover, terminating an inactive channel or session does not necessarily
 close the SSH connection, nor does it prevent a client from
 requesting another channel of the same type.
 In particular, expiring an inactive forwarding session does not prevent