From d870938ae5bf82a1753e45d28e2e64074eaa5f8a Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 16 Jan 2023 19:21:19 +0100
Subject: [PATCH] Reorder commands for clarity

---
 share/man/man1/minisign.1 | 34 +++++++++++++++++++---------------
 src/manpage.md            | 18 ++++++++++--------
 src/minisign.c            | 12 +++---------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/share/man/man1/minisign.1 b/share/man/man1/minisign.1
index 56d052b..bae8f7d 100644
--- a/share/man/man1/minisign.1
+++ b/share/man/man1/minisign.1
@@ -10,14 +10,14 @@
 \fBminisign\fR \-G [\-p pubkey_file] [\-s seckey_file] [\-W]
 .
 .P
+\fBminisign\fR \-R [\-s seckey_file] [\-W] [\-p pubkey_file]
+.
+.P
 \fBminisign\fR \-S [\-H] [\-x sig_file] [\-s seckey_file] [\-W] [\-c untrusted_comment] [\-t trusted_comment] \-m file [file \.\.\.]
 .
 .P
 \fBminisign\fR \-V [\-x sig_file] [\-p pubkey_file | \-P pubkey] [\-o] [\-q] \-m file
 .
-.P
-\fBminisign\fR \-R [\-s seckey_file] [\-W] [\-p pubkey_file]
-.
 .SH "DESCRIPTION"
 \fBMinisign\fR is a dead simple tool to sign files and verify signatures\.
 .
@@ -32,6 +32,10 @@ These options control the actions of \fBminisign\fR\.
 Generate a new key pair
 .
 .TP
+\fB\-R\fR
+Recreate a public key file from a secret key file
+.
+.TP
 \fB\-S\fR
 Sign files
 .
@@ -40,6 +44,14 @@ Sign files
 Verify that a signature is valid for a given file
 .
 .TP
+\fB\-H\fR
+Requires the input to be prehashed
+.
+.TP
+\fB\-l\fR
+Sign using the legacy format
+.
+.TP
 \fB\-m <file>\fR
 File to sign/verify
 .
@@ -60,6 +72,10 @@ Public key, as a base64 string
 Secret key file (default: ~/\.minisign/minisign\.key)
 .
 .TP
+\fB\-W\fR
+Do not encrypt/decrypt the secret key with a password
+.
+.TP
 \fB\-x <sig_file>\fR
 Signature file (default: <file>\.minisig)
 .
@@ -72,26 +88,14 @@ Add a one\-line untrusted comment
 Add a one\-line trusted comment
 .
 .TP
-\fB\-l\fR
-Sign using the legacy format
-.
-.TP
 \fB\-q\fR
 Quiet mode, suppress output
 .
 .TP
-\fB\-H\fR
-Requires the input to be prehashed
-.
-.TP
 \fB\-Q\fR
 Pretty quiet mode, only print the trusted comment
 .
 .TP
-\fB\-R\fR
-Recreate a public key file from a secret key file
-.
-.TP
 \fB\-f\fR
 Force\. Combined with \-G, overwrite a previous key pair
 .
diff --git a/src/manpage.md b/src/manpage.md
index b12de77..e84aff8 100644
--- a/src/manpage.md
+++ b/src/manpage.md
@@ -8,12 +8,12 @@ minisign(1) -- A dead simple tool to sign files and verify signatures.
 
 `minisign` -G [-p pubkey_file] [-s seckey_file] [-W]
 
+`minisign` -R [-s seckey_file] [-W] [-p pubkey_file]
+
 `minisign` -S [-H] [-x sig_file] [-s seckey_file] [-W] [-c untrusted_comment] [-t trusted_comment] -m file [file ...]
 
 `minisign` -V [-x sig_file] [-p pubkey_file | -P pubkey] [-o] [-q] -m file
 
-`minisign` -R [-s seckey_file] [-W] [-p pubkey_file]
-
 ## DESCRIPTION
 
 **Minisign** is a dead simple tool to sign files and verify signatures.
@@ -26,10 +26,16 @@ These options control the actions of `minisign`.
 
   * `-G`:
     Generate a new key pair
+  * `-R`:
+    Recreate a public key file from a secret key file
   * `-S`:
     Sign files
   * `-V`:
     Verify that a signature is valid for a given file
+  * `-H`:
+    Requires the input to be prehashed
+  * `-l`:
+    Sign using the legacy format
   * `-m <file>`:
     File to sign/verify
   * `-o`:
@@ -40,22 +46,18 @@ These options control the actions of `minisign`.
     Public key, as a base64 string
   * `-s <seckey_file>`:
     Secret key file (default: ~/.minisign/minisign.key)
+  * `-W`:
+    Do not encrypt/decrypt the secret key with a password
   * `-x <sig_file>`:
     Signature file (default: &lt;file&gt;.minisig)
   * `-c <comment>`:
     Add a one-line untrusted comment
   * `-t <comment>`:
     Add a one-line trusted comment
-  * `-l`:
-    Sign using the legacy format
   * `-q`:
     Quiet mode, suppress output
-  * `-H`:
-    Requires the input to be prehashed
   * `-Q`:
     Pretty quiet mode, only print the trusted comment
-  * `-R`:
-    Recreate a public key file from a secret key file
   * `-f`:
     Force. Combined with -G, overwrite a previous key pair
   * `-v`:
diff --git a/src/minisign.c b/src/minisign.c
index 7ffb3a7..16422ec 100644
--- a/src/minisign.c
+++ b/src/minisign.c
@@ -32,22 +32,19 @@ usage(void)
         "Usage:\n"
 #ifndef VERIFY_ONLY
         "minisign -G [-f] [-p pubkey_file] [-s seckey_file] [-W]\n"
+        "minisign -R [-s seckey_file] [-W] [-p pubkey_file]\n"
         "minisign -S [-l] [-x sig_file] [-s seckey_file] [-W] [-c untrusted_comment]\n"
         "            [-t trusted_comment] -m file [file ...]\n"
 #endif
         "minisign -V [-H] [-x sig_file] [-p pubkey_file | -P pubkey] [-o] [-q] -m file\n"
-#ifndef VERIFY_ONLY
-        "minisign -R [-s seckey_file] [-W] [-p pubkey_file]\n"
-#endif
         "\n"
 #ifndef VERIFY_ONLY
         "-G                generate a new key pair\n"
-#endif
-        "-H                require input to be prehashed\n"
-#ifndef VERIFY_ONLY
+        "-R                recreate a public key file from a secret key file\n"
         "-S                sign files\n"
 #endif
         "-V                verify that a signature is valid for a given file\n"
+        "-H                require input to be prehashed\n"
         "-l                sign using the legacy format\n"
         "-m <file>         file to sign/verify\n"
         "-o                combined with -V, output the file content after verification\n"
@@ -64,9 +61,6 @@ usage(void)
 #endif
         "-q                quiet mode, suppress output\n"
         "-Q                pretty quiet mode, only print the trusted comment\n"
-#ifndef VERIFY_ONLY
-        "-R                recreate a public key file from a secret key file\n"
-#endif
         "-f                force. Combined with -G, overwrite a previous key pair\n"
         "-v                display version number\n");
     exit(2);