11 files changed, 102 insertions, 65 deletions
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 950ab82..b7f2254 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -237,7 +237,11 @@ Supports system cooling and heat management.
 Implements a timecounter using the ACPI fixed-frequency timer.
 .It Li video
 .Pq Vt device
-Supports acpi_video which may conflict with agp device.
+Supports
+.Xr acpi_video 4
+which may conflict with
+.Xr agp 4
+device.
 .El
 .Pp
 It is also possible to avoid portions of the ACPI namespace which
diff --git a/share/man/man4/cpufreq.4 b/share/man/man4/cpufreq.4
index fa3839a..155e66e 100644
--- a/share/man/man4/cpufreq.4
+++ b/share/man/man4/cpufreq.4
@@ -62,7 +62,7 @@ interface of all possible levels.
 Users can access this interface directly via
 .Xr sysctl 8
 or by indicating to
-.Pa power_profile
+.Pa /etc/rc.d/power_profile
 that it should switch settings when the AC line state changes via
 .Xr rc.conf 5 .
 .Sh SYSCTLS
@@ -106,7 +106,7 @@ Intel Enhanced SpeedStep
 .It Pa ichss
 Intel SpeedStep for ICH
 .It Pa powernow
-AMD PowerNow! for K7 and K8
+AMD PowerNow!\& for K7 and K8
 .It Pa smist
 Intel SMI-based SpeedStep for PIIX4
 .El
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 58f9e31..bac4df6 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 9, 2005
+.Dd February 23, 2005
 .Dt ED 4
 .Os
 .Sh NAME
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index e0122c3..78c5584b 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -338,28 +338,28 @@ sysctl.
 All of these flags are off by default, and great care should be taken in
 turning them on.
 .Bl -tag -width FAIL
-.It 0x01 (G_T_TOPOLOGY)
+.It 0x01 Pq Dv G_T_TOPOLOGY
 Provide tracing of topology change events.
-.It 0x02 (G_T_BIO)
+.It 0x02 Pq Dv G_T_BIO
 Provide tracing of buffer I/O requests.
-.It 0x04 (G_T_ACCESS)
+.It 0x04 Pq Dv G_T_ACCESS
 Provide tracing of access check controls.
 .It 0x08 (unused)
 .It 0x10 (allow foot shooting)
 Allow writing to Rank 1 providers.
 This would, for example, allow the super-user to overwrite the MBR on the root
-disk or write random sectors elsewhere to a mounted disk.  The implications
-are obvious.
-.It 0x20 (G_T_DETAILS)
+disk or write random sectors elsewhere to a mounted disk.
+The implications are obvious.
+.It 0x20 Pq Dv G_T_DETAILS
 This appears to be unused at this time.
-.It 0x40 (G_F_DISKIOCTL)
+.It 0x40 Pq Dv G_F_DISKIOCTL
 This appears to be unused at this time.
-.It 0x80 (G_F_CTLDUMP)
+.It 0x80 Pq Dv G_F_CTLDUMP
 Dump contents of gctl requests.
 .El
 .Sh HISTORY
 This software was developed for the FreeBSD Project by Poul-Henning Kamp
-and NAI Labs, the Security Research Division of Network Associates, Inc.
+and NAI Labs, the Security Research Division of Network Associates, Inc.\&
 under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
 DARPA CHATS research program.
 .Pp
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index d5c1be4..83aff0e 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -196,24 +196,32 @@ is modified to allow all message types.
 Ignore all incoming messages.
 .Va filterp
 is modified to ignore all message types.
-.It Fn "void ICMP6_FILTER_SETPASS" "int type" \
-    "struct icmp6_filter *filterp"
+.It Xo
+.Ft void
+.Fn ICMP6_FILTER_SETPASS "int type" "struct icmp6_filter *filterp"
+.Xc
 Allow ICMPv6 messages with the given
 .Fa type .
 .Va filterp
 is modified to allow such messages.
-.It Fn "void ICMP6_FILTER_SETBLOCK" "int type" \
-    "struct icmp6_filter *filterp"
+.It Xo
+.Ft void
+.Fn ICMP6_FILTER_SETBLOCK" "int type" "struct icmp6_filter *filterp"
+.Xc
 Ignore ICMPv6 messages with the given
 .Fa type .
 .Va filterp
 is modified to ignore such messages.
-.It Fn "int ICMP6_FILTER_WILLPASS" "int type" \
-    "const struct icmp6_filter *filterp"
+.It Xo
+.Ft int
+.Fn ICMP6_FILTER_WILLPASS" "int type" "const struct icmp6_filter *filterp"
+.Xc
 Determine if the given filter will allow an ICMPv6 message of the given
 type.
