summaryrefslogtreecommitdiff
path: root/man/man7/monkeysphere.7
diff options
context:
space:
mode:
authorMatthew James Goins <mjgoins@openflows.com>2010-03-14 17:40:46 -0400
committerMatthew James Goins <mjgoins@openflows.com>2010-03-14 17:40:46 -0400
commitdd71f5ec4a69c58f894f4f6961ca3786a192bc62 (patch)
tree1e5bb5331837afcf9f77187daaaebf15c93606d7 /man/man7/monkeysphere.7
parent970c7500631f46b5aa6279bf607c7d11ede7549e (diff)
parent3d46f5954da2bc9a2dd8d2ce35713136149c2983 (diff)
Merge remote branch 'dkg/master'
Diffstat (limited to 'man/man7/monkeysphere.7')
-rw-r--r--man/man7/monkeysphere.77
1 files changed, 3 insertions, 4 deletions
diff --git a/man/man7/monkeysphere.7 b/man/man7/monkeysphere.7
index e4c2bf0..4d1deca 100644
--- a/man/man7/monkeysphere.7
+++ b/man/man7/monkeysphere.7
@@ -1,9 +1,8 @@
-.TH MONKEYSPHERE "7" "March 2009" "monkeysphere" "System Frameworks"
+.TH MONKEYSPHERE "7" "March 2010" "monkeysphere" "System Frameworks"
.SH NAME
-monkeysphere - ssh authentication framework using OpenPGP Web of
-Trust
+monkeysphere - ssh and TLS authentication framework using OpenPGP Web of Trust
.SH DESCRIPTION
@@ -75,7 +74,7 @@ https://host.example.com[:port]
.SH AUTHOR
Written by:
-Jameson Rollins <jrollins@fifthhorseman.net>,
+Jameson Rollins <jrollins@finestructure.net>,
Daniel Kahn Gillmor <dkg@fifthhorseman.net>
.SH SEE ALSO