From 64471b097b5e87e246e3bedd6b48f0375538b241 Mon Sep 17 00:00:00 2001
From: Christopher Wellons <wellons@nullprogram.com>
Date: Sun, 23 Jul 2017 19:56:21 -0400
Subject: [PATCH] Touch up the --help documentation.

---
 src/docs.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/docs.h b/src/docs.h
index 70df2bb..7a7d0ce 100644
--- a/src/docs.h
+++ b/src/docs.h
@@ -1,10 +1,10 @@
 static const char *docs_usage[] = {
 "usage enchive [-p|--pubkey <file>] [-s|--seckey <file>]",
 #if ENCHIVE_OPTION_AGENT
-"              [-a|--agent[=seconds]] [--no-agent]",
+"              [-a|--agent[=seconds]] [-A|--no-agent]",
 #endif
 #if ENCHIVE_OPTION_RANDOM_DEVICE
-"              [--random-device <file>] "
+"              [-r|--random-device <file>] "
 #else
 "              "
 #endif
@@ -17,18 +17,24 @@ static const char *docs_usage[] = {
 "  extract       extract from an archive using the secret key",
 "  fingerprint   print the master keypair fingerprint",
 "",
+"  -p, --pubkey <file>        set the public key file [~/.enchive.pub]",
+"  -s, --seckey <file>        set the secret key file [~/.enchive.sec]",
 #if ENCHIVE_OPTION_AGENT
-"  --agent[=seconds]      run the key agent after reading a passphrase ["
+"  -a, --agent[=seconds]      run key agent after reading a passphrase ["
      STR(ENCHIVE_AGENT_TIMEOUT) "]",
+"  -A, --no-agent             don't run the key agent"
+#  if ENCHIVE_AGENT_DEFAULT_ENABLED
+    "",
+#  else
+    " (default)",
+#  endif
 #endif
 #if ENCHIVE_OPTION_RANDOM_DEVICE
-"  --random-device <file> device for secure entropy ["
+"  -r, --random-device <dev>  device for secure entropy ["
     STR(ENCHIVE_RANDOM_DEVICE) "]",
 #endif
-"  --pubkey <file>, -p    set the public key file [~/.enchive.pub]",
-"  --seckey <file>, -s    set the secret key file [~/.enchive.sec]",
-"  --version              display version information",
-"  --help                 display this usage information",
+"  --version                  display version information",
+"  --help                     display this usage information",
 "",
 "Enchive archives files by encrypting them to yourself using your",
 "public key. It uses ChaCha20, Curve25519, and HMAC-SHA256.",