Text fixes

diff --git a/share/keyringer/edit b/share/keyringer/edit
index 0c25f642847be73834becd93c588ec53bf1977c5..47945f3b7d4ba1582cbda3e3052017042bfd7548 100755 (executable)
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -20,7 +20,7 @@ keyringer_set_tmpfile edit
 gpg --yes -o "$TMPWORK" --use-agent -d "$KEYDIR/$FILE"
 
 # Prompt
-echo "Press any key to open the decrypted data into $EDITOR, Ctrl-C to abort"
+echo "Press any key to open the decrypted data in $EDITOR, Ctrl-C to abort"
 read key
 "$EDITOR" "$TMPWORK"
 

diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index cffed9402f9575e0b334e98e842b8a0d2c6978b9..065111ebddd7cbb0e7eaa1682682301a18e626ab 100755 (executable)
--- a/share/keyringer/genpair
+++ b/share/keyringer/genpair
@@ -156,10 +156,10 @@ CWD="`pwd`"
 if [ -z "$NODE" ]; then
   echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-cacert|ssl-self> <file> <hostname> [outfile]"
   echo -e "Options:"
-  echo -e "\t gpg|ssh|ssl: key type."
-  echo -e "\t file       : base file name for encrypted output (relative to keys folder)"
-  echo -e "\t hostname   : host for the key pair"
-  echo -e "\t outfile    : optional unencrypted output file, useful for deployment"
+  echo -e "\t gpg|ssh|ssl[-cacert,-self]: key type."
+  echo -e "\t file                      : base file name for encrypted output (relative to keys folder)"
+  echo -e "\t hostname                  : host for the key pair"
+  echo -e "\t outfile                   : optional unencrypted output file, useful for deployment"
   exit 1
 elif [ ! -e "$KEYDIR" ]; then
   echo "Folder not found: $KEYDIR, leaving"