summaryrefslogtreecommitdiff
path: root/man/man1/monkeysphere.1
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-15 18:23:39 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-15 18:23:39 -0400
commit5ff6e131ad52ce4de7172e56170ea4f37e397a9e (patch)
tree886418454ebb5786448ffbef5fe8d10a62631727 /man/man1/monkeysphere.1
parent07cb14cdb80ef060e63ba2713ef70b67db9f5783 (diff)
Fix gen-subkey function for client.
Diffstat (limited to 'man/man1/monkeysphere.1')
-rw-r--r--man/man1/monkeysphere.115
1 files changed, 8 insertions, 7 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 526cad6..95f1e59 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -56,11 +56,11 @@ user_key cache, and the user's independently controlled
authorized_keys file (usually ~/.ssh/authorized_keys). `a' may be
used in place of `update-authorized_keys'.
.TP
-.B gen-ae-subkey KEYID
-Generate an `ae` capable subkey. For the primary key with the
-specified key ID, generate a subkey with "authentication" and
-"encryption" capability that can be used for MonkeySphere
-transactions. `g' may be used in place of `gen-ae-subkey'.
+.B gen-subkey KEYID
+Generate an `a` capable subkey. For the primary key with the
+specified key ID, generate a subkey with "authentication" capability
+that can be used for MonkeySphere transactions. `g' may be used in
+place of `gen-subkey'.
.TP
.B help
Output a brief usage summary. `h' or `?' may be used in place of
@@ -76,8 +76,9 @@ specification for the host, ie. "ssh://host.full.domain".
GPG keys are considered acceptable if the following criteria are met:
.TP
.B capability
-The key must have both the "authentication" and "encrypt" capability
-flags.
+For host keys, the key must have both the "authentication" ("a") and
+"encrypt" ("e") capability flags. For user keys, the key must have
+the "authentication" ("a") capability flag.
.TP
.B validity
The key must be "fully" valid, and must not be expired or revoked.