Merge branches 'master' and 'ruby' into ruby

2 files changed, 5 insertions, 5 deletions

diff --git a/share/keyringer/edit b/share/keyringer/edit
index 6ece837..d729aa6 100755
--- 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 d0d7382..405dd9e 100755
--- 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"