Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document the -1 and -2 options, and include this in amd64 as well as i386 

Fixes my PR/38816
This commit is contained in:
pgoyette 2008-10-06 20:25:42 +00:00
parent c4db8cc4bd
commit 3b3e1e2687
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distrib/sets/lists/man/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1101 2008/10/02 00:52:17 pgoyette Exp $
# $NetBSD: mi,v 1.1102 2008/10/06 20:25:42 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -1894,6 +1894,7 @@
./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/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/amd64/boot.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
@ -4300,6 +4301,7 @@
./usr/share/man/html8/alpha/setnetbootinfo.html man-sysutil-htmlman html
./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/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
@ -6713,6 +6715,7 @@
./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/makedev.8 man-obsolete obsolete
./usr/share/man/man8/amd64/boot.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

14
share/man/man8/Makefile
View File

@ -1,4 +1,14 @@
# $NetBSD: Makefile,v 1.93 2008/02/18 10:37:19 elad Exp $
# $NetBSD: Makefile,v 1.94 2008/10/06 20:25:42 pgoyette Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= boot.8 #dosboot.8 boot_console.8 multiboot.8 w95boot.8 pxeboot.8 mbr.8
#MLINKS= mbr.8 bootselect.8
MANSUBDIR=/amd64
.include <bsd.man.mk>
.PATH: ${.CURDIR}/../man8.i386
# $NetBSD: Makefile,v 1.94 2008/10/06 20:25:42 pgoyette Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \
@ -21,7 +31,7 @@ MLINKS+=nis.8 yp.8
MLINKS+=rc.8 rc.d.8
MLINKS+=rc.8 rc.shutdown.8
SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amiga man8.atari \
SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amd64 man8.amiga man8.atari \
man8.cobalt man8.dreamcast man8.hp300 man8.hp700 man8.hpcarm \
man8.hpcmips man8.hpcsh man8.i386 man8.mac68k man8.macppc \
man8.mvme68k man8.next68k man8.pmax man8.prep \

9
share/man/man8/man8.amd64/Makefile Normal file
View File

@ -0,0 +1,9 @@
# $NetBSD: Makefile,v 1.4 2008/10/06 20:25:42 pgoyette Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= boot.8
MANSUBDIR=/amd64
.include <bsd.man.mk>
.PATH: ${.CURDIR}/../man8.i386

8
share/man/man8/man8.i386/boot.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: boot.8,v 1.41 2008/07/31 17:08:23 christos Exp $
.\" $NetBSD: boot.8,v 1.42 2008/10/06 20:25:42 pgoyette Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -159,7 +159,7 @@ input of these commands:
.It Xo Ic boot
.Op Va device : Ns
.Op Va filename
.Op Fl acdqsvxz
.Op Fl acdqsvxz12
.Xc
The default
.Va device
@ -240,6 +240,10 @@ Boot the system in verbose mode.
Boot the system with debug messages enabled.
.It Fl z
Boot the system in silent mode.
.It Fl 1
Boot the system with multiprocessor support disabled.
.It Fl 2
Boot the system with ACPI disabled.
.El
.It Ic consdev Va dev
Immediately switch the console to the specified device