-.It Fn "int ICMP6_FILTER_WILLBLOCK" "int type" \
-    "const struct icmp6_filter *filterp"
+.It Xo
+.Ft int
+.Fn ICMP6_FILTER_WILLBLOCK" "int type" "const struct icmp6_filter *filterp"
+.Xc
 Determine if the given filter will ignore an ICMPv6 message of the given
 type.
 .El
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index a250fe8..a21b341 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -243,10 +243,10 @@ we do not use tee, but send packets back to ether node.
 SEQ
 .Ed
 .Sh SEE ALSO
-.Xr flowctl 8 ,
 .Xr netgraph 4 ,
 .Xr ng_ksocket 4 ,
 .Xr ng_tee 4 ,
+.Xr flowctl 8 ,
 .Xr ngctl 8
 .Pp
 .Pa http://www.cisco.com/warp/public/cc/pd/iosw/ioft/neflct/tech/napps_wp.htm
diff --git a/share/man/man4/ng_source.4 b/share/man/man4/ng_source.4
index 4e50c24..fee9000 100644
--- a/share/man/man4/ng_source.4
+++ b/share/man/man4/ng_source.4
@@ -64,32 +64,34 @@ The operation of the node is as follows.
 Packets received on the
 .Va input
 hook are queued internally.
-When 
+When
 .Va output
 hook is connected,
 .Nm
 node assumes that its neighbour node is of
-.Xr ng_ether
+.Xr ng_ether 4
 node type.
-The neighbor is queried for its interface name.
+The neighbour is queried for its interface name.
+The
 .Nm
 node then uses queue of the interface for its evil purposes.
+The
 .Nm
 node also disables
 .Va autosrc
 option on neighbour
-.Xr ng_ether
+.Xr ng_ether 4
 node.
-If interface name can't be obtained automatically, it should
-be configured explicitly with help of
-.Dv NGM_SOURCE_SETIFACE 
+If interface name cannot be obtained automatically, it should
+be configured explicitly with the
+.Dv NGM_SOURCE_SETIFACE
 control message, and
 .Va autosrc
 should be turned off on
-.Xr ng_ether
+.Xr ng_ether 4
 node manually.
 .Pp
-Once interface is configured, upon receival of
+Once interface is configured, upon receipt of a
 .Dv NGM_SOURCE_START
 control message the node starts sending
 the previously queued packets out the
@@ -100,8 +102,10 @@ While active, on every clock tick the node checks the available space
 in the interface queue and sends that many packets out its
 .Va output
 hook.
-Once the number of packets indicated in the start message have been
-sent, or upon reception of a stop message, the node stops sending data.
+Once the number of packets indicated in the start message has been
+sent, or upon receipt of a
+.Dv NGM_SOURCE_STOP
+message, the node stops sending data.
 .Sh CONTROL MESSAGES
 This node type supports the generic control messages as well as the following,
 which must be sent with the
@@ -113,19 +117,19 @@ Returns a structure containing the following fields:
 .Bl -tag -width indent
 .It Va outOctets
 The number of octets/bytes sent out the
-.Dv output
+.Va output
 hook.
 .It Va outFrames
 The number of frames/packets sent out the
-.Dv output
+.Va output
 hook.
 .It Va queueOctets
 The number of octets queued from the
-.Dv input
+.Va input
 hook.
 .It Va queueFrames
 The number of frames queued from the
-.Dv input
+.Va input
 hook.
 .It Va startTime
 The time the last start message was received.
@@ -155,23 +159,27 @@ This message requires a single
 .Vt uint64_t
 parameter which is the number of packets to
 send before stopping.
-Node starts sending the queued packets out the output hook.
-The output hook must be connected and node must have
+Node starts sending the queued packets out the
+.Va output
+hook.
+The
+.Va output
+hook must be connected and node must have
 interface configured.
 .It Dv NGM_SOURCE_STOP Pq Ic stop
 Stops the node if it is active.
 .It Dv NGM_SOURCE_CLR_DATA Pq Ic clrdata
 Clears the packets queued from the
-.Dv input
+.Va input
 hook.
 .It Dv NGM_SOURCE_SETIFACE Pq Ic setiface
-This message requires a string argument - name of the interface
-to be configured.
+This message requires the name of the interface
+to be configured as an argument.
 .El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message, when all hooks has been disconnected, or when the
+control message, when all hooks have been disconnected, or when the
 .Va output
 hook has been disconnected.
 .Sh EXAMPLES
@@ -186,11 +194,11 @@ For example, these commands
 load the
 .Nm ng_ether
 module and attach the
-.Dv output
+.Va output
 hook of a new
 .Nm source
 node to
-.Dv orphans
+.Va orphans
 hook of the
 .Li bge0:
 .Nm ng_ether
@@ -218,7 +226,7 @@ can be used to generate these packets:
 To feed the output of the above TCL script to the
 .Nm source
 node's
