upstream: Use better language to refer to the user. From l1ving

via github PR#250, ok jmc@

OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf

diff --git a/ssh.1 b/ssh.1
index 0a01767ed9a2c3ddb091304e0a6fe9d304363af3..dab8f38c497629502363bf06f47aa2d4540082d2 100644 (file)
--- 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.419 2021/02/15 20:43:15 markus Exp $
-.Dd $Mdocdate: February 15 2021 $
+.\" $OpenBSD: ssh.1,v 1.420 2021/06/25 06:20:39 dtucker Exp $
+.Dd $Mdocdate: June 25 2021 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -88,7 +88,7 @@ or a URI of the form
 .No ssh:// Oo user @ Oc hostname Op : port .
 .Sm on
 The user must prove
-his/her identity to the remote machine using one of several methods
+their identity to the remote machine using one of several methods
 (see below).
 .Pp
 If a
@@ -908,7 +908,7 @@ or higher (e.g. by using the
 .Fl v
 flag).
 .Pp
-The user creates his/her key pair by running
+The user creates their key pair by running
 .Xr ssh-keygen 1 .
 This stores the private key in
 .Pa ~/.ssh/id_dsa
@@ -942,7 +942,7 @@ in the user's home directory.
 The user should then copy the public key
 to
 .Pa ~/.ssh/authorized_keys
-in his/her home directory on the remote machine.
+in their home directory on the remote machine.
 The
 .Pa authorized_keys
 file corresponds to the conventional

diff --git a/sshconnect.c b/sshconnect.c
index 107e420971087479c9bba94778f148e6249a0317..17ce00606c183dd1baf14d8f58337a5680cf1697 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.353 2021/06/08 06:54:40 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.354 2021/06/25 06:20:39 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1346,7 +1346,7 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo,
                 * XXX Should permit the user to change to use the new id.
                 * This could be done by converting the host key to an
                 * identifying sentence, tell that the host identifies itself
-                * by that sentence, and ask the user if he/she wishes to
+                * by that sentence, and ask the user if they wish to
                 * accept the authentication.
                 */
                break;