summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--ssh-keygen.18
-rw-r--r--sshd.82
3 files changed, 5 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 873b2b567..ecbea235e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
50 rsh, based on suggestions from Reuben Thomas (closes: #512198). 50 rsh, based on suggestions from Reuben Thomas (closes: #512198).
51 * Remove manual page references to login.conf, which aren't applicable on 51 * Remove manual page references to login.conf, which aren't applicable on
52 non-BSD systems (closes: #154434). 52 non-BSD systems (closes: #154434).
53 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
54 #513417).
53 55
54 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 56 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
55 57
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 34f0204dd..c87d8031a 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -137,9 +137,7 @@ key in
137.Pa ~/.ssh/id_dsa 137.Pa ~/.ssh/id_dsa
138or 138or
139.Pa ~/.ssh/id_rsa . 139.Pa ~/.ssh/id_rsa .
140Additionally, the system administrator may use this to generate host keys, 140Additionally, the system administrator may use this to generate host keys.
141as seen in
142.Pa /etc/rc .
143.Pp 141.Pp
144Normally this program generates the key and asks for a file in which 142Normally this program generates the key and asks for a file in which
145to store the private key. 143to store the private key.
@@ -282,9 +280,7 @@ new passphrase.
282.It Fl q 280.It Fl q
283Silence 281Silence
284.Nm ssh-keygen . 282.Nm ssh-keygen .
285Used by 283Used by system administration scripts when creating a new key.
286.Pa /etc/rc
287when creating a new key.
288.It Fl R Ar hostname 284.It Fl R Ar hostname
289Removes all keys belonging to 285Removes all keys belonging to
290.Ar hostname 286.Ar hostname
diff --git a/sshd.8 b/sshd.8
index 6cd802537..f98aec48d 100644
--- a/sshd.8
+++ b/sshd.8
@@ -69,7 +69,7 @@ over an insecure network.
69.Nm 69.Nm
70listens for connections from clients. 70listens for connections from clients.
71It is normally started at boot from 71It is normally started at boot from
72.Pa /etc/rc . 72.Pa /etc/init.d/ssh .
73It forks a new 73It forks a new
74daemon for each incoming connection. 74daemon for each incoming connection.
75The forked daemons handle 75The forked daemons handle