1 files changed, 17 insertions, 17 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 670eea421..2dbfd31b7 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From d087ec8cf190df54fa8cb77c6ffd55a819dd1777 Mon Sep 17 00:00:00 2001
+From 1c4af29874fe7bd1cec92ee90fc613c3cf83f571 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 ef0de08..149846c 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index 0d55854..151cab0 100644
+index 0e0ed98..299ccf8 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -171,9 +171,7 @@ key in
- .Pa ~/.ssh/id_dsa
+@@ -172,9 +172,7 @@ key in
+ .Pa ~/.ssh/id_ed25519
  or
  .Pa ~/.ssh/id_rsa .
 -Additionally, the system administrator may use this to generate host keys,
@@ -58,18 +58,18 @@ index 0d55854..151cab0 100644
  .Pp
  Normally this program generates the key and asks for a file in which
  to store the private key.
-@@ -219,9 +217,7 @@ The options are as follows:
- For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys
+@@ -221,9 +219,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
+ for which host keys
  do not exist, generate the host keys with the default key file path,
  an empty passphrase, default bits for the key type, and default comment.
 -This is used by
 -.Pa /etc/rc
 -to generate new host keys.
 +This is used by system administration scripts to generate new host keys.
- .It Fl a Ar trials
- Specifies the number of primality tests to perform when screening DH-GEX
- candidates using the
-@@ -605,7 +601,7 @@ option.
+ .It Fl a Ar rounds
+ When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
+ 2 key when the
+@@ -628,7 +624,7 @@ option.
  Valid generator values are 2, 3, and 5.
  .Pp
  Screened DH groups may be installed in
@@ -78,7 +78,7 @@ index 0d55854..151cab0 100644
  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
-@@ -800,7 +796,7 @@ on all machines
+@@ -827,7 +823,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 0d55854..151cab0 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index 05ae6ad..6e2e03b 100644
+index ff5e6ac..67b4f44 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -756,6 +756,10 @@ Protocol 1 is restricted to using only RSA keys,
+@@ -763,6 +763,10 @@ Protocol 1 is restricted to using only RSA keys,
  but protocol 2 may use any.
  The HISTORY section of
  .Xr ssl 8
@@ -103,7 +103,7 @@ index 05ae6ad..6e2e03b 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index b0c7ab6..95c1845 100644
+index e6a900b..b016e90 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -70,7 +70,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index b0c7ab6..95c1845 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -859,7 +859,7 @@ This file is for host-based authentication (see
+@@ -862,7 +862,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 b0c7ab6..95c1845 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
  The file format is described in
  .Xr moduli 5 .
-@@ -956,7 +956,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -961,7 +961,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,7 +133,7 @@ index b0c7ab6..95c1845 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 50eec53..04b5f1a 100644
+index bdca797..9fa6086 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -283,8 +283,7 @@ This option is only available for protocol version 2.