Module Name: src
Committed By: martin
Date: Mon Sep 2 17:09:44 UTC 2019
Modified Files:
src/share/man/man1/man1.atari [netbsd-8]: edahdi.1 msconfig.1
src/share/man/man1/man1.x68k [netbsd-8]: aout2hux.1 bellctrl.1
loadfont.1 loadkmap.1 palette.1 tvctrl.1
src/share/man/man4 [netbsd-8]: null.4
src/share/man/man8/man8.next68k [netbsd-8]: boot.8
src/share/man/man9 [netbsd-8]: arp.9
Log Message:
Pull up following revision(s) (requested by sevan in tickets
#1352 - #1364):
share/man/man1/man1.x68k/tvctrl.1: revision 1.6
share/man/man1/man1.x68k/aout2hux.1: revision 1.6
share/man/man1/man1.x68k/palette.1: revision 1.7
share/man/man9/arp.9: revision 1.27
share/man/man1/man1.atari/edahdi.1: revision 1.12
share/man/man1/man1.x68k/loadkmap.1: revision 1.7
share/man/man1/man1.atari/msconfig.1: revision 1.9
share/man/man1/man1.x68k/bellctrl.1: revision 1.16
share/man/man1/man1.x68k/bellctrl.1: revision 1.17
share/man/man4/null.4: revision 1.5
share/man/man4/null.4: revision 1.6
share/man/man1/man1.x68k/loadfont.1: revision 1.10
share/man/man8/man8.next68k/boot.8: revision 1.5
Provide history.
Improve grammar and readability. Minor cosmetics.
Update arpresolve arguments
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.38.1 src/share/man/man1/man1.atari/edahdi.1
cvs rdiff -u -r1.8 -r1.8.38.1 src/share/man/man1/man1.atari/msconfig.1
cvs rdiff -u -r1.5 -r1.5.92.1 src/share/man/man1/man1.x68k/aout2hux.1 \
src/share/man/man1/man1.x68k/tvctrl.1
cvs rdiff -u -r1.13.22.1 -r1.13.22.2 src/share/man/man1/man1.x68k/bellctrl.1
cvs rdiff -u -r1.9 -r1.9.92.1 src/share/man/man1/man1.x68k/loadfont.1
cvs rdiff -u -r1.6 -r1.6.92.1 src/share/man/man1/man1.x68k/loadkmap.1 \
src/share/man/man1/man1.x68k/palette.1
cvs rdiff -u -r1.4 -r1.4.92.1 src/share/man/man4/null.4
cvs rdiff -u -r1.4 -r1.4.52.1 src/share/man/man8/man8.next68k/boot.8
cvs rdiff -u -r1.26 -r1.26.18.1 src/share/man/man9/arp.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man1/man1.atari/edahdi.1
diff -u src/share/man/man1/man1.atari/edahdi.1:1.11 src/share/man/man1/man1.atari/edahdi.1:1.11.38.1
--- src/share/man/man1/man1.atari/edahdi.1:1.11 Tue Oct 20 19:10:10 2009
+++ src/share/man/man1/man1.atari/edahdi.1 Mon Sep 2 17:09:43 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: edahdi.1,v 1.11 2009/10/20 19:10:10 snj Exp $
+.\" $NetBSD: edahdi.1,v 1.11.38.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" Copyright (c) 1996 Leo Weppelman
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 16, 1996
+.Dd September 1, 2019
.Dt EDAHDI 1 atari
.Os
.Sh NAME
@@ -35,16 +35,16 @@
.Sh DESCRIPTION
.Nm
allows you to modify the partition identifiers on a disk partitioned with
-AHDI or an AHDI compatible formatter. An AHDI partition format is usually
-only present on disks shared between
+AHDI or an AHDI compatible formatter.
+An AHDI partition format is usually only present on disks shared between
.Nx
-and some other OS. The partition identifiers are used by
+and some other OS.
+The partition identifiers are used by
.Nx
as a guideline to emulate a disklabel on such a disk.
.Pp
.Nm
supports the following options:
-.Pp
.Bl -tag -width device
.It Ar device
The name of the raw device you want to edit.
@@ -52,13 +52,12 @@ The name of the raw device you want to e
.Pp
The following partition identifiers are recognized by
.Nx :
-.Pp
.Bl -tag -width "GEM or BGM" -compact
.It NBD
Partition is reserved for
.Nx .
-This can be either a root or an user partition. The first NBD
-partition on a disk will be mapped to partition
+This can be either a root or an user partition.
+The first NBD partition on a disk will be mapped to partition
.Em a
in
.Nx .
@@ -72,7 +71,8 @@ The first SWP partition is mapped to par
.It GEM or BGM
These partitions are mapped from
.Em d
-up. The filesystem type is msdos.
+up.
+The filesystem type is msdos.
.It NBR
.Nx
root partition (deprecated).
@@ -84,8 +84,7 @@ user partition (deprecated).
swap partition (deprecated).
.El
.Sh EXAMPLES
-Say, you have a disk with that is partitioned like:
-.Pp
+Say, you have a disk that is partitioned like:
.Bl -column Number Id
.It Sy "Number" Ta Sy "Id"
.It 1 Ta GEM
@@ -97,7 +96,6 @@ Say, you have a disk with that is partit
This partitioning will show up in
.Nx
as (Number refers to the first table):
-.Pp
.Bl -column "c (whole disk)" "Fstype" "Number"
.It Sy Partition Ta Sy Fstype Ta Sy Number
.It c (whole disk) Ta unused Ta ""
@@ -107,10 +105,10 @@ as (Number refers to the first table):
.It g (user part) Ta MSDOS Ta 4
.El
.Pp
-Now you decide to change the id of partition 2 and 3 to NBD. Now
+Now you decide to change the id of partition 2 and 3 to NBD.
+Now
.Nx
will show the partitioning as (Number refers to the first table):
-.Pp
.Bl -column "c (whole disk)" "Fstype" "Number"
.It Sy Partition Ta Sy Fstype Ta Sy Number
.It a (root) Ta 4.2BSD Ta 2
@@ -121,7 +119,8 @@ will show the partitioning as (Number re
.El
.Pp
You will notice that the order of the partitions has changed! You will have
-to watchout for this. It is a consequence of
+to watchout for this.
+It is a consequence of
.Nx
habit of assigning a predefined meaning to the partitions
.Em a/b
@@ -138,10 +137,11 @@ command first appeared in
.Sh BUGS
The changes made to the AHDI partitions will become active on the next
.Em first open
-of the device. You are advised to use
+of the device.
+You are advised to use
.Nm
-only on a device without any mounted or otherwise active partitions. This
-is not enforced by
+only on a device without any mounted or otherwise active partitions.
+This is not enforced by
.Nm .
This is particularly confusing when your change caused partitions to shift,
as shown in the example above.
Index: src/share/man/man1/man1.atari/msconfig.1
diff -u src/share/man/man1/man1.atari/msconfig.1:1.8 src/share/man/man1/man1.atari/msconfig.1:1.8.38.1
--- src/share/man/man1/man1.atari/msconfig.1:1.8 Fri May 14 21:24:12 2010
+++ src/share/man/man1/man1.atari/msconfig.1 Mon Sep 2 17:09:43 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: msconfig.1,v 1.8 2010/05/14 21:24:12 joerg Exp $
+.\" $NetBSD: msconfig.1,v 1.8.38.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" Copyright (c) 1996 Leo Weppelman
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd November 5, 1996
+.Dd September 1, 2019
.Dt MSCONFIG 1 atari
.Os
.Sh NAME
@@ -51,8 +51,9 @@ This can be overridden by means of the
option.
.Pp
When the emulation is turned on, a middle-button event can be generated
-by simultaneously pressing the left and right buttons. When turned off, a
-middle-button event is generated by pushing the fire-button of joystick1.
+by simultaneously pressing the left and right buttons.
+When turned off, a middle-button event is generated by pushing the fire-button
+of joystick1.
Note that you'll need a special type of mouse to use this.
.Sh HISTORY
The
Index: src/share/man/man1/man1.x68k/aout2hux.1
diff -u src/share/man/man1/man1.x68k/aout2hux.1:1.5 src/share/man/man1/man1.x68k/aout2hux.1:1.5.92.1
--- src/share/man/man1/man1.x68k/aout2hux.1:1.5 Tue Sep 11 00:36:57 2001
+++ src/share/man/man1/man1.x68k/aout2hux.1 Mon Sep 2 17:09:43 2019
@@ -1,5 +1,5 @@
-.\" $NetBSD: aout2hux.1,v 1.5 2001/09/11 00:36:57 wiz Exp $
-.Dd August 13, 1998
+.\" $NetBSD: aout2hux.1,v 1.5.92.1 2019/09/02 17:09:43 martin Exp $
+.Dd September 1, 2019
.Dt AOUT2HUX 1 x68k
.Os
.Sh NAME
@@ -18,7 +18,7 @@ reads two
.Xr a.out 5
or ELF
format executables with different load addresses
-and generate Human68k
+and generates a Human68k
.Sq Li \&.x
format executable.
.Pp
@@ -28,19 +28,21 @@ If the input files are a.out, they must
.Dv NMAGIC
m68k executables.
If the input files are ELF, they must be static m68k executables.
-Two input executables must be created from the same objects,
-and have different loading addresses.
-Each of the load address is specified by a hexadecimal number.
-Load address shall be multiple of 4 for
+The two input executables must be created from the same objects,
+but use different load addresses.
+The load address is specified as a hexadecimal number.
+Load addresses are a multiple of 4 for
.Xr as 1
and
.Xr ld 1
-of
+from
.Nx Ns Tn /m68k .
.Pp
-If the output file is not specified by
+If
+.Ar output_file
+is not specified with the
.Fl o
-option, the name
+option, the default name
.Pa out.x
is used.
.Sh FILES
@@ -75,5 +77,5 @@ utility first appeared in
.Sh BUGS
Symbol and debugging information is not converted.
.Pp
-The generated executable is not so effective as that of
+The generated executable is not as effective as that of
Human68k native compiler.
Index: src/share/man/man1/man1.x68k/tvctrl.1
diff -u src/share/man/man1/man1.x68k/tvctrl.1:1.5 src/share/man/man1/man1.x68k/tvctrl.1:1.5.92.1
--- src/share/man/man1/man1.x68k/tvctrl.1:1.5 Sat Apr 21 14:30:19 2001
+++ src/share/man/man1/man1.x68k/tvctrl.1 Mon Sep 2 17:09:43 2019
@@ -1,9 +1,9 @@
-.\" $NetBSD: tvctrl.1,v 1.5 2001/04/21 14:30:19 wiz Exp $
+.\" $NetBSD: tvctrl.1,v 1.5.92.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" This software is in the Public Domain.
.\" Author: Masaru Oki
.\"
-.Dd October 30, 1995
+.Dd September 1, 2019
.Dt TVCTRL 1 x68k
.Os
.Sh NAME
@@ -14,6 +14,11 @@
.Ar control_number
.Sh DESCRIPTION
.Nm tvctrl
-is display-TV control program for X680x0.
+is a display-TV control program for X680x0.
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Nx 1.4 .
.Sh BUGS
Errors are not checked.
Index: src/share/man/man1/man1.x68k/bellctrl.1
diff -u src/share/man/man1/man1.x68k/bellctrl.1:1.13.22.1 src/share/man/man1/man1.x68k/bellctrl.1:1.13.22.2
--- src/share/man/man1/man1.x68k/bellctrl.1:1.13.22.1 Mon Sep 2 16:39:21 2019
+++ src/share/man/man1/man1.x68k/bellctrl.1 Mon Sep 2 17:09:43 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: bellctrl.1,v 1.13.22.1 2019/09/02 16:39:21 martin Exp $
+.\" $NetBSD: bellctrl.1,v 1.13.22.2 2019/09/02 17:09:43 martin Exp $
.\"
.\" Copyright (c) 1995 Takuya Harakawa.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\"
.\" from: @(#)bellctrl.1 6.19 (Berkeley) 7/27/91
.\"
-.Dd December 15, 1995
+.Dd September 1, 2019
.Dt BELLCTRL 1 x68k
.Os
.Sh NAME
@@ -55,12 +55,13 @@ The options are as follows:
.It Fl b
The b option controls bell volume, pitch and duration.
This option accepts up to three numerical parameters, a preceding
-dash(-), or a 'on/off' flag. If no parameters are given,
-or the 'on' flag is used, the system defaults will be used.
+dash(-), or an 'on/off' flag.
+If no parameters are given, or the 'on' flag is used, the system defaults will
+be used.
If the dash or 'off' are given, the bell will be turned off.
If only one numerical parameter is given, the bell volume will be
set to that value, as a percentage of its maximum.
-Like wise, the second numerical parameter specifies the bell pitch,
+Likewise, the second numerical parameter specifies the bell pitch,
in hertz, and the third numerical parameter specifies the duration
in milliseconds.
.It Sy v Ar default
@@ -73,6 +74,11 @@ The
option sets the voice parameter to given voice parameter file (
.Ar voicefile ) .
.El
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Nx 1.3 .
.Sh AUTHORS
.Nm
was written by Takuya Harakawa <u...@int.titech.ac.jp>.
Index: src/share/man/man1/man1.x68k/loadfont.1
diff -u src/share/man/man1/man1.x68k/loadfont.1:1.9 src/share/man/man1/man1.x68k/loadfont.1:1.9.92.1
--- src/share/man/man1/man1.x68k/loadfont.1:1.9 Tue Jan 15 14:20:55 2002
+++ src/share/man/man1/man1.x68k/loadfont.1 Mon Sep 2 17:09:43 2019
@@ -1,9 +1,9 @@
-.\" $NetBSD: loadfont.1,v 1.9 2002/01/15 14:20:55 wiz Exp $
+.\" $NetBSD: loadfont.1,v 1.9.92.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" This software is in the Public Domain.
.\" Author: Masaru Oki
.\"
-.Dd May 5, 1995
+.Dd September 1, 2019
.Dt LOADFONT 1 x68k
.Os
.Sh NAME
@@ -25,6 +25,11 @@ format is compatible with that of
.Tn Human68k
.Sq IOCS
font.
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Nx 1.3 .
.Sh BUGS
Replacing kanji fonts is not supported,
because current
Index: src/share/man/man1/man1.x68k/loadkmap.1
diff -u src/share/man/man1/man1.x68k/loadkmap.1:1.6 src/share/man/man1/man1.x68k/loadkmap.1:1.6.92.1
--- src/share/man/man1/man1.x68k/loadkmap.1:1.6 Sat Apr 21 14:30:18 2001
+++ src/share/man/man1/man1.x68k/loadkmap.1 Mon Sep 2 17:09:43 2019
@@ -1,9 +1,9 @@
-.\" $NetBSD: loadkmap.1,v 1.6 2001/04/21 14:30:18 wiz Exp $
+.\" $NetBSD: loadkmap.1,v 1.6.92.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" This software is in the Public Domain.
.\" Author: Masaru Oki
.\"
-.Dd May 5, 1995
+.Dd September 1, 2019
.Dt LOADKMAP 1 x68k
.Os
.Sh NAME
@@ -17,3 +17,8 @@
command reads
.Ar keymapfile
and replaces the x68k console keyboard map.
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Nx 1.4 .
Index: src/share/man/man1/man1.x68k/palette.1
diff -u src/share/man/man1/man1.x68k/palette.1:1.6 src/share/man/man1/man1.x68k/palette.1:1.6.92.1
--- src/share/man/man1/man1.x68k/palette.1:1.6 Sat Apr 21 14:30:18 2001
+++ src/share/man/man1/man1.x68k/palette.1 Mon Sep 2 17:09:43 2019
@@ -1,9 +1,9 @@
-.\" $NetBSD: palette.1,v 1.6 2001/04/21 14:30:18 wiz Exp $
+.\" $NetBSD: palette.1,v 1.6.92.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" This software is in the Public Domain.
.\" Author: Masaru Oki
.\"
-.Dd March 5, 1995
+.Dd September 1, 2019
.Dt PALETTE 1 x68k
.Os
.Sh NAME
@@ -41,5 +41,10 @@ Each part of the console corresponds to
If no arguments are supplied,
.Nm
resets the colormap to the default.
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Nx 1.4 .
.Sh BUGS
Quite a few.
Index: src/share/man/man4/null.4
diff -u src/share/man/man4/null.4:1.4 src/share/man/man4/null.4:1.4.92.1
--- src/share/man/man4/null.4:1.4 Thu Aug 7 10:31:03 2003
+++ src/share/man/man4/null.4 Mon Sep 2 17:09:43 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: null.4,v 1.4 2003/08/07 10:31:03 agc Exp $
+.\" $NetBSD: null.4,v 1.4.92.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)null.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd June 5, 1993
+.Dd August 29, 2019
.Dt NULL 4
.Os
.Sh NAME
@@ -38,17 +38,17 @@
.Sh DESCRIPTION
The
.Nm
-device accepts and reads data as any ordinary (and willing)
-file \-
-but throws it away. The length of the
+device accepts and reads data as any ordinary (and willing) file \(em
+but throws it away.
+The length of the
.Nm null
device is always zero.
.Sh FILES
-.Bl -tag -width /dev/null
+.Bl -tag -width Pa -compact
.It Pa /dev/null
.El
.Sh HISTORY
A
.Nm
device appeared in
-.At v7 .
+.At v4 .
Index: src/share/man/man8/man8.next68k/boot.8
diff -u src/share/man/man8/man8.next68k/boot.8:1.4 src/share/man/man8/man8.next68k/boot.8:1.4.52.1
--- src/share/man/man8/man8.next68k/boot.8:1.4 Wed Sep 24 20:07:05 2008
+++ src/share/man/man8/man8.next68k/boot.8 Mon Sep 2 17:09:44 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.4 2008/09/24 20:07:05 reed Exp $
+.\" $NetBSD: boot.8,v 1.4.52.1 2019/09/02 17:09:44 martin Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
.\" From:
.\" @(#)boot_hp300.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd April 19, 1994
+.Dd September 1, 2019
.Dt BOOT 8 next68k
.Os
.Sh NAME
@@ -46,9 +46,8 @@ system bootstrapping procedures
Normally, the system will reboot itself at power-up or after crashes.
An automatic consistency check of the file systems will be performed,
and unless this fails, the system will resume multi-user operations.
-.Pp
.Ss Cold starts
-On an NeXT, the boot procedure uses the boot ROM to load a boot program
+On a NeXT, the boot procedure uses the boot ROM to load a boot program
over the network using BOOTP and TFTP.
The
.Pa /usr/mdec
Index: src/share/man/man9/arp.9
diff -u src/share/man/man9/arp.9:1.26 src/share/man/man9/arp.9:1.26.18.1
--- src/share/man/man9/arp.9:1.26 Tue Sep 17 19:58:03 2013
+++ src/share/man/man9/arp.9 Mon Sep 2 17:09:43 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: arp.9,v 1.26 2013/09/17 19:58:03 wiz Exp $
+.\" $NetBSD: arp.9,v 1.26.18.1 2019/09/02 17:09:43 martin Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd March 3, 1997
+.Dd September 1, 2019
.Dt ARP 9
.Os
.Sh NAME
@@ -42,7 +42,7 @@
.Ft void
.Fn arp_ifinit "struct ifnet *ifp" "struct ifaddr *ifa"
.Ft int
-.Fn arpresolve "struct ifnet *ifp" "struct rtentry *rt" "struct mbuf *m" "struct sockaddr *dst" "u_char *desten"
+.Fn arpresolve "struct ifnet *ifp" "const struct rtentry *rt" "struct mbuf *m" "const struct sockaddr *dst" "void *desten" "size_t destlen"
.Ft void
.Fn arpintr
.Sh DESCRIPTION
