Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Move shared x86 man pages from man8.i386 to man8.x86.



details:   https://anonhg.NetBSD.org/src/rev/a0f43a62daec
branches:  trunk
changeset: 788967:a0f43a62daec
user:      soren <soren%NetBSD.org@localhost>
date:      Wed Jul 31 21:01:13 2013 +0000

description:
Move shared x86 man pages from man8.i386 to man8.x86.

diffstat:

 distrib/sets/lists/man/mi               |   89 ++--
 share/man/man8/Makefile                 |    8 +-
 share/man/man8/man8.amd64/Makefile      |   10 -
 share/man/man8/man8.i386/Makefile       |    8 -
 share/man/man8/man8.i386/boot.8         |  642 --------------------------------
 share/man/man8/man8.i386/boot_console.8 |  147 -------
 share/man/man8/man8.i386/dosboot.8      |  201 ----------
 share/man/man8/man8.i386/mbr.8          |  135 ------
 share/man/man8/man8.i386/multiboot.8    |  115 -----
 share/man/man8/man8.i386/pxeboot.8      |  418 --------------------
 share/man/man8/man8.x86/Makefile        |    8 +
 share/man/man8/man8.x86/boot.8          |  642 ++++++++++++++++++++++++++++++++
 share/man/man8/man8.x86/boot_console.8  |  147 +++++++
 share/man/man8/man8.x86/dosboot.8       |  201 ++++++++++
 share/man/man8/man8.x86/mbr.8           |  135 ++++++
 share/man/man8/man8.x86/multiboot.8     |  115 +++++
 share/man/man8/man8.x86/pxeboot.8       |  418 ++++++++++++++++++++
 17 files changed, 1716 insertions(+), 1723 deletions(-)

diffs (truncated from 3600 to 300 lines):

diff -r d153dd475249 -r a0f43a62daec distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Jul 31 19:58:23 2013 +0000
+++ b/distrib/sets/lists/man/mi Wed Jul 31 21:01:13 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1431 2013/07/31 13:54:42 soren Exp $
+# $NetBSD: mi,v 1.1432 2013/07/31 21:01:13 soren Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2205,14 +2205,8 @@
 ./usr/share/man/cat8/altqd.0                   man-router-catman       .cat
 ./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/boot.0              man-obsolete            obsolete
 ./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
@@ -2441,18 +2435,18 @@
 ./usr/share/man/cat8/i386/apm.0                        man-obsolete            obsolete
 ./usr/share/man/cat8/i386/apmd.0               man-obsolete            obsolete
 ./usr/share/man/cat8/i386/bad144.0             man-obsolete            obsolete
-./usr/share/man/cat8/i386/boot.0               man-sys-catman          .cat
-./usr/share/man/cat8/i386/boot_console.0       man-sys-catman          .cat
-./usr/share/man/cat8/i386/bootselect.0         man-sys-catman          .cat
-./usr/share/man/cat8/i386/dosboot.0            man-sys-catman          .cat
+./usr/share/man/cat8/i386/boot.0               man-obsolete            obsolete
+./usr/share/man/cat8/i386/boot_console.0       man-obsolete            obsolete
+./usr/share/man/cat8/i386/bootselect.0         man-obsolete            obsolete
+./usr/share/man/cat8/i386/dosboot.0            man-obsolete            obsolete
 ./usr/share/man/cat8/i386/installboot.0                man-obsolete            obsolete
 ./usr/share/man/cat8/i386/ispcvt.0             man-obsolete            obsolete
 ./usr/share/man/cat8/i386/kbdio.0              man-obsolete            obsolete
 ./usr/share/man/cat8/i386/makedev.0            man-obsolete            obsolete
-./usr/share/man/cat8/i386/mbr.0                        man-sys-catman          .cat
-./usr/share/man/cat8/i386/multiboot.0          man-sys-catman          .cat
+./usr/share/man/cat8/i386/mbr.0                        man-obsolete            obsolete
+./usr/share/man/cat8/i386/multiboot.0          man-obsolete            obsolete
 ./usr/share/man/cat8/i386/ndiscvt.0            man-netutil-catman      .cat
