summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2022-03-31 19:27:27 +0200
committerDamien Miller <djm@mindrot.org>2022-04-06 01:16:05 +0200
commit9ec2713d122af79d66ebb9c1d6d9ae8621a8945f (patch)
tree53b55061633edb7e9a134b8bd488244857957afc
parentDisable security key on fbsd6 test host. (diff)
downloadopenssh-9ec2713d122af79d66ebb9c1d6d9ae8621a8945f.tar.xz
openssh-9ec2713d122af79d66ebb9c1d6d9ae8621a8945f.zip
upstream: man pages: add missing commas between subordinate and
main clauses jmc@ dislikes a comma before "then" in a conditional, so leave those untouched. ok jmc@ OpenBSD-Commit-ID: 9520801729bebcb3c9fe43ad7f9776ab4dd05ea3
-rw-r--r--sftp.14
-rw-r--r--ssh-agent.18
-rw-r--r--ssh-keysign.86
-rw-r--r--ssh.110
-rw-r--r--ssh_config.58
-rw-r--r--sshd.86
6 files changed, 21 insertions, 21 deletions
diff --git a/sftp.1 b/sftp.1
index 766adceea..39e7d6ed6 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.139 2022/03/31 03:07:03 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.140 2022/03/31 17:27:27 naddy Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -126,7 +126,7 @@ Batch mode reads a series of commands from an input
.Ar batchfile
instead of
.Em stdin .
-Since it lacks user interaction it should be used in conjunction with
+Since it lacks user interaction, it should be used in conjunction with
non-interactive authentication to obviate the need to enter a password
at connection time (see
.Xr sshd 8
diff --git a/ssh-agent.1 b/ssh-agent.1
index ed8c87096..ea43cd156 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.72 2020/06/22 05:52:05 djm Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.73 2022/03/31 17:27:27 naddy Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -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.
.\"
-.Dd $Mdocdate: June 22 2020 $
+.Dd $Mdocdate: March 31 2022 $
.Dt SSH-AGENT 1
.Os
.Sh NAME
@@ -82,12 +82,12 @@ This is the default if
looks like it's a csh style of shell.
.It Fl D
Foreground mode.
-When this option is specified
+When this option is specified,
.Nm
will not fork.
.It Fl d
Debug mode.
-When this option is specified
+When this option is specified,
.Nm
will not fork and will write debug information to standard error.
.It Fl E Ar fingerprint_hash
diff --git a/ssh-keysign.8 b/ssh-keysign.8
index 73b62397c..6b4b9b270 100644
--- a/ssh-keysign.8
+++ b/ssh-keysign.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keysign.8,v 1.16 2019/11/30 07:07:59 jmc Exp $
+.\" $OpenBSD: ssh-keysign.8,v 1.17 2022/03/31 17:27:27 naddy Exp $
.\"
.\" Copyright (c) 2002 Markus Friedl. All rights reserved.
.\"
@@ -22,7 +22,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.
.\"
-.Dd $Mdocdate: November 30 2019 $
+.Dd $Mdocdate: March 31 2022 $
.Dt SSH-KEYSIGN 8
.Os
.Sh NAME
@@ -77,7 +77,7 @@ must be set-uid root if host-based authentication is used.
.It Pa /etc/ssh/ssh_host_ecdsa_key-cert.pub
.It Pa /etc/ssh/ssh_host_ed25519_key-cert.pub
.It Pa /etc/ssh/ssh_host_rsa_key-cert.pub
-If these files exist they are assumed to contain public certificate
+If these files exist, they are assumed to contain public certificate
information corresponding with the private keys above.
.El
.Sh SEE ALSO
diff --git a/ssh.1 b/ssh.1
index ce0024911..4a4f1683a 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.429 2022/02/06 00:29:03 jsg Exp $
-.Dd $Mdocdate: February 6 2022 $
+.\" $OpenBSD: ssh.1,v 1.430 2022/03/31 17:27:27 naddy Exp $
+.Dd $Mdocdate: March 31 2022 $
.Dt SSH 1
.Os
.Sh NAME
@@ -705,7 +705,7 @@ argument is
the listen port will be dynamically allocated on the server and reported
to the client at run time.
When used together with
-.Ic -O forward
+.Ic -O forward ,
the allocated port will be printed to the standard output.
.Pp
.It Fl S Ar ctl_path
@@ -1045,7 +1045,7 @@ the user a normal shell as an interactive session.
All communication with
the remote command or shell will be automatically encrypted.
.Pp
-If an interactive session is requested
+If an interactive session is requested,
.Nm
by default will only request a pseudo-terminal (pty) for interactive
sessions when the client has one.
@@ -1055,7 +1055,7 @@ and
.Fl t
can be used to override this behaviour.
.Pp
-If a pseudo-terminal has been allocated the
+If a pseudo-terminal has been allocated, the
user may use the escape characters noted below.
.Pp
If no pseudo-terminal has been allocated,
diff --git a/ssh_config.5 b/ssh_config.5
index 69132282b..333dfc6b3 100644
--- a/ssh_config.5
+++ b/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.369 2022/02/15 05:13:36 djm Exp $
-.Dd $Mdocdate: February 15 2022 $
+.\" $OpenBSD: ssh_config.5,v 1.370 2022/03/31 17:27:27 naddy Exp $
+.Dd $Mdocdate: March 31 2022 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -435,7 +435,7 @@ directives will add to the list of certificates used for
authentication.
.It Cm CheckHostIP
If set to
-.Cm yes
+.Cm yes ,
.Xr ssh 1
will additionally check the host IP address in the
.Pa known_hosts
@@ -1581,7 +1581,7 @@ If forwarding to a specific destination then the second argument must be
or a Unix domain socket path,
otherwise if no destination argument is specified then the remote forwarding
will be established as a SOCKS proxy.
-When acting as a SOCKS proxy the destination of the connection can be
+When acting as a SOCKS proxy, the destination of the connection can be
restricted by
.Cm PermitRemoteOpen .
.Pp
diff --git a/sshd.8 b/sshd.8
index ef38949a2..350b08ad2 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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: sshd.8,v 1.317 2021/09/10 11:38:38 dtucker Exp $
-.Dd $Mdocdate: September 10 2021 $
+.\" $OpenBSD: sshd.8,v 1.318 2022/03/31 17:27:27 naddy Exp $
+.Dd $Mdocdate: March 31 2022 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -650,7 +650,7 @@ Enable all restrictions, i.e. disable port, agent and X11 forwarding,
as well as disabling PTY allocation
and execution of
.Pa ~/.ssh/rc .
-If any future restriction capabilities are added to authorized_keys files
+If any future restriction capabilities are added to authorized_keys files,
they will be included in this set.
.It Cm tunnel="n"
Force a