From: rpe <rpe@openbsd.org>
Date: Fri, 9 May 2014 21:15:17 +0000 (+0000)
Subject: Tweak response file example:
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2d93fa6fd135050ca487048cf6d7a389da6b2870;p=openbsd

Tweak response file example:
- "Server?" -> "HTTP Server?"
- Use more appropriate public ssh key type

OK deraadt@ krw@
---

diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index ec3c4dcb1f9..82aa5c4e419 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.108 2014/03/19 01:59:48 tedu Exp $
+dnl	$OpenBSD: m4.common,v 1.109 2014/05/09 21:15:17 rpe Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -804,10 +804,10 @@ user that is created during the installation.
            Password for root = ${:--:}2a${:--:}14${:--:}Z4xRMg8vDpgYH...GVot3ySoj8yby
            Setup a user = puffy
            Password for user = *************
-           Public ssh key for user = ssh-rsa AAAAB3...RVtZJL puffy@ai
+           Public ssh key for user = ssh-ed25519 AAAAC3NzaC1...g3Aqre puffy@ai
            What timezone are you in = Europe/Stockholm
            Location of sets = http
-           Server = ftp.eu.openbsd.org
+           HTTP Server = ftp.eu.openbsd.org
 
 The "System hostname" key above matches the following full question
 asked during an interactive installation:
diff --git a/share/man/man8/autoinstall.8 b/share/man/man8/autoinstall.8
index dd93a5ca234..f32495329db 100644
--- a/share/man/man8/autoinstall.8
+++ b/share/man/man8/autoinstall.8
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: autoinstall.8,v 1.7 2014/02/24 23:43:26 krw Exp $
+.\"     $OpenBSD: autoinstall.8,v 1.8 2014/05/09 21:16:54 rpe Exp $
 .\"
 .\" Copyright (c) 2013 Robert Peichaer <rpe@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 24 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt AUTOINSTALL 8
 .Os
 .Sh NAME
@@ -138,10 +138,10 @@ Change the default console to com0 = yes
 Which speed should com0 use = 19200
 Setup a user = puffy
 Password for user = *************
-Public ssh key for user = ssh-rsa AAAAB3...RVtZJL puffy@ai
+Public ssh key for user = ssh-ed25519 AAAAC3NzaC1...g3Aqre puffy@ai
 What timezone are you in = Europe/Stockholm
 Location of sets = http
-Server = ftp.eu.openbsd.org
+HTTP Server = ftp.eu.openbsd.org
 .Ed
 .Pp
 The same file could be used for upgrades by creating a symbolic link called