fixing return code error in openpgp2ssh, preparing for new release.

[monkeysphere.git] / man / man8 / monkeysphere-server.8

diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 0e699b93a90e53bd3017746d2500a352d1c71762..e9784b6dd35ee6616a52596e50b3bb332be9225c 100644 (file)
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -1,4 +1,4 @@
-.TH MONKEYSPHERE-SERVER "1" "June 2008" "monkeysphere" "User Commands"
+.TH MONKEYSPHERE-SERVER "8" "June 2008" "monkeysphere" "User Commands"
 
 .SH NAME
 
@@ -56,9 +56,10 @@ place of `publish-key'.
 Instruct system to trust user identity certifications made by KEYID.
 A certifier domain can be specified with the `-n' or `--domain'
 option.  A certifier trust level can be specified with the `-t' or
-`--trust' option (default is `full').  A certifier trust depth can be
-specified with the `-d' or `--depth' option (default is 1).  `a' may
-be used in place of `add-identity-certifier'.
+`--trust' option (possible values are `1' for `marginal' and `2' for
+`full' (default is `2')).  A certifier trust depth can be specified
+with the `-d' or `--depth' option (default is 1).  `a' may be used in
+place of `add-identity-certifier'.
 .TP
 .B remove-identity-certifier KEYID
 Instruct system to ignore user identity certifications made by KEYID.
@@ -68,6 +69,13 @@ Instruct system to ignore user identity certifications made by KEYID.
 List key IDs trusted by the system to certify user identities.  `l'
 may be used in place of `list-identity-certifiers'.
 .TP
+.B gpg-authentication-cmd
+Execute a gpg command on the gnupg-authentication keyring as the
+monkeysphere user.  This takes a single command (multiple gpg
+arguments need to be quoted).  Use this command with caution, as
+modifying the gnupg-authentication keyring can affect ssh user
+authentication.
+.TP
 .B help
 Output a brief usage summary.  `h' or `?' may be used in place of
 `help'.
@@ -89,7 +97,7 @@ to tell sshd where the new server host key is located:
 HostKey /var/lib/monkeysphere/ssh_host_rsa_key
 
 In order for users logging into the system to be able to verify the
-host via the monkeysphere, at least one person (ie. a server admin)
+host via the monkeysphere, at least one person (i.e. a server admin)
 will need to sign the host's key.  This is done in the same way that
 key signing is usually done, by pulling the host's key from the
 keyserver, signing the key, and re-publishing the signature.  Once
@@ -131,7 +139,7 @@ AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
 
 It is recommended to add "monkeysphere-server update-users" to a
 system crontab, so that user keys are kept up-to-date, and key
-revokations and expirations can be processed in a timely manor.
+revocations and expirations can be processed in a timely manor.
 
 .SH ENVIRONMENT
 
@@ -151,7 +159,7 @@ Path to user-controlled authorized_keys file.  `-' means not to add
 user-controlled file (%h/.ssh/authorized_keys).
 .TP
 MONKEYSPHERE_MONKEYSPHERE_USER
-User to control authentication keychain (monkeypshere).
+User to control authentication keychain (monkeysphere).
 
 .SH FILES