-.Dv input
+.Va input
 hook via
 .Xr nghook 8 :
 .Pp
@@ -232,7 +240,7 @@ Args:   { queueOctets=64 queueFrames=1 }
 .Ed
 .Pp
 Send as many packets as required out the
-.Dv output
+.Va output
 hook:
 .Pp
 .Dl "ngctl msg bge0:orphans start 16"
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index 4ebaa14..ed71503 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -38,7 +38,7 @@ The
 .Nm
 bridge driver allows the generic audio driver
 .Xr sound 4
-to attach to the SoundBlaster Live! and Audigy audio cards.
+to attach to the SoundBlaster Live!\& and Audigy audio cards.
 .Pp
 Digital output is supported by default.
 .Sh HARDWARE
@@ -48,7 +48,7 @@ driver supports the following sound cards:
 .Pp
 .Bl -bullet -compact
 .It
-Creative SoundBlaster Live! (EMU10K1 Chipset)
+Creative SoundBlaster Live!\& (EMU10K1 Chipset)
 .It
 Creative SoundBlaster Audigy (EMU10K2 Chipset)
 .El
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 8807b14..272eee7 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -65,7 +65,7 @@ ESS Technology Maestro3
 .El
 .Sh DIAGNOSTICS
 The hardware volume control buttons can be connected to two different pin
-sets(GPIO or GD) on the chip, depending on the manufacturer.
+sets (GPIO or GD) on the chip, depending on the manufacturer.
 The driver has no way of determining this configuration, so a hint may be
 used to override the default guess.
 The default setting for hardware volume control assumes that GD pins
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index c556185..8a27de2 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -94,10 +94,14 @@ can be calculated by the macro
 defined in
 .In sys/un.h .
 The
-.Ar sun_path
-field must be terminated by a NUL character to be used with
+.Va sun_path
+field must be terminated by a
+.Dv NUL
+character to be used with
 .Fn SUN_LEN ,
-but the terminating NUL is
+but the terminating
+.Dv NUL
+is
 .Em not
 part of the address.
 .Pp
@@ -195,7 +199,6 @@ or
 .Xr listen 2 )
 under different effective credentials.
 .Pp
-
 .Tn UNIX
 domain sockets support a number of socket options which can be set with
 .Xr setsockopt 2
@@ -207,13 +210,21 @@ This option may be enabled on a
 .Dv SOCK_DGRAM
 or a
 .Dv SOCK_STREAM
-socket.  This option provides a mechanism for the receiver to
+socket.
+This option provides a mechanism for the receiver to
 receive the credentials of the process as a
 .Xr recvmsg 2
-control message.  The msg_control field in the msghdr structure points
-to a buffer that contains a cmsghdr structure followed by a variable
-length sockcred structure, defined in
-.Pa \*[Lt]sys/socket.h\*[Gt]
+control message.
+The
+.Va msg_control
+field in the
+.Vt msghdr
+structure points to a buffer that contains a
+.Vt cmsghdr
+structure followed by a variable length
+.Vt sockcred
+structure, defined in
+.In sys/socket.h
 as follows:
 .Bd -literal
 struct sockcred {
@@ -228,22 +239,27 @@ struct sockcred {
 .Pp
 The
 .Fn SOCKCREDSIZE
-macro computes the size of the sockcred structure for a specified number
+macro computes the size of the
+.Vt sockcred
+structure for a specified number
 of groups.
-The cmsghdr fields have the following values:
+The
+.Vt cmsghdr
+fields have the following values:
 .Bd -literal
 cmsg_len = sizeof(struct cmsghdr) + SOCKCREDSIZE(ngroups)
 cmsg_level = SOL_SOCKET
 cmsg_type = SCM_CREDS
 .Ed
 .It Dv LOCAL_CONNWAIT
-Used with 
+Used with
 .Dv SOCK_STREAM
 sockets, this option causes the
 .Xr connect 2
 function to block until
 .Xr accept 2
 has been called on the listening socket.
+.El
 .Sh SEE ALSO
 .Xr socket 2 ,
 .Xr intro 4
diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4
index cb95a87..963aaf9 100644
--- a/share/man/man4/witness.4
+++ b/share/man/man4/witness.4
@@ -93,9 +93,10 @@ set via the read-only sysctl
 .Pp
 The sysctl
 .Va debug.witness.watch
-specifies the level of witness involvment in the system.  A value of
-1 specifies that witness is enabled.  A value of 0 specifies that
-witness is disabled.  This sysctl can be written to in order to
+specifies the level of witness involvment in the system.
+A value of 1 specifies that witness is enabled.
+A value of 0 specifies that witness is disabled.
+This sysctl can be written to in order to
 disable witness, however it may not be used to enable witness.
 .Va debug.witness.watch
 can be set via