Manpage and ChangeLog and help update (#69)

diff --git a/ChangeLog b/ChangeLog
index c8708e6fcb957c89be3bafa46674842fd7eebf27..eee4b8a99f10f4bfad336c45488df1a0ee44b32d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-17 - Silvio Rhatto <rhatto@riseup.net>
+
+       Rename genpair action and option (#69)
+
 2014-09-02 - Silvio Rhatto <rhatto@riseup.net>
 
        Ensure destination folder exists at 'cp' action

diff --git a/lib/keyringer/actions/genkeys b/lib/keyringer/actions/genkeys
index 60f9dfc440739d2da07b15504921d1ccae6f98c0..d4f24d83e761de57cd11ba13d54cf25c1448a000 100755 (executable)
--- a/lib/keyringer/actions/genkeys
+++ b/lib/keyringer/actions/genkeys
@@ -199,11 +199,11 @@ if [ -z "$NODE" ]; then
   echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|x509|x509-self|ssl|ssl-self> <file> <hostname> [outfile]"
   echo -e "Options:"
   echo -e "\t gpg|ssh|x509[-self]|ssl|ssl[-self]: key type."
-  echo -e "\t file                      : base file name for encrypted output (relative to keys folder),"
-  echo -e "\t                             without spaces"
-  echo -e "\t hostname                  : host for the key pair"
-  echo -e "\t outfile                   : optional unencrypted output file, useful for deployment,"
-  echo -e "\t                             without spaces"
+  echo -e "\t file                              : base file name for encrypted output (relative to keys folder),"
+  echo -e "\t                                     without spaces"
+  echo -e "\t hostname                          : host for the key pair"
+  echo -e "\t outfile                           : optional unencrypted output file, useful for deployment,"
+  echo -e "\t                                     without spaces"
   exit 1
 elif [ ! -e "$KEYDIR" ]; then
   echo "Folder not found: $KEYDIR, leaving"

diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 44ddb813602bc7550b48cf0f51dd6901bd939d84..55ae216ac2f2b32a7034155c0c6e603e07a5e8de 100644 (file)
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -150,9 +150,12 @@ encrypt-batch <*secret*> [*file*]
 :   Encrypt content, batch mode. Behavior is identical to *encrypt* action, but less
     verbose. Useful inside scripts.
 
-genpair <*ssh*|*gpg*|*ssl*|*ssl-self*> [*options*]
+genkeys <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*]
 :   Wrapper to generate encryption key-pairs, useful for automated key deployment.
 
+genpair <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*]
+:   Alias for *genkeys* action.
+
 open <*secret*>
 :   Decrypt a secret into a temporary folder and open it using xdg-open, which
     tries to figure out the file type and then calls the associated application.