summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-09-04 22:29:39 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-09-04 22:29:39 -0400
commit91f880160dba51966ca8940fd42fcd6c8a268c5a (patch)
tree18fb1789faf7f4611ab122062597ac78ca2f0d3e
parent268c67329e37e7e480cadc31a02aa0ba6f308840 (diff)
moved monkeysphere(5) to section 7 of the manual. Thanks, Stew!
-rw-r--r--debian/monkeysphere.manpages2
-rw-r--r--man/man1/monkeysphere-ssh-proxycommand.11
-rw-r--r--man/man1/monkeysphere.18
-rw-r--r--man/man1/openpgp2ssh.14
-rw-r--r--man/man7/monkeysphere.7 (renamed from man/man5/monkeysphere.5)2
-rw-r--r--man/man8/monkeysphere-server.84
6 files changed, 11 insertions, 10 deletions
diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages
index ab99bbf..1490566 100644
--- a/debian/monkeysphere.manpages
+++ b/debian/monkeysphere.manpages
@@ -1,5 +1,5 @@
man/man1/monkeysphere.1
man/man1/openpgp2ssh.1
man/man1/monkeysphere-ssh-proxycommand.1
-man/man5/monkeysphere.5
+man/man7/monkeysphere.7
man/man8/monkeysphere-server.8
diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index 41b2e40..1606a5d 100644
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -66,6 +66,7 @@ Written by Jameson Rollins <jrollins@fifthhorseman.net>
.SH SEE ALSO
.BR monkeysphere (1),
+.BR monkeysphere (7),
.BR ssh (1),
.BR ssh_config (5),
.BR netcat (1),
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index cabe953..3ece735 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -25,10 +25,10 @@ connection authentication.
Update the known_hosts file. For each specified host, gpg will be
queried for a key associated with the host URI (see HOST
IDENTIFICATION in
-.BR monkeysphere(5)),
+.BR monkeysphere(7)),
optionally querying a keyserver.
If an acceptable key is found for the host (see KEY ACCEPTABILITY in
-.BR monkeysphere(5)),
+.BR monkeysphere(7)),
the key is added to the user's known_hosts file. If a key is found
but is unacceptable for the host, any matching keys are removed from
the user's known_hosts file. If no gpg key is found for the host,
@@ -46,7 +46,7 @@ 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 (5)),
+.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
@@ -127,7 +127,7 @@ Kahn Gillmor <dkg@fifthhorseman.net>
.BR monkeysphere-ssh-proxycommand (1),
.BR monkeysphere-server (8),
-.BR monkeysphere (5),
+.BR monkeysphere (7),
.BR ssh (1),
.BR ssh-add (1),
.BR gpg (1)
diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1
index 281bb0f..89df047 100644
--- a/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@ -38,7 +38,7 @@ converted to the equivalent PEM-encoded private key.
.Pp
.Nm
is part of the
-.Xr monkeysphere 5
+.Xr monkeysphere 7
framework for providing a PKI for SSH.
.Sh CAVEATS
The keys produced by this process are stripped of all identifying
@@ -91,6 +91,6 @@ passed in. If you send it more than one primary key, it will silently
ignore later ones.
.Sh SEE ALSO
.Xr monkeysphere 1 ,
-.Xr monkeysphere 5 ,
+.Xr monkeysphere 7 ,
.Xr ssh 1 ,
.Xr monkeysphere-server 8
diff --git a/man/man5/monkeysphere.5 b/man/man7/monkeysphere.7
index 50ad2b3..8d7c43a 100644
--- a/man/man5/monkeysphere.5
+++ b/man/man7/monkeysphere.7
@@ -1,4 +1,4 @@
-.TH MONKEYSPHERE "5" "June 2008" "monkeysphere" "System Frameworks"
+.TH MONKEYSPHERE "7" "June 2008" "monkeysphere" "System Frameworks"
.SH NAME
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 46a9727..f207e2c 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -27,7 +27,7 @@ specified account, the user ID's listed in the account's
authorized_user_ids file are processed. For each user ID, 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
-monkeysphere(5)), the key is added to the account's
+monkeysphere(7)), the key is added to the account's
monkeysphere-controlled authorized_keys file. If the
RAW_AUTHORIZED_KEYS variable is set, then a separate authorized_keys
file (usually ~USER/.ssh/authorized_keys) is appended to the
@@ -230,6 +230,6 @@ Gillmor <dkg@fifthhorseman.net>
.SH SEE ALSO
.BR monkeysphere (1),
-.BR monkeysphere (5),
+.BR monkeysphere (7),
.BR gpg (1),
.BR ssh (1)