From f9a7bad44f067cd4a7bd919cd87c38f0f0bbca48 Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Mon, 22 Jun 2015 18:31:48 +0000
Subject: [PATCH] document that boot.conf can contain comments; from tilo
 stritzky

thanks miod for help with the diff, and who also noted that
leading whitespace gets stripped too;
---
 sys/arch/amd64/stand/boot/boot.8   | 11 ++++++++---
 sys/arch/armish/stand/boot/boot.8  | 11 ++++++++---
 sys/arch/hppa/stand/boot/boot.8    | 11 ++++++++---
 sys/arch/hppa64/stand/boot/boot.8  | 11 ++++++++---
 sys/arch/i386/stand/boot/boot.8    | 11 ++++++++---
 sys/arch/landisk/stand/boot/boot.8 | 11 ++++++++---
 sys/arch/macppc/stand/boot.8       | 11 ++++++++---
 sys/arch/socppc/stand/boot/boot.8  | 11 ++++++++---
 sys/arch/zaurus/stand/zboot/boot.8 | 11 ++++++++---
 9 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index 5d43a5a653f..5b04f7ed589 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.23 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.24 2015/06/22 18:31:48 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 amd64
 .Os
 .Sh NAME
@@ -102,7 +102,12 @@ If the file
 exists on the filesystem
 .Nm
 was loaded from, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/armish/stand/boot/boot.8 b/sys/arch/armish/stand/boot/boot.8
index 7f845730e53..932261bf0d4 100644
--- a/sys/arch/armish/stand/boot/boot.8
+++ b/sys/arch/armish/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.4 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.5 2015/06/22 18:31:48 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 armish
 .Os
 .Sh NAME
@@ -80,7 +80,12 @@ exists on the filesystem in slice
 on the first disk drive
 .Pq wd0 ,
 open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/hppa/stand/boot/boot.8 b/sys/arch/hppa/stand/boot/boot.8
index dabe14fac55..372d56022f9 100644
--- a/sys/arch/hppa/stand/boot/boot.8
+++ b/sys/arch/hppa/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.20 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.21 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2002 Michael Shalayeff
@@ -26,7 +26,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 hppa
 .Os
 .Sh NAME
@@ -75,7 +75,12 @@ If the file
 exists on the filesystem or LIF image
 .Nm
 was loaded from, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/hppa64/stand/boot/boot.8 b/sys/arch/hppa64/stand/boot/boot.8
index f244faca1c8..3ccebfb847f 100644
--- a/sys/arch/hppa64/stand/boot/boot.8
+++ b/sys/arch/hppa64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.9 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.10 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2005 Michael Shalayeff
@@ -26,7 +26,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 hppa64
 .Os
 .Sh NAME
@@ -75,7 +75,12 @@ If the file
 exists on the filesystem or LIF image
 .Nm
 was loaded from, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index 1244209488a..ef64bbb8157 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.60 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.61 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -102,7 +102,12 @@ If the file
 exists on the filesystem
 .Nm
 was loaded from, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/landisk/stand/boot/boot.8 b/sys/arch/landisk/stand/boot/boot.8
index f865aa0d366..44260173e73 100644
--- a/sys/arch/landisk/stand/boot/boot.8
+++ b/sys/arch/landisk/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.5 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.6 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 landisk
 .Os
 .Sh NAME
@@ -75,7 +75,12 @@ If the file
 exists on the filesystem
 .Nm
 was loaded from, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/macppc/stand/boot.8 b/sys/arch/macppc/stand/boot.8
index 24e087ebb53..aa4b3b5e5cc 100644
--- a/sys/arch/macppc/stand/boot.8
+++ b/sys/arch/macppc/stand/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.1 2013/10/14 11:51:08 mpi Exp $
+.\"	$OpenBSD: boot.8,v 1.2 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: October 14 2013 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 macppc
 .Os
 .Sh NAME
@@ -79,7 +79,12 @@ exists on the filesystem in slice
 on the first disk drive
 .Pq wd0 ,
 open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/socppc/stand/boot/boot.8 b/sys/arch/socppc/stand/boot/boot.8
index 6aa2c7dc862..0c1a4dbeacd 100644
--- a/sys/arch/socppc/stand/boot/boot.8
+++ b/sys/arch/socppc/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.5 2015/01/24 20:47:19 naddy Exp $
+.\"	$OpenBSD: boot.8,v 1.6 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 24 2015 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 socppc
 .Os
 .Sh NAME
@@ -80,7 +80,12 @@ exists on the filesystem in slice
 on the first disk drive
 .Pq wd0 ,
 open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
diff --git a/sys/arch/zaurus/stand/zboot/boot.8 b/sys/arch/zaurus/stand/zboot/boot.8
index 34d45695ae8..08ce1dccdbd 100644
--- a/sys/arch/zaurus/stand/zboot/boot.8
+++ b/sys/arch/zaurus/stand/zboot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.11 2014/07/20 19:33:54 tobias Exp $
+.\"	$OpenBSD: boot.8,v 1.12 2015/06/22 18:31:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: July 20 2014 $
+.Dd $Mdocdate: June 22 2015 $
 .Dt BOOT 8 zaurus
 .Os
 .Sh NAME
@@ -99,7 +99,12 @@ primary partition.
 If the file
 .Pa /etc/boot.conf
 exists on the root filesystem on the selected disk, open and parse it.
-This file may contain any commands
+Lines beginning with the
+.Sq #
+character,
+as well as whitespace at the beginning of lines,
+are ignored.
+The file may contain any commands
 .Nm
 accepts at the interactive prompt.
 Though default settings usually suffice, they can be changed here.
-- 
2.20.1