-./usr/share/man/cat8/i386/pxeboot.0            man-sys-catman          .cat
+./usr/share/man/cat8/i386/pxeboot.0            man-obsolete            obsolete
 ./usr/share/man/cat8/i386/reboot.0             man-obsolete            obsolete
 ./usr/share/man/cat8/i386/reboot_i386.0                man-obsolete            obsolete
 ./usr/share/man/cat8/i386/vgaio.0              man-obsolete            obsolete
@@ -3072,6 +3066,13 @@
 ./usr/share/man/cat8/x68k/newdisk.0            man-sysutil-catman      .cat
 ./usr/share/man/cat8/x68k/poffd.0              man-obsolete            obsolete
 ./usr/share/man/cat8/x68k/rtcalarm.0           man-obsolete            obsolete
+./usr/share/man/cat8/x86/boot.0                        man-sys-catman          .cat
+./usr/share/man/cat8/x86/boot_console.0                man-sys-catman          .cat
+./usr/share/man/cat8/x86/bootselect.0          man-sys-catman          .cat
+./usr/share/man/cat8/x86/dosboot.0             man-sys-catman          .cat
+./usr/share/man/cat8/x86/mbr.0                 man-sys-catman          .cat
+./usr/share/man/cat8/x86/multiboot.0           man-sys-catman          .cat
+./usr/share/man/cat8/x86/pxeboot.0             man-sys-catman          .cat
 ./usr/share/man/cat8/x86_64/MAKEDEV.0          man-obsolete            obsolete
 ./usr/share/man/cat8/x86_64/makedev.0          man-obsolete            obsolete
 ./usr/share/man/cat8/xntpd.0                   man-obsolete            obsolete
@@ -5063,13 +5064,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/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/amd64/boot.html          man-obsolete            obsolete
 ./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
@@ -5235,14 +5230,14 @@
 ./usr/share/man/html8/hpropd.html              man-krb5-htmlman        kerberos,html
 ./usr/share/man/html8/httpd.html               man-netutil-htmlman     html
 ./usr/share/man/html8/i2cscan.html             man-sysutil-htmlman     html
-./usr/share/man/html8/i386/boot.html           man-sys-htmlman         html
-./usr/share/man/html8/i386/boot_console.html   man-sys-htmlman         html
-./usr/share/man/html8/i386/bootselect.html     man-sys-htmlman         html
-./usr/share/man/html8/i386/dosboot.html                man-sys-htmlman         html
-./usr/share/man/html8/i386/mbr.html            man-sys-htmlman         html
-./usr/share/man/html8/i386/multiboot.html      man-sys-htmlman         html
+./usr/share/man/html8/i386/boot.html           man-obsolete            obsolete
+./usr/share/man/html8/i386/boot_console.html   man-obsolete            obsolete
+./usr/share/man/html8/i386/bootselect.html     man-obsolete            obsolete
+./usr/share/man/html8/i386/dosboot.html                man-obsolete            obsolete
+./usr/share/man/html8/i386/mbr.html            man-obsolete            obsolete
+./usr/share/man/html8/i386/multiboot.html      man-obsolete            obsolete
 ./usr/share/man/html8/i386/ndiscvt.html                man-netutil-htmlman     html
-./usr/share/man/html8/i386/pxeboot.html                man-sys-htmlman         html
+./usr/share/man/html8/i386/pxeboot.html                man-obsolete            obsolete
 ./usr/share/man/html8/i386/w95boot.html                man-obsolete            obsolete
 ./usr/share/man/html8/iasl.html                        man-sysutil-htmlman     html
 ./usr/share/man/html8/identd.html              man-netutil-htmlman     html
@@ -5737,6 +5732,13 @@
 ./usr/share/man/html8/x68k/newdisk.html                man-sysutil-htmlman     html
 ./usr/share/man/html8/x68k/poffd.html          man-obsolete            obsolete
 ./usr/share/man/html8/x68k/rtcalarm.html       man-obsolete            obsolete
