From: Matt Goins Date: Sun, 1 Feb 2009 03:59:37 +0000 (-0500) Subject: Changed the order of the descriptions of the commands to match the usage as it appear... X-Git-Tag: monkeysphere_0.23~149^2~1^2 X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=67ae32b13542bda0da45321db164da407fe76860 Changed the order of the descriptions of the commands to match the usage as it appears when the command is invoked. --- diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 1a52983..03116b2 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -39,6 +39,32 @@ host, 1 if no matching keys were found at all, and 2 if matching keys were found but none were acceptable. `k' may be used in place of `update-known_hosts'. .TP +.B update-authorized_keys +Update the authorized_keys file for the user executing the command +(see MONKEYSPHERE_AUTHORIZED_KEYS in ENVIRONMENT, below). First all +monkeysphere keys are cleared from the authorized_keys file. Then, or +each user ID in the user's authorized_user_ids file, gpg will be +queried for keys associated with that user ID, optionally querying a +keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in +.BR monkeysphere (7)), +the key is added to the user's authorized_keys file. +If a key is found but is unacceptable for the user ID, any matching +keys are removed from the user's authorized_keys file. If no gpg key +is found for the user ID, nothing is done. This subcommand will exit +with a status of 0 if at least one acceptable key was found for a user +ID, 1 if no matching keys were found at all, and 2 if matching keys +were found but none were acceptable. `a' may be used in place of +`update-authorized_keys'. +.TP +.B gen-subkey [KEYID] +Generate an authentication subkey for a private key in your GnuPG +keyring. For the primary key with the specified key ID, generate a +subkey with "authentication" capability that can be used for +monkeysphere transactions. An expiration length can be specified with +the `-e' or `--expire' option (prompt otherwise). If no key ID is +specified, but only one key exists in the secret keyring, that key +will be used. `g' may be used in place of `gen-subkey'. +.TP .B ssh-proxycommand an ssh proxy command that can be used to trigger a monkeysphere update of the ssh known_hosts file for a @@ -86,32 +112,6 @@ Setting the MONKEYSPHERE_CHECK_KEYSERVER variable (to `true' or `false') will override the keyserver-checking policy defined above. -.TP -.B update-authorized_keys -Update the authorized_keys file for the user executing the command -(see MONKEYSPHERE_AUTHORIZED_KEYS in ENVIRONMENT, below). First all -monkeysphere keys are cleared from the authorized_keys file. Then, or -each user ID in the user's authorized_user_ids file, gpg will be -queried for keys associated with that user ID, optionally querying a -keyserver. If an acceptable key is found (see KEY ACCEPTABILITY in -.BR monkeysphere (7)), -the key is added to the user's authorized_keys file. -If a key is found but is unacceptable for the user ID, any matching -keys are removed from the user's authorized_keys file. If no gpg key -is found for the user ID, nothing is done. This subcommand will exit -with a status of 0 if at least one acceptable key was found for a user -ID, 1 if no matching keys were found at all, and 2 if matching keys -were found but none were acceptable. `a' may be used in place of -`update-authorized_keys'. -.TP -.B gen-subkey [KEYID] -Generate an authentication subkey for a private key in your GnuPG -keyring. For the primary key with the specified key ID, generate a -subkey with "authentication" capability that can be used for -monkeysphere transactions. An expiration length can be specified with -the `-e' or `--expire' option (prompt otherwise). If no key ID is -specified, but only one key exists in the secret keyring, that key -will be used. `g' may be used in place of `gen-subkey'. .TP .B subkey-to-ssh-agent [ssh-add arguments] Push all authentication-capable subkeys in your GnuPG secret keyring