Module Name: src
Committed By: soren
Date: Wed Jul 31 13:54:42 UTC 2013
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man8/man8.amd64: Makefile
src/share/man/man8/man8.i386: boot.8 boot_console.8 dosboot.8
Log Message:
All of the man8.i386 man pages also apply to amd64.
Remove references to obsolete w95boot.8 man page and CONSOLE_POLICY option.
Closes PR port-amd64/48038.
To generate a diff of this commit:
cvs rdiff -u -r1.1430 -r1.1431 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.4 -r1.5 src/share/man/man8/man8.amd64/Makefile
cvs rdiff -u -r1.59 -r1.60 src/share/man/man8/man8.i386/boot.8
cvs rdiff -u -r1.14 -r1.15 src/share/man/man8/man8.i386/boot_console.8
cvs rdiff -u -r1.22 -r1.23 src/share/man/man8/man8.i386/dosboot.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1430 src/distrib/sets/lists/man/mi:1.1431
--- src/distrib/sets/lists/man/mi:1.1430 Mon Jun 10 07:14:01 2013
+++ src/distrib/sets/lists/man/mi Wed Jul 31 13:54:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1430 2013/06/10 07:14:01 kardel Exp $
+# $NetBSD: mi,v 1.1431 2013/07/31 13:54:42 soren Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2206,7 +2206,13 @@
./usr/share/man/cat8/amd.0 man-amd-catman .cat
./usr/share/man/cat8/amd64/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/amd64/boot.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/boot_console.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/bootselect.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/dosboot.0 man-sys-catman .cat
./usr/share/man/cat8/amd64/makedev.0 man-obsolete obsolete
+./usr/share/man/cat8/amd64/mbr.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/multiboot.0 man-sys-catman .cat
+./usr/share/man/cat8/amd64/pxeboot.0 man-sys-catman .cat
./usr/share/man/cat8/amiga/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/amiga/binpatch.0 man-sysutil-catman .cat
./usr/share/man/cat8/amiga/boot.0 man-sys-catman .cat
@@ -5058,6 +5064,12 @@
./usr/share/man/html8/altqd.html man-router-htmlman html
./usr/share/man/html8/amd.html man-amd-htmlman html
./usr/share/man/html8/amd64/boot.html man-sys-htmlman html
+./usr/share/man/html8/amd64/boot_console.html man-sys-htmlman html
+./usr/share/man/html8/amd64/bootselect.html man-sys-htmlman html
+./usr/share/man/html8/amd64/dosboot.html man-sys-htmlman html
+./usr/share/man/html8/amd64/mbr.html man-sys-htmlman html
+./usr/share/man/html8/amd64/multiboot.html man-sys-htmlman html
+./usr/share/man/html8/amd64/pxeboot.html man-sys-htmlman html
./usr/share/man/html8/amiga/binpatch.html man-sysutil-htmlman html
./usr/share/man/html8/amiga/boot.html man-sys-htmlman html
./usr/share/man/html8/amiga/grfconfig.html man-sysutil-htmlman html
@@ -7907,7 +7919,13 @@
./usr/share/man/man8/amd.8 man-amd-man .man
./usr/share/man/man8/amd64/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/amd64/boot.8 man-sys-man .man
+./usr/share/man/man8/amd64/boot_console.8 man-sys-man .man
+./usr/share/man/man8/amd64/bootselect.8 man-sys-man .man
+./usr/share/man/man8/amd64/dosboot.8 man-sys-man .man
./usr/share/man/man8/amd64/makedev.8 man-obsolete obsolete
+./usr/share/man/man8/amd64/mbr.8 man-sys-man .man
+./usr/share/man/man8/amd64/multiboot.8 man-sys-man .man
+./usr/share/man/man8/amd64/pxeboot.8 man-sys-man .man
./usr/share/man/man8/amiga/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/amiga/binpatch.8 man-sysutil-man .man
./usr/share/man/man8/amiga/boot.8 man-sys-man .man
Index: src/share/man/man8/man8.amd64/Makefile
diff -u src/share/man/man8/man8.amd64/Makefile:1.4 src/share/man/man8/man8.amd64/Makefile:1.5
--- src/share/man/man8/man8.amd64/Makefile:1.4 Mon Oct 6 20:25:42 2008
+++ src/share/man/man8/man8.amd64/Makefile Wed Jul 31 13:54:42 2013
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/10/06 20:25:42 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2013/07/31 13:54:42 soren Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
-MAN= boot.8
+MAN= boot.8 dosboot.8 boot_console.8 multiboot.8 pxeboot.8 mbr.8
+MLINKS= mbr.8 bootselect.8
MANSUBDIR=/amd64
.include <bsd.man.mk>
Index: src/share/man/man8/man8.i386/boot.8
diff -u src/share/man/man8/man8.i386/boot.8:1.59 src/share/man/man8/man8.i386/boot.8:1.60
--- src/share/man/man8/man8.i386/boot.8:1.59 Mon Apr 15 22:50:08 2013
+++ src/share/man/man8/man8.i386/boot.8 Wed Jul 31 13:54:42 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.59 2013/04/15 22:50:08 jdf Exp $
+.\" $NetBSD: boot.8,v 1.60 2013/07/31 13:54:42 soren Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd May 26, 2011
+.Dd July 31, 2013
.Dt BOOT 8 i386
.Os
.Sh NAME
@@ -63,11 +63,6 @@ bootstrap
.Nx
from
.Tn MS-DOS
-.It Xr w95boot 8
-bootstrap
-.Nx
-from
-.Tn Windows 95
.It Xr pxeboot 8
network bootstrap
.Nx
@@ -606,7 +601,6 @@ partition by
.Xr pxeboot 8 ,
.Xr reboot 8 ,
.Xr shutdown 8 ,
-.Xr w95boot 8 ,
.Xr boothowto 9
.Sh BUGS
The kernel file name must be specified before, not after, the boot options.
Index: src/share/man/man8/man8.i386/boot_console.8
diff -u src/share/man/man8/man8.i386/boot_console.8:1.14 src/share/man/man8/man8.i386/boot_console.8:1.15
--- src/share/man/man8/man8.i386/boot_console.8:1.14 Mon Mar 9 19:24:31 2009
+++ src/share/man/man8/man8.i386/boot_console.8 Wed Jul 31 13:54:42 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot_console.8,v 1.14 2009/03/09 19:24:31 joerg Exp $
+.\" $NetBSD: boot_console.8,v 1.15 2013/07/31 13:54:42 soren Exp $
.\"
.\" Copyright (c) 1997
.\" Matthias Drochner. All rights reserved.
@@ -123,8 +123,8 @@ digits corresponding to the serial port
.El
.\"
.Sh FILES
-.Bl -tag -width /sys/arch/i386/stand/{bios,dos,net}boot/Makefile
-.It Pa /sys/arch/i386/stand/{bios,dos,net}boot/Makefile
+.Bl -tag -width src/sys/arch/i386/stand/{boot,pxeboot}/Makefile
+.It Pa src/sys/arch/i386/stand/{boot,pxeboot}/Makefile
compile time options for the boot programs.
.El
.\"
@@ -134,20 +134,6 @@ compile time options for the boot progra
.Xr installboot 8
.\"
.Sh BUGS
-The value of
-.Dv SERIAL_POLICY
-should be settable through a boot configuration option.
-However traditionally there was no non-volatile storage available on the
-PC platform.
-This requires console auto-selection methods which can be
-inconvenient and/or unstable in some situations.
-The selection policy should be adapted to the local hardware configuration,
-which might require code changes.
-(Some BIOS versions, particularly those used on
-large servers and in embedded and single-board industrial computers,
-have integrated support for serial consoles.
-The boot loader should query for these settings if possible.)
-.Pp
The serial communication parameters (byte-size, parity, stop-bits) are
not settable (either at compile time or run time).
The default parameters are
Index: src/share/man/man8/man8.i386/dosboot.8
diff -u src/share/man/man8/man8.i386/dosboot.8:1.22 src/share/man/man8/man8.i386/dosboot.8:1.23
--- src/share/man/man8/man8.i386/dosboot.8:1.22 Sat Jul 13 10:52:50 2013
+++ src/share/man/man8/man8.i386/dosboot.8 Wed Jul 31 13:54:42 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: dosboot.8,v 1.22 2013/07/13 10:52:50 njoly Exp $
+.\" $NetBSD: dosboot.8,v 1.23 2013/07/31 13:54:42 soren Exp $
.\"
.\" Copyright (c) 1997
.\" Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
.\"
.\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd October 13, 2008
+.Dd July 31, 2013
.Dt DOSBOOT 8 i386
.Os
.Sh NAME
@@ -169,8 +169,7 @@ dosboot -u fd0a:netbsd -s
.Ed
.Sh SEE ALSO
.Xr release 7 ,
-.Xr boot 8 ,
-.Xr w95boot 8
+.Xr boot 8
.Sh HISTORY
The
.Nx Ns Tn /i386
@@ -187,13 +186,6 @@ extenders and memory managers.
.Nm
does not run directly under
.Tn Windows 95 .
-See
-.Xr w95boot 8
-for a method of starting
-.Nx
-from
-.Tn Windows 95
-using dosboot.
.Pp
In UFS mode, files can only be loaded from devices known to the BIOS.
The device names do not necessarily comply with the names later
