? man4/nat.3-e
? man4/out
? man5/out
Index: man4/aha.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/aha.4,v
retrieving revision 1.19
diff -u -r1.19 aha.4
--- man4/aha.4	15 Aug 2003 18:30:14 -0000	1.19
+++ man4/aha.4	6 Sep 2003 17:41:14 -0000
@@ -42,12 +42,23 @@
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
+<<<<<<< aha.4
+bus connected to an Adaptec 154xA, 154xB, 154xC, 154xCF, or 154xCP
+host adapter.
+Host adapters supporting a 154X compatible interface,
+=======
 bus connected to an Adaptec 1510, 152x, 1535, 154xA, 154xB, 154xC,
 154xCF, 154xCP, or 164x host adapter.
 Host adapters supporting a 154x compatible interface,
+>>>>>>> 1.19
 such as some Tekram controllers and the Adaptec 174x in 154x
+<<<<<<< aha.4
+emulation mode can, also be attached with this driver.
+For optimum
+=======
 emulation mode can also be attached with this driver.
 For optimum
+>>>>>>> 1.19
 performance, Adaptec 174x controllers should be configured in
 enhanced mode and attached via the
 .Xr ahb 4
Index: man4/bpf.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/bpf.4,v
retrieving revision 1.38
diff -u -r1.38 bpf.4
--- man4/bpf.4	28 Jun 2003 23:53:37 -0000	1.38
+++ man4/bpf.4	6 Sep 2003 17:41:14 -0000
@@ -257,12 +257,20 @@
 .It Dv BIOCVERSION
 .Pq Li "struct bpf_version"
 Returns the major and minor version numbers of the filter language currently
+<<<<<<< bpf.4
+recognized by the kernel.  Before installing a filter, applications must check
+that the current version is compatible with the running kernel.
+Version numbers are compatible if the major numbers match and the application minor
+is less than or equal to the kernel minor.
+The kernel version number is returned in the following structure:
+=======
 recognized by the kernel.
 Before installing a filter, applications must check
 that the current version is compatible with the running kernel.
 Version numbers are compatible if the major numbers match and the application minor
 is less than or equal to the kernel minor.
 The kernel version number is returned in the following structure:
+>>>>>>> 1.38
 .Bd -literal
 struct bpf_version {
         u_short bv_major;
Index: man4/ifmib.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ifmib.4,v
retrieving revision 1.18
diff -u -r1.18 ifmib.4
--- man4/ifmib.4	28 Jun 2003 23:53:37 -0000	1.18
+++ man4/ifmib.4	6 Sep 2003 17:41:14 -0000
@@ -65,7 +65,7 @@
 .Tn SNMP
 .Tn MIB
 defined for that particular interface class, if one exists and can be
-implemented in the kernel.)
+implemented in the kernel.
 .Pp
 The
 .Nm
Index: man4/intro.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/intro.4,v
retrieving revision 1.27
diff -u -r1.27 intro.4
--- man4/intro.4	28 Jun 2003 23:53:37 -0000	1.27
+++ man4/intro.4	6 Sep 2003 17:41:14 -0000
@@ -37,8 +37,13 @@
 .Ss The device abstraction
 Device is a term used mostly for hardware-related stuff that belongs
 to the system, like disks, printers, or a graphics display with its
+<<<<<<< intro.4
+keyboard.
+:There are also so-called
+=======
 keyboard.
 There are also so-called
+>>>>>>> 1.27
 .Em pseudo-devices
 where a device driver emulates the behaviour of a device in software
 without any particular underlying hardware.
Index: man4/mem.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/mem.4,v
retrieving revision 1.15
diff -u -r1.15 mem.4
--- man4/mem.4	28 Jun 2003 23:53:37 -0000	1.15
+++ man4/mem.4	6 Sep 2003 17:41:14 -0000
@@ -78,7 +78,11 @@
 calls performed on
 .Pa /dev/mem .
 Declarations and data types are to be found in
