More complete help

1 files changed, 61 insertions, 3 deletions

diff --git a/kiki.hs b/kiki.hs
index f5716f0..f5e3863 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -509,7 +509,7 @@ kiki_usage bSecret cmd = putStr $
             ,"     uses the database to update all the input files, those inside and outside of"
             ,"     of the home directory (see --homedir), to have the most complete information."
             ,""
-            ,"     The files pubring.gpg and subring.gpg in the directory specified by the "
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
             ,"     --homedir option are implicitly included in the keyring set."
             ,""
             ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
@@ -517,13 +517,32 @@ kiki_usage bSecret cmd = putStr $
             ,"     particular key.  Master keys may be specified by using fingerprints or by"
             ,"     specifying a substring of an associated UID."
             ] ++ syncflags ++ keyspec
+         "sync-public" -> unlines $
+            ["kiki sync-public [options...]"
+            ,""
+            ,"     sync-public merges a set of key files into a combined database and then"
+            ,"     uses the database to update all the input files, those inside and outside of"
+            ,"     of the home directory (see --homedir), to have the most complete information."
+            ,""
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set. However, the"
+            ,"     difference betwen this command and sync-secret is that no secret keys are"
+            ,"     modified by this command regardless of input. Export of secret keys is"
+            ,"     possible using this command, but will only occur if the secret master key"
+            ,"     is already in the external file. (TODO, remove this capacity entirely)"
+            ,""
+            ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
+            ,"     indicates what the key is for.  This tag can be used as a SPEC to select a"
+            ,"     particular key.  Master keys may be specified by using fingerprints or by"
+            ,"     specifying a substring of an associated UID."
+            ] ++ syncflags ++ keyspec
          "import-secret" -> unlines $
             ["kiki import-secret [options...]"
             ,""
             ,"     import-secret uses a set of key files to update your keyring.  It does not"
             ,"     alter any files outside of the home directory (see --homedir)."
             ,""
-            ,"     The files pubring.gpg and subring.gpg in the directory specified by the "
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
             ,"     --homedir option are implicitly included in the keyring set."
             ,""
             ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
@@ -531,6 +550,45 @@ kiki_usage bSecret cmd = putStr $
             ,"     particular key.  Master keys may be specified by using fingerprints or by"
             ,"     specifying a substring of an associated UID."
             ] ++ syncflags ++ keyspec
+         "import-public" -> unlines $
+            ["kiki import-public [options...]"
+            ,""
+            ,"     import-public uses a set of key files to update your keyring.  It does not"
+            ,"     alter any files outside of the home directory (see --homedir). Nor does it"
+            ,"     alter your secring.gpg file."
+            ,""
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set. However, the"
+            ,"     difference betwen this command and import-secret is that no secret keys are"
+            ,"     modified by this command regardless of input. Export of secret keys is"
+            ,"     possible using this command, but will only occur if the secret master key"
+            ,"     is already in the external file. (TODO, remove this capacity entirely)"
+            ,""
+            ,"     Subkeys that are imported with kiki are given an annotation \"usage@\" which"
+            ,"     indicates what the key is for.  This tag can be used as a SPEC to select a"
+            ,"     particular key.  Master keys may be specified by using fingerprints or by"
+            ,"     specifying a substring of an associated UID."
+            ] ++ syncflags ++ keyspec
+         "export-secret" -> unlines $
+            ["kiki export-secret [options...]"
+            ,""
+            ,"     export-secret updates a set of key files using information from your keyring."
+            ,""
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set."
+            ,""
+            ] ++ syncflags ++ keyspec
+         "export-public" -> unlines $
+            ["kiki export-public [options...]"
+            ,""
+            ,"     export-public updates a set of key files using information from your keyring."
+            ,""
+            ,"     The files pubring.gpg and secring.gpg in the directory specified by the "
+            ,"     --homedir option are implicitly included in the keyring set. However, the"
+            ,"     difference betwen this command and export-secret is that no secret keys are"
+            ,"     exported by this command regardless of input."
+            ,""
+            ] ++ syncflags ++ keyspec
         where 
             commonOptions :: [String]
             commonOptions =
@@ -776,7 +834,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
                                     return guardAuthentic
         kikiOp = KeyRingOperation
             { kFiles = Map.fromList $
-                [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd)  )
+                [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd) )
                 , ( HomePub, (if bImport then MutableRef Nothing else ConstRef, KeyRingFile Nothing) )
                 ]
                 ++ rings