+./usr/share/man/html8/x86/boot.html            man-sys-htmlman         html
+./usr/share/man/html8/x86/boot_console.html    man-sys-htmlman         html
+./usr/share/man/html8/x86/bootselect.html      man-sys-htmlman         html
+./usr/share/man/html8/x86/dosboot.html         man-sys-htmlman         html
+./usr/share/man/html8/x86/mbr.html             man-sys-htmlman         html
+./usr/share/man/html8/x86/multiboot.html       man-sys-htmlman         html
+./usr/share/man/html8/x86/pxeboot.html         man-sys-htmlman         html
 ./usr/share/man/html8/yp.html                  man-nis-htmlman         html
 ./usr/share/man/html8/ypbind.html              man-nis-htmlman         yp,html
 ./usr/share/man/html8/ypinit.html              man-nis-htmlman         yp,html
@@ -7918,14 +7920,8 @@
 ./usr/share/man/man8/altqd.8                   man-router-man          .man
 ./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/boot.8              man-obsolete            obsolete
 ./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
@@ -8154,18 +8150,18 @@
 ./usr/share/man/man8/i386/apm.8                        man-obsolete            obsolete
 ./usr/share/man/man8/i386/apmd.8               man-obsolete            obsolete
 ./usr/share/man/man8/i386/bad144.8             man-obsolete            obsolete
-./usr/share/man/man8/i386/boot.8               man-sys-man             .man
-./usr/share/man/man8/i386/boot_console.8       man-sys-man             .man
-./usr/share/man/man8/i386/bootselect.8         man-sys-man             .man
-./usr/share/man/man8/i386/dosboot.8            man-sys-man             .man
+./usr/share/man/man8/i386/boot.8               man-obsolete            obsolete
+./usr/share/man/man8/i386/boot_console.8       man-obsolete            obsolete
+./usr/share/man/man8/i386/bootselect.8         man-obsolete            obsolete
+./usr/share/man/man8/i386/dosboot.8            man-obsolete            obsolete
 ./usr/share/man/man8/i386/installboot.8                man-obsolete            obsolete
 ./usr/share/man/man8/i386/ispcvt.8             man-obsolete            obsolete
 ./usr/share/man/man8/i386/kbdio.8              man-obsolete            obsolete
 ./usr/share/man/man8/i386/makedev.8            man-obsolete            obsolete
-./usr/share/man/man8/i386/mbr.8                        man-sys-man             .man
-./usr/share/man/man8/i386/multiboot.8          man-sys-man             .man
+./usr/share/man/man8/i386/mbr.8                        man-obsolete            obsolete
+./usr/share/man/man8/i386/multiboot.8          man-obsolete            obsolete
 ./usr/share/man/man8/i386/ndiscvt.8            man-netutil-man         .man
-./usr/share/man/man8/i386/pxeboot.8            man-sys-man             .man
+./usr/share/man/man8/i386/pxeboot.8            man-obsolete            obsolete
 ./usr/share/man/man8/i386/reboot.8             man-obsolete            obsolete
 ./usr/share/man/man8/i386/reboot_i386.8                man-obsolete            obsolete
 ./usr/share/man/man8/i386/vgaio.8              man-obsolete            obsolete
@@ -8781,6 +8777,13 @@
 ./usr/share/man/man8/x68k/newdisk.8            man-sysutil-man         .man
 ./usr/share/man/man8/x68k/poffd.8              man-obsolete            obsolete
 ./usr/share/man/man8/x68k/rtcalarm.8           man-obsolete            obsolete
+./usr/share/man/man8/x86/boot.8                        man-sys-man             .man
+./usr/share/man/man8/x86/boot_console.8                man-sys-man             .man
+./usr/share/man/man8/x86/bootselect.8          man-sys-man             .man
+./usr/share/man/man8/x86/dosboot.8             man-sys-man             .man
+./usr/share/man/man8/x86/mbr.8                 man-sys-man             .man
+./usr/share/man/man8/x86/multiboot.8           man-sys-man             .man
+./usr/share/man/man8/x86/pxeboot.8             man-sys-man             .man
 ./usr/share/man/man8/x86_64/MAKEDEV.8          man-obsolete            obsolete
 ./usr/share/man/man8/x86_64/makedev.8          man-obsolete            obsolete
 ./usr/share/man/man8/xntpd.8                   man-obsolete            obsolete
