From: jmc <jmc@openbsd.org>
Date: Wed, 22 Dec 2021 06:56:41 +0000 (+0000)
Subject: sort -H and -h in SYNOPSIS/usage();
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6c290b832275b1657f29d8133351b8168f46747d;p=openbsd

sort -H and -h in SYNOPSIS/usage();
tweak the -H text;

ok djm
---

diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1
index 83a6b9a3ebe..9d39a626255 100644
--- a/usr.bin/ssh/ssh-add.1
+++ b/usr.bin/ssh/ssh-add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-add.1,v 1.82 2021/12/19 22:14:12 djm Exp $
+.\"	$OpenBSD: ssh-add.1,v 1.83 2021/12/22 06:56:41 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,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: December 19 2021 $
+.Dd $Mdocdate: December 22 2021 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -45,10 +45,10 @@
 .Nm ssh-add
 .Op Fl cDdKkLlqvXx
 .Op Fl E Ar fingerprint_hash
-.Op Fl S Ar provider
-.Op Fl t Ar life
 .Op Fl H Ar hostkey_file
 .Op Fl h Ar destination_constraint
+.Op Fl S Ar provider
+.Op Fl t Ar life
 .Op Ar
 .Nm ssh-add
 .Fl s Ar pkcs11
@@ -132,8 +132,8 @@ The default is
 Remove keys provided by the PKCS#11 shared library
 .Ar pkcs11 .
 .It Fl H Ar hostkey_file
-Specifies a known hosts file to lookup hostkeys when using destination-
-constained keys via the
+Specifies a known hosts file to look up hostkeys when using
+destination-constrained keys via the
 .Fl h
 flag.
 This option may be specified multiple times to allow multiple files to be
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 970d1163795..50790d2a014 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.162 2021/12/19 22:10:24 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.163 2021/12/22 06:56:41 jmc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -765,8 +765,8 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-"usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]\n"
-"               [-H hostkey_file] [-h destination]\n"
+"usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-H hostkey_file]\n"
+"               [-h destination_constraint] [-S provider] [-t life]\n"
 #ifdef WITH_XMSS
 "               [-M maxsign] [-m minleft]\n"
 #endif