diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-17 23:33:55 -0500 |
---|---|---|
committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-17 23:33:55 -0500 |
commit | 278c20f82d2ee0954a04b8daae5cbc2788c0015c (patch) | |
tree | d38fb83491979a432d7cade2129d0a831ef8c148 /man | |
parent | ad44601e1869bc0bf3ce6ca88a7476379aa3c459 (diff) | |
parent | c1924de73702d0f999a44bc63df9bee0d432636a (diff) |
Merge commit 'jrollins/master'
Diffstat (limited to 'man')
-rw-r--r-- | man/man8/monkeysphere-authentication.8 | 30 | ||||
-rw-r--r-- | man/man8/monkeysphere-host.8 | 31 |
2 files changed, 33 insertions, 28 deletions
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index 9b8baa9..4d453d3 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -21,13 +21,7 @@ authentication. .SH SUBCOMMANDS -\fBmonkeysphere-authentication\fP takes various subcommands. -.TP -.B setup -Setup the server for Monkeysphere user authentication. This command -is idempotent, which means it can be run multiple times to make sure -the setup is correct, without adversely affecting existing setups. -`s' may be used in place of `setup'. +\fBmonkeysphere-authentication\fP takes various subcommands: .TP .B update-users [ACCOUNT]... Rebuild the monkeysphere-controlled authorized_keys files. For each @@ -62,6 +56,21 @@ Instruct system to ignore user identity certifications made by KEYID. List key IDs trusted by the system to certify user identities. `c' may be used in place of `list-id-certifiers'. .TP +.B help +Output a brief usage summary. `h' or `?' may be used in place of +`help'. +.TP +.B version +show version number + +Other commands: +.TP +.B setup +Setup the server for Monkeysphere user authentication. This command +is idempotent and run automatically by the other commands, and should +therefore not usually need to be run manually. `s' may be used in +place of `setup'. +.TP .B diagnostics Review the state of the server with respect to authentication. `d' may be used in place of `diagnostics'. @@ -72,13 +81,6 @@ authentication "sphere" keyring. This takes a single argument (multiple gpg arguments need to be quoted). Use this command with caution, as modifying the authentication sphere keyring can affect ssh user authentication. -.TP -.B help -Output a brief usage summary. `h' or `?' may be used in place of -`help'. -.TP -.B version -show version number .SH SETUP USER AUTHENTICATION diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8 index 062f0aa..330b610 100644 --- a/man/man8/monkeysphere-host.8 +++ b/man/man8/monkeysphere-host.8 @@ -23,6 +23,14 @@ connection authentication. \fBmonkeysphere-host\fP takes various subcommands: .TP +.B import-key [NAME[:PORT]] +Import a pem-encoded ssh secret host key, from stdin. NAME[:PORT] is +used to specify the hostname (and port) used in the user ID of the new +OpenPGP key. If NAME is not specified, then the system +fully-qualified domain name will be used (ie. `hostname -f'). If PORT +is not specified, the no port is added to the user ID, which means +port 22 is assumed. `i' may be used in place of `import-key'. +.TP .B show-key Output information about host's OpenPGP and SSH keys. `s' may be used in place of `show-key'. @@ -61,13 +69,15 @@ Revoke the host's OpenPGP key. `r' may be used in place of Publish the host's OpenPGP key to the keyserver. `p' may be used in place of `publish-key'. .TP -.B import-key [NAME[:PORT]] -Import a pem-encoded ssh secret host key, from stdin. NAME[:PORT] is -used to specify the hostname (and port) used in the user ID of the new -OpenPGP key. If NAME is not specified, then the system -fully-qualified domain name will be used (ie. `hostname -f'). If PORT -is not specified, the no port is added to the user ID, which means -port 22 is assumed. `i' may be used in place of `import-key'. +.B help +Output a brief usage summary. `h' or `?' may be used in place of +`help'. +.TP +.B version +show version number + + +Other commands: .TP .B diagnostics Review the state of the monkeysphere server host key and report on @@ -75,13 +85,6 @@ suggested changes. Among other checks, this includes making sure there is a valid host key, that the key is published, that the sshd configuration points to the right place, etc. `d' may be used in place of `diagnostics'. -.TP -.B help -Output a brief usage summary. `h' or `?' may be used in place of -`help'. -.TP -.B version -show version number .SH SETUP HOST AUTHENTICATION |