2 files changed, 31 insertions, 14 deletions

diff --git a/cokiki.hs b/cokiki.hs
index 97b4f9a..c93e30e 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -15,18 +15,34 @@ import System.Posix.User
 import CommandLine
 
 usage = unlines
-    [ "cokiki <command> [--chroot=ROOTDIR] [--homedir=HOMEDIR] [--passphrase-fd=FD]"
+    [ "cokiki <command> [--chroot=ROOTDIR]"
+    , "                 [--homedir=HOMEDIR]"
+    , "                 [--passphrase-fd=FD]"
+    , ""
+    , "cokiki modifies system configuration to recognize generated files"
+    , "in /var/cache/kiki. In addition to each command's documented effects"
+    , "(see COMMANDS), the following operation will be performed on your"
+    , "GnuPG keyring:"
+    , ""
+    , "          master-key (generated if not present)"
+    , "          tor        (generated if not prsenet)"
+    , "          ipsec      (generated if not prsenet)"
+    , "          ssh-server (imported or generated if not present)"
+    , "          ssh-client (imported or gnnerated if not present)"
+    , ""
+    , "The /var/cache/kiki/* tree will also be refreshed."
     , ""
     , "COMMANDS"
     , ""
-    , "  ssh-client"
-    , "    1) Modify system ssh configuration to respect /var/cache/kiki/ssh_known_hosts."
-    , "    2) Set kiki ssh-server key to /etc/ssh/ssh_host_rsa_key. If kiki already has"
-    , "       an ssh-server key configured, it will be replaced."
-    , "    3) Refresh /var/cache/kiki/*"
+    , "  ssh-client   Modify system ssh configuration to respect"
+    , "               /var/cache/kiki/ssh_known_hosts."
+    , ""
+    , "  ssh-server   Modify system ssh configuration to use the"
+    , "               kiki-managed host key at"
+    , "               /var/cache/kiki/ssh_host_rsa_key."
     , ""
-    , "  ssh-server: TODO"
-    , "  strongswan: TODO"
+    , "  strongswan   Modify /etc/ipsec.conf to include settings from"
+    , "               /var/cache/kiki/ipsec.conf."
     ]
 
 main = do
diff --git a/kiki.hs b/kiki.hs
index a662ef5..8ca6e5d 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1406,13 +1406,14 @@ kiki "init" args | "--help" `elem` args = do
         , "          | --homedir[=HOMEDIR]"
         , "          | --chroot=ROOTDIR ] ..."
         , ""
-        , "Initialize a GnuPG keyring for use with kiki.  After completion, you"
-        , "willl have a GnuPG master key with following specialized subkeys:"
+        , "Modify your GnuPG keyring and update /var/cache/kiki.  The following"
+        , "changes will occur to the keyring:"
         , ""
-        , "  tor        - freshly generated tor hidden service key"
-        , "  ipsec      - freshly generated VPN key"
-        , "  ssh-server - possibly read from /etc/ssh/*"
-        , "  ssh-client - possibly read from /root/.ssh/id_rsa"
+        , "          master-key (generated if not present)"
+        , "          tor        (generated if not prsenet)"
+        , "          ipsec      (generated if not prsenet)"
+        , "          ssh-server (imported or generated if not present)"
+        , "          ssh-client (imported or gnnerated if not present)"
         , ""
         , "OPTIONS"
         , ""