diff -r d153dd475249 -r a0f43a62daec share/man/man8/Makefile
--- a/share/man/man8/Makefile   Wed Jul 31 19:58:23 2013 +0000
+++ b/share/man/man8/Makefile   Wed Jul 31 21:01:13 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.102 2012/01/31 12:23:33 nisimura Exp $
+#      $NetBSD: Makefile,v 1.103 2013/07/31 21:01:13 soren Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/5/93
 
 MAN=   MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \
@@ -20,13 +20,13 @@
 MLINKS+=rc.8 rc.local.8
 MLINKS+=rc.8 rc.shutdown.8
 
-SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amd64 man8.amiga man8.atari \
+SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amiga man8.atari \
        man8.cobalt man8.dreamcast man8.emips man8.evbarm man8.hp300 \
        man8.hp700 man8.hpcarm \
-       man8.hpcmips man8.hpcsh man8.i386 man8.mac68k man8.macppc \
+       man8.hpcmips man8.hpcsh man8.mac68k man8.macppc \
        man8.mvme68k man8.next68k man8.pmax man8.prep man8.sandpoint \
        man8.sgimips man8.sparc man8.sparc64 man8.sun2 man8.sun3 \
-       man8.vax man8.x68k
+       man8.vax man8.x68k man8.x86
 
 # create MAKEDEV.8 from ../../etc/MAKEDEV.tmpl
 makedevs:
diff -r d153dd475249 -r a0f43a62daec share/man/man8/man8.amd64/Makefile
--- a/share/man/man8/man8.amd64/Makefile        Wed Jul 31 19:58:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#      $NetBSD: Makefile,v 1.5 2013/07/31 13:54:42 soren Exp $
-#      from: @(#)Makefile      8.1 (Berkeley) 6/5/93
-
-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>
-
-.PATH: ${.CURDIR}/../man8.i386
diff -r d153dd475249 -r a0f43a62daec share/man/man8/man8.i386/Makefile
--- a/share/man/man8/man8.i386/Makefile Wed Jul 31 19:58:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#      $NetBSD: Makefile,v 1.19 2009/10/23 08:32:06 wiz Exp $
-#      from: @(#)Makefile      8.1 (Berkeley) 6/5/93
-
-MAN=   boot.8 dosboot.8 boot_console.8 multiboot.8 pxeboot.8 mbr.8
-MLINKS=        mbr.8 bootselect.8
-MANSUBDIR=/i386
-
-.include <bsd.man.mk>
diff -r d153dd475249 -r a0f43a62daec share/man/man8/man8.i386/boot.8
--- a/share/man/man8/man8.i386/boot.8   Wed Jul 31 19:58:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,642 +0,0 @@
-.\"    $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.
-.\"
-.\" This code is derived from software written and contributed
-.\" to Berkeley by William Jolitz.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)boot_i386.8        8.2 (Berkeley) 4/19/94
-.\"
-.Dd July 31, 2013
-.Dt BOOT 8 i386
-.Os
-.Sh NAME
-.Nm boot
-.Nd
-system bootstrapping procedures
-.Sh DESCRIPTION
-.Tn IA-32
-computers
-.Po
-the
-.Tn IBM PC
-and its clones
-.Pc
-that can run
-.Nx Ns /i386
-can use any of the following boot procedures, depending on what the hardware and
-.Tn BIOS
-support:
-.Bl -tag -width "pxeboot(8)"
-.It boot
-bootstrap
-.Nx
-from the system
-.Tn BIOS
-.It Xr dosboot 8
-bootstrap
-.Nx
-from
-.Tn MS-DOS
-.It Xr pxeboot 8
-network bootstrap
-.Nx
-from a
-.Tn TCP/IP
-.Tn LAN
-with



Home | Main Index | Thread Index | Old Index