1 files changed, 15 insertions, 15 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 46e1f8712..34ec87094 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 8fb8f70b0534897791c61f2757e97bd13385944e Mon Sep 17 00:00:00 2001
+From 39fe318a4b572deeb3f7d03e55d319c0ab112a28 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:09 +0000
 Subject: Adjust various OpenBSD-specific references in manual pages
@@ -44,11 +44,11 @@ index ef0de0850..149846c8c 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index 957d2f0f0..143a2349f 100644
+index 7af564297..d6a7870e0 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -191,9 +191,7 @@ key in
- .Pa ~/.ssh/id_ed25519
+@@ -196,9 +196,7 @@ key in
+ .Pa ~/.ssh/id_ed25519_sk
  or
  .Pa ~/.ssh/id_rsa .
 -Additionally, the system administrator may use this to generate host keys,
@@ -58,7 +58,7 @@ index 957d2f0f0..143a2349f 100644
  .Pp
  Normally this program generates the key and asks for a file in which
  to store the private key.
-@@ -256,9 +254,7 @@ If
+@@ -261,9 +259,7 @@ If
  .Fl f
  has also been specified, its argument is used as a prefix to the
  default path for the resulting host key files.
@@ -69,7 +69,7 @@ index 957d2f0f0..143a2349f 100644
  .It Fl a Ar rounds
  When saving a private key, this option specifies the number of KDF
  (key derivation function) rounds used.
-@@ -798,7 +794,7 @@ option.
+@@ -783,7 +779,7 @@ option.
  Valid generator values are 2, 3, and 5.
  .Pp
  Screened DH groups may be installed in
@@ -77,8 +77,8 @@ index 957d2f0f0..143a2349f 100644
 +.Pa /etc/ssh/moduli .
  It is important that this file contains moduli of a range of bit lengths and
  that both ends of a connection share common moduli.
- .Sh CERTIFICATES
-@@ -1049,7 +1045,7 @@ on all machines
+ .Pp
+@@ -1154,7 +1150,7 @@ on all machines
  where the user wishes to log in using public key authentication.
  There is no need to keep the contents of this file secret.
  .Pp
@@ -88,10 +88,10 @@ index 957d2f0f0..143a2349f 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index 20e4c4efa..4923031f4 100644
+index cf991e4ee..17b0e984f 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -873,6 +873,10 @@ implements public key authentication protocol automatically,
+@@ -887,6 +887,10 @@ implements public key authentication protocol automatically,
  using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
  The HISTORY section of
  .Xr ssl 8
@@ -103,7 +103,7 @@ index 20e4c4efa..4923031f4 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index 57a7fd66b..4abc01d66 100644
+index 730520231..5ce0ea4fa 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -65,7 +65,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index 57a7fd66b..4abc01d66 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -884,7 +884,7 @@ This file is for host-based authentication (see
+@@ -904,7 +904,7 @@ This file is for host-based authentication (see
  .Xr ssh 1 ) .
  It should only be writable by root.
  .Pp
@@ -124,7 +124,7 @@ index 57a7fd66b..4abc01d66 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
  key exchange method.
  The file format is described in
-@@ -982,7 +982,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -1002,7 +1002,6 @@ The content of this file is not sensitive; it can be world-readable.
  .Xr ssh-keyscan 1 ,
  .Xr chroot 2 ,
  .Xr hosts_access 5 ,
@@ -133,10 +133,10 @@ index 57a7fd66b..4abc01d66 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 46537f177..270805060 100644
+index c926f584c..25f4b8117 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -393,8 +393,7 @@ Certificates signed using other algorithms will not be accepted for
+@@ -387,8 +387,7 @@ Certificates signed using other algorithms will not be accepted for
  public key or host-based authentication.
  .It Cm ChallengeResponseAuthentication
  Specifies whether challenge-response authentication is allowed (e.g. via