[openssh-commits] [openssh] 01/02: upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Dec 27 10:40:30 AEDT 2021


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 0074aa2c8d605ee7587279a22cdad4270b4ddd07
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Wed Dec 22 06:56:41 2021 +0000

    upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;
    
    ok djm
    
    OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
---
 ssh-add.1 | 12 ++++++------
 ssh-add.c |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ssh-add.1 b/ssh-add.1
index 83a6b9a3..9d39a626 100644
--- a/ssh-add.1
+++ b/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 at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at 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/ssh-add.c b/ssh-add.c
index 5090aca4..4f2d7054 100644
--- a/ssh-add.c
+++ b/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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -772,8 +772,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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list