diff options
| author | Jameson Rollins <jrollins@finestructure.net> | 2010-01-15 19:42:42 -0500 |
|---|---|---|
| committer | Jameson Rollins <jrollins@finestructure.net> | 2010-01-15 19:42:42 -0500 |
| commit | 17315937bc0af145ef7dfb749096faad49f208aa (patch) | |
| tree | a4133ce12ec0f7cd291458833e05a11d39d624d5 /man/man1/monkeysphere.1 | |
| parent | 11349dccbc0cb233bd8206897f278f6241c39117 (diff) | |
| parent | 94c28acd69a41f5733e3b4d800c755b053ca3449 (diff) | |
Merge remote branch 'dkg/master'
Conflicts:
tests/basic
Diffstat (limited to 'man/man1/monkeysphere.1')
| -rw-r--r-- | man/man1/monkeysphere.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 8b73583..c5296ec 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -11,9 +11,9 @@ monkeysphere - Monkeysphere client user interface .SH DESCRIPTION \fBMonkeysphere\fP is a framework to leverage the OpenPGP web of trust -for OpenSSH authentication. OpenPGP keys are tracked via GnuPG, and -added to the authorized_keys and known_hosts files used by OpenSSH for -connection authentication. +for OpenSSH and TLS key-based authentication. OpenPGP keys are +tracked via GnuPG, and added to the authorized_keys and known_hosts +files used by OpenSSH for connection authentication. \fBmonkeysphere\fP is the Monkeysphere client utility. |