+<<<<<<< mem.4
+.Aq Pa sys/memrange.h
+=======
 .Aq Pa sys/memrange.h .
+>>>>>>> 1.15
 .Pp
 The specific attributes, and number of programmable ranges may vary between
 architectures.
@@ -97,7 +101,11 @@
 .El
 .Pp
 Memory ranges are described by
+<<<<<<< mem.4
+.Va struct mem_range_desc :
+=======
 .Vt struct mem_range_desc :
+>>>>>>> 1.15
 .Bd -literal -offset indent
 u_int64_t	mr_base;	/\(** physical base address \(**/
 u_int64_t	mr_len;		/\(** physical length of region \(**/
@@ -155,12 +163,21 @@
 .Dv MDF_BUSY
 flag may not be removed or updated.
 .Pp
+<<<<<<< mem.4
+.Va mo_arg[0]
+should be set to
+.Va MEMRANGE_SET_UPDATE to update an existing
+or establish a new range, or to
+.Va MEMRANGE_SET_REMOVE
+to remove a range.
+=======
 .Va mo_arg[0]
 should be set to
 .Dv MEMRANGE_SET_UPDATE
 to update an existing or establish a new range, or to
 .Dv MEMRANGE_SET_REMOVE
 to remove a range.
+>>>>>>> 1.15
 .Sh RETURN VALUES
 .Bl -tag -width Er
 .It Bq Er EOPNOTSUPP
@@ -194,9 +211,14 @@
 .Xr memcontrol 8
 .Sh HISTORY
 The
+<<<<<<< mem.4
+.Nm ,
+.Pa kmem
+=======
 .Nm mem
 and
 .Nm kmem
+>>>>>>> 1.15
 files appeared in
 .At v6 .
 The ioctl interface for memory range attributes was added in
Index: man4/ng_async.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ng_async.4,v
retrieving revision 1.12
diff -u -r1.12 ng_async.4
--- man4/ng_async.4	1 Oct 2001 16:09:21 -0000	1.12
+++ man4/ng_async.4	6 Sep 2003 17:41:14 -0000
@@ -54,7 +54,8 @@
 .Pp
 The node transmits and receives asynchronous data on the
 .Dv async
-hook.  Mbuf boundaries of incoming data are ignored.
+hook.
+Mbuf boundaries of incoming data are ignored.
 Once a complete packet has been received, it is decoded and
 stripped of all framing bytes, and transmitted out the
 .Dv sync
@@ -68,7 +69,8 @@
 .Dv async .
 Received packets should start with the address and control fields,
 or the PPP protocol field if address and control field compression
-is employed, and contain no checksum field.  If the first four bytes are
+is employed, and contain no checksum field.
+If the first four bytes are
 .Dv "0xff 0x03 0xc0 0x21"
 (an LCP protocol frame) then complete control character escaping
 is enabled for that frame (in PPP, LCP packets are always sent with
@@ -93,7 +95,8 @@
 .Xr ng_tty 4
 node, which handles transmission of serial data over a tty device.
 .It Dv sync
-Synchronous connection.  This hook sends and receives synchronous frames.
+Synchronous connection.
+This hook sends and receives synchronous frames.
 For PPP, these frames should contain address, control, and protocol fields,
 but no checksum field.
 Typically this hook would be connected to an individual link hook of a
@@ -132,7 +135,8 @@
 and
 .Dv smru
 fields are the asynchronous and synchronous MRU (maximum receive unit) values,
-respectively.  These both default to 1600; note that the async MRU
+respectively.
+These both default to 1600; note that the async MRU
 applies to the incoming frame length after asynchronous decoding.
 The
 .Dv accm
Index: man4/ng_bpf.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ng_bpf.4,v
retrieving revision 1.17
diff -u -r1.17 ng_bpf.4
--- man4/ng_bpf.4	1 Oct 2001 16:09:21 -0000	1.17
+++ man4/ng_bpf.4	6 Sep 2003 17:41:14 -0000
@@ -51,7 +51,8 @@
 .Xr bpf 4 )
 filters to be applied to data travelling through a Netgraph network.
 Each node allows an arbitrary number of connections to arbitrarily
-named hooks.  With each hook is associated a
+named hooks.
+With each hook is associated a
 .Xr bpf 4
 filter program which is applied to incoming data only, a destination hook
 for matching packets, a destination hook for non-matching packets,
@@ -60,7 +61,8 @@
 A
 .Xr bpf 4
 program returns an unsigned integer, which is normally interpreted as
-the length of the prefix of the packet to return.  In the context of this
+the length of the prefix of the packet to return.
+In the context of this
 node type, returning zero is considered a non-match, in which case the
 entire packet is delivered out the non-match destination hook.
 Returning a value greater than zero causes the packet to be truncated
@@ -79,7 +81,8 @@
 .Bl -tag -width foo
 .It Dv NGM_BPF_SET_PROGRAM
 This command sets the filter program that will be applied to incoming
-data on a hook.  The following structure must be supplied as an argument:
+data on a hook.
+The following structure must be supplied as an argument:
 .Bd -literal -offset 4n
 struct ng_bpf_hookprog {
   char            thisHook[NG_HOOKLEN+1];   /* name of hook */
@@ -101,7 +104,8 @@
 .Dv ifMatch
 and
 .Dv ifNotMatch ,
-respectively.  The program must be a valid
+respectively.
+The program must be a valid
 .Xr bpf 4
 program or else
 .Er EINVAL
Index: man4/ng_cisco.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ng_cisco.4,v
retrieving revision 1.11
diff -u -r1.11 ng_cisco.4
--- man4/ng_cisco.4	1 Oct 2001 16:09:21 -0000	1.11
+++ man4/ng_cisco.4	6 Sep 2003 17:41:14 -0000
@@ -67,14 +67,14 @@
 and
 .Dv ipx
 hooks, which transmit and receive raw IP, IPv6, AppleTalk, and IPX packets,
-respectively.  Typically these hooks would connect to the corresponding
-hooks on an
+respectively.
+Typically these hooks would connect to the corresponding hooks on an
 .Xr ng_iface 4
 type node.
 .Sh IP Configuration
 In order to function properly for IP traffic, the node must be informed
-of the local IP address and netmask setting.  This is because the protocol
-includes an
+of the local IP address and netmask setting.
+This is because the protocol includes an
 .Dq inquire
 packet which we must be prepared to answer.
 There are two ways to accomplish this, manually and automatically.
Index: man4/ng_iface.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ng_iface.4,v
retrieving revision 1.13
diff -u -r1.13 ng_iface.4
--- man4/ng_iface.4	1 Oct 2001 16:09:21 -0000	1.13
+++ man4/ng_iface.4	6 Sep 2003 17:41:14 -0000
@@ -46,7 +46,8 @@
 .Sh DESCRIPTION
 An
 .Nm iface
-node is both a netgraph node and a system networking interface.  When an
+node is both a netgraph node and a system networking interface.
+When an
 .Nm iface
 node is created, a new interface appears which is accessible via
 .Xr ifconfig 8 .
@@ -126,8 +127,8 @@
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message.  The associated interface is removed and becomes available
-for use by future
+control message.
+The associated interface is removed and becomes available for use by future
 .Nm iface
 nodes.
 .Pp
Index: man4/ukbd.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/ukbd.4,v
retrieving revision 1.27
diff -u -r1.27 ukbd.4
--- man4/ukbd.4	25 Mar 2003 14:49:02 -0000	1.27
+++ man4/ukbd.4	6 Sep 2003 17:41:14 -0000
@@ -88,8 +88,8 @@
 .Em after
 the console driver
 initializes itself and you have to explicitly tell the console
-driver to use the existence of the USB keyboard.  This can be done in
-one of the following two ways.
+driver to use the existence of the USB keyboard.
+This can be done in one of the following two ways.
 .Pp
 Run the following command as a part of system initialization:
 .Pp
Index: man4/vga.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/vga.4,v
retrieving revision 1.20
diff -u -r1.20 vga.4
--- man4/vga.4	20 Dec 2002 04:56:52 -0000	1.20
+++ man4/vga.4	6 Sep 2003 17:41:14 -0000
@@ -49,7 +49,8 @@
 The
 .Nm
 driver is a generic video card driver which provides access to
-video cards.  This driver is required for the console driver
+video cards.
+This driver is required for the console driver
 .Xr syscons 4 .
 The console driver will call the
 .Nm
@@ -121,7 +122,8 @@
 Note that if you use this option and
 still wish to use the mouse on the console then you must also use the
 .Dv SC_ALT_MOUSE_IMAGE
-option.  See
+option.
+See
 .Xr syscons 4 .
 .It Dv VGA_NO_MODE_CHANGE
 This option prevents the driver from changing video modes.
@@ -146,7 +148,7 @@
 If you do not want VESA support included in the kernel, but
 want to use occasionally, do not add the
 .Dv VESA
-option.  And load the
+option and load the
 .Nm vesa
 module as desired:
 .Pp
Index: man4/worm.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/worm.4,v
retrieving revision 1.26
diff -u -r1.26 worm.4
--- man4/worm.4	24 Dec 2002 13:41:46 -0000	1.26
+++ man4/worm.4	6 Sep 2003 17:41:14 -0000
@@ -57,16 +57,17 @@
 .Fx 3.0
 by a CAM-compliant
 .Tn SCSI
-layer.  The new
+layer.
+The new
 .Tn SCSI
 layer doesn't include a
 .Nm
-driver, and isn't likely to include one in the future.  Future in-kernel
+driver, and isn't likely to include one in the future.
+Future in-kernel
 support for CD-R/CD-RW/DVD drives will likely be implemented through the
 .Xr cd 4
-driver.  Users who wish
-to write CDs on a WORM, CD-R, or CD-RW drive
-should use
+driver.
+Users who wish to write CDs on a WORM, CD-R, or CD-RW drive should use
 .Nm cdrtools ,
 which is in the
 .Fx
@@ -75,8 +76,8 @@
 The
 .Xr cd 4
 driver provides read-only access to CD, CD-R, and CD-RW drives, as well as
-WORM drives that support the CDROM command set.  Therefore, users wishing
-to mount CDs in a WORM drive should use the
+WORM drives that support the CDROM command set.
+Therefore, users wishing to mount CDs in a WORM drive should use the
 .Xr cd 4
 driver instead.
 .Sh SEE ALSO
@@ -93,8 +94,8 @@
 .Nm
 driver has been written by
 .An Peter Dufault
-in May, 1995.  The driver has
-then been improved and made actually usable at all by
+in May, 1995.
+The driver has then been improved and made actually usable at all by
 .An J\(:org Wunsch
 in January, 1996.
 .Sh HISTORY
Index: man4/xpt.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/xpt.4,v
retrieving revision 1.10
diff -u -r1.10 xpt.4
--- man4/xpt.4	14 Jul 2001 19:40:48 -0000	1.10
+++ man4/xpt.4	6 Sep 2003 17:41:14 -0000
@@ -44,23 +44,26 @@
 Since the
 .Nm
 driver allows direct access to the CAM subsystem, system administrators
-should exercise caution when granting access to this driver.  If used
+should exercise caution when granting access to this driver.
+If used
 improperly, this driver can allow userland applications to crash a machine
 or cause data loss.
 .Sh KERNEL CONFIGURATION
 There is no kernel configuration required for the
 .Nm
-driver.  It is enabled when
+driver.
+It is enabled when
 .Tn SCSI
-support is enabled in the kernel.  There is one instance of the xpt driver
-per CAM transport layer instance.  Since there is currently only one CAM
+support is enabled in the kernel.
+There is one instance of the xpt driver per CAM transport layer instance.
+Since there is currently only one CAM
 transport layer, there will only be one instance of this driver.
 .Sh IOCTLS
 .Bl -tag -width 01234567890123
 .It CAMIOCOMMAND
 This ioctl takes certain kinds of CAM CCBs and passes them through to the
-CAM transport layer for action.  Only the following CCB types are
-supported:
+CAM transport layer for action.
+Only the following CCB types are supported:
 .Pp
 .Bl -tag -width XPT_DEV_MATCH -compact
 .It XPT_SCAN_BUS
Index: man5/elf.5
===================================================================
RCS file: /home/ncvs/src/share/man/man5/elf.5,v
retrieving revision 1.23
diff -u -r1.23 elf.5
--- man5/elf.5	9 Jun 2003 09:19:21 -0000	1.23
+++ man5/elf.5	6 Sep 2003 17:41:14 -0000
@@ -391,48 +391,6 @@
 If the file has no section name string
 table, this member holds the value
 .Sy SHN_UNDEF .
-.Pp
-.Bl -tag -width "SHN_LORESERVE" -compact
-.It Dv SHN_UNDEF
-This value marks an undefined, missing, irrelevant, or otherwise meaningless
-section reference.
-For example, a symbol
-.Dq defined
-relative to section number
-.Sy SHN_UNDEF
-is an undefined symbol.
-.It Dv SHN_LORESERVE
-This value specifies the lower bound of the range of reserved indexes.
-.It Dv SHN_LOPROC
-This value up to and including
-.Sy SHN_HIPROC
-are reserved for processor-specific semantics.
-.It Dv SHN_HIPROC
-This value down to and including
-.Sy SHN_LOPROC
-are reserved for processor-specific semantics.
-.It Dv SHN_ABS
-This value specifies absolute values for the corresponding reference.
-For
-example, symbols defined relative to section number
-.Sy SHN_ABS
-have absolute values and are not affected by relocation.
-.It Dv SHN_COMMON
-Symbols defined relative to this section are common symbols, such as Fortran
-COMMON or unallocated C external variables.
-.It Dv SHN_HIRESERVE
-This value specifies the upper bound of the range of the range of reserved
-indices between
-.Sy SHN_LORESERVE
-and
-.Sy SHN_HIRESERVE ,
-inclusive; the values do
-not reference the section header table.
-That is, the section header table
-does
-.Em not
-contain entries for the reserved indices.
-.El
 .El
 .Pp
 An executable or shared object file's program header table is an array of
@@ -625,8 +583,13 @@
 .Pp
 .Bl -tag -width "SHN_LORESERVE" -compact
 .It Dv SHN_UNDEF
-This value marks an undefined, missing, irrelevant or otherwise meaningless
+This value marks an undefined, missing, irrelevant, or otherwise meaningless
 section reference.
+For example, a symbol
+.Dq defined
+relative to section number
+.Sy SHN_UNDEF
+is an undefined symbol.
 .It Dv SHN_LORESERVE
 This value specifies the lower bound of the range of reserved indices.
 .It Dv SHN_LOPROC
Index: man9/bus_dma.9
===================================================================
RCS file: /home/ncvs/src/share/man/man9/bus_dma.9,v
retrieving revision 1.7
diff -u -r1.7 bus_dma.9
--- man9/bus_dma.9	27 Jul 2003 14:05:29 -0000	1.7
+++ man9/bus_dma.9	6 Sep 2003 17:41:14 -0000
@@ -696,6 +696,16 @@
 DMA map to be invalidated.
 .El
 .El
+.Sh IMPLEMENTATION NOTES
+Generally, the
+.Fa alignment
+argument to
+.Fn bus_dma_tag_create
+cannot be used to
+.Ql strictly
+enforce alignments that are less than that
+of the hardware page size, thus it should be assumed that the argument
+is ignored for such cases.
 .Sh RETURN VALUES
 Behavior is undefined if invalid arguments are passed to
 any of the above functions.