Attachment 124530 Details for Bug 168016 – file.diff

[patch] file.diff

file.diff (text/plain), 35.94 KB, created by Nobuyuki Koganemaru on 2012-05-17 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nobuyuki Koganemaru

Created: 2012-05-17 16:40:01 UTC

Size: 35.94 KB

patch

obsolete

>diff -u src/sbin/atacontrol/atacontrol.8.orig src/sbin/atacontrol/atacontrol.8
>--- src/sbin/atacontrol/atacontrol.8.orig	2012-05-17 01:53:25.000000000 +0900
>+++ src/sbin/atacontrol/atacontrol.8	2012-05-17 03:16:27.000000000 +0900
>@@ -367,8 +367,8 @@
> or syslog logging on it as the disk will be worn out spinning down and
> up all the time.
> .Sh SEE ALSO
>-.Xr ata 4
>-.Xr cam 4
>+.Xr ata 4 ,
>+.Xr cam 4 ,
> .Xr camcontrol 8
> .Sh HISTORY
> The
>diff -u src/sys/boot/forth/beastie.4th.8.orig src/sys/boot/forth/beastie.4th.8
>--- src/sys/boot/forth/beastie.4th.8.orig	2012-05-17 03:16:38.000000000 +0900
>+++ src/sys/boot/forth/beastie.4th.8	2012-05-17 03:16:56.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm beastie.4th
>-.Nd FreeBSD ASCII art boot module.
>+.Nd FreeBSD ASCII art boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/sys/boot/forth/brand.4th.8.orig src/sys/boot/forth/brand.4th.8
>--- src/sys/boot/forth/brand.4th.8.orig	2012-05-17 03:17:07.000000000 +0900
>+++ src/sys/boot/forth/brand.4th.8	2012-05-17 03:17:22.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm brand.4th
>-.Nd FreeBSD ASCII art boot module.
>+.Nd FreeBSD ASCII art boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/usr.sbin/burncd/burncd.8.orig src/usr.sbin/burncd/burncd.8
>--- src/usr.sbin/burncd/burncd.8.orig	2012-05-17 03:17:32.000000000 +0900
>+++ src/usr.sbin/burncd/burncd.8	2012-05-17 03:17:55.000000000 +0900
>@@ -240,7 +240,7 @@
> is compiled into the kernel, then
> .Xr cdrecord 1 ,
> available in the
>-.Fx
>+.Fx .
> Ports Collection as part of the
> .Pa sysutils/cdrtools
> port, must be used instead.
>diff -u src/sbin/camcontrol/camcontrol.8.orig src/sbin/camcontrol/camcontrol.8
>--- src/sbin/camcontrol/camcontrol.8.orig	2012-05-17 03:18:08.000000000 +0900
>+++ src/sbin/camcontrol/camcontrol.8	2012-05-17 03:20:07.000000000 +0900
>@@ -568,7 +568,7 @@
> .Bl -tag -width 17n
> .It Fl a Ar cmd Op args
> This specifies the content of 12 ATA Command Block registers (command,
>-features, lba_low, lba_mid, lba_high, device, lba_low_exp, lba_mid_exp.
>+features, lba_low, lba_mid, lba_high, device, lba_low_exp, lba_mid_exp,
> lba_high_exp, features_exp, sector_count, sector_count_exp).
> .It Fl c Ar cmd Op args
> This specifies the SCSI CDB.
>@@ -1059,7 +1059,7 @@
> .It Ic idle
> Put ATA device into IDLE state. Optional parameter
> .Pq Fl t
>-specifies automatic standby timer value in seconds. Value 0 disables timer.
>+specifies automatic idle timer value in seconds. Value 0 disables timer.
> .It Ic standby
> Put ATA device into STANDBY state. Optional parameter
> .Pq Fl t
>@@ -1106,7 +1106,7 @@
> Run in simulation mode.
> Packet sizes that will be sent are shown, but no actual packet is sent to the
> device.
>-No confimation is asked in simulation mode.
>+No confirmation is asked in simulation mode.
> .It Fl v
> Besides showing sense information in case of a failure, the verbose option
> causes
>diff -u src/sys/boot/forth/check-password.4th.8.orig src/sys/boot/forth/check-password.4th.8
>--- src/sys/boot/forth/check-password.4th.8.orig	2012-05-17 03:20:19.000000000 +0900
>+++ src/sys/boot/forth/check-password.4th.8	2012-05-17 03:20:26.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm check-password.4th
>-.Nd FreeBSD password-checking boot module.
>+.Nd FreeBSD password-checking boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/sys/boot/forth/color.4th.8.orig src/sys/boot/forth/color.4th.8
>--- src/sys/boot/forth/color.4th.8.orig	2012-05-17 03:20:42.000000000 +0900
>+++ src/sys/boot/forth/color.4th.8	2012-05-17 03:20:55.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm color.4th
>-.Nd FreeBSD color-detection boot module.
>+.Nd FreeBSD color-detection boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/usr.sbin/cpucontrol/cpucontrol.8.orig src/usr.sbin/cpucontrol/cpucontrol.8
>--- src/usr.sbin/cpucontrol/cpucontrol.8.orig	2012-05-17 03:21:08.000000000 +0900
>+++ src/usr.sbin/cpucontrol/cpucontrol.8	2012-05-17 03:21:23.000000000 +0900
>@@ -31,7 +31,7 @@
> .Nm cpucontrol
> .Nd control utility for the
> .Xr cpuctl 4
>-device.
>+device
> .Sh SYNOPSIS
> .Nm
> .Op Fl vh
>diff -u src/usr.sbin/ctladm/ctladm.8.orig src/usr.sbin/ctladm/ctladm.8
>--- src/usr.sbin/ctladm/ctladm.8.orig	2012-05-17 03:21:36.000000000 +0900
>+++ src/usr.sbin/ctladm/ctladm.8	2012-05-17 03:23:33.000000000 +0900
>@@ -542,7 +542,7 @@
> Because this command uses the ioctl port, it will only work when the FETDs
> (Front End Target Drivers) are enabled.
> This command is the equivalent of doing a REPORT LUNS on one LUN and then
>-and then an INQUIRY on each LUN in the system.
>+an INQUIRY on each LUN in the system.
> .It Ic delay
> Delay commands at the given location.  There are two places where commands
> may be delayed currently: before data is transferred
>@@ -749,7 +749,7 @@
> As a general rule, the WWNN should be the same across all ports on the
> system.
> .It Fl W Ar wwpn
>-Set the World Wide Node Name for the given port.
>+Set the World Wide Port Name for the given port.
> The
> .Fl n
> argument must be specified, since this is only possible to implement on a
>@@ -939,10 +939,10 @@
> .Pa src/usr.sbin/ctladm/src/usr.sbin/ctladm/ctladm.8
> as the backing store, and specify the
> .Tn SCSI
>-VPD page 0x80 and 0x83 serial number (
>-.Fl S)
>-and device ID (
>-.Fl d).
>+VPD page 0x80 and 0x83 serial number
>+.Fl ( S )
>+and device ID
>+.Fl ( d ) .
> .Pp
> .Dl ctladm remove -b block -l 12
> .Pp
>diff -u src/usr.bin/ctlstat/ctlstat.8.orig src/usr.bin/ctlstat/ctlstat.8
>--- src/usr.bin/ctlstat/ctlstat.8.orig	2012-05-17 03:23:49.000000000 +0900
>+++ src/usr.bin/ctlstat/ctlstat.8	2012-05-17 03:24:06.000000000 +0900
>@@ -86,8 +86,8 @@
> No statistics are computed in this mode, only raw numbers are displayed.
> .It Fl l Ar lun
> Request statistics for the specified LUN.
>-This option is incompatible with total (
>-.Fl t )
>+This option is incompatible with total
>+.Fl ( t )
> mode.
> .It Fl n Ar numdevs
> Display statistics for this many devices.
>diff -u src/sys/boot/forth/delay.4th.8.orig src/sys/boot/forth/delay.4th.8
>--- src/sys/boot/forth/delay.4th.8.orig	2012-05-17 03:24:16.000000000 +0900
>+++ src/sys/boot/forth/delay.4th.8	2012-05-17 03:24:28.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm delay.4th
>-.Nd FreeBSD debugging boot module.
>+.Nd FreeBSD debugging boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/sbin/etherswitchcfg/etherswitchcfg.8.orig src/sbin/etherswitchcfg/etherswitchcfg.8
>--- src/sbin/etherswitchcfg/etherswitchcfg.8.orig	2012-05-17 03:28:50.000000000 +0900
>+++ src/sbin/etherswitchcfg/etherswitchcfg.8	2012-05-17 03:29:27.000000000 +0900
>@@ -71,7 +71,8 @@
> Specifies a list of media options for a port. See
> .Xr ifconfig 8
> for details on
>-.Ar media and
>+.Ar media
>+and
> .Ar mediaopt .
> .El
> .Ss reg
>diff -u src/usr.sbin/flowctl/flowctl.8.orig src/usr.sbin/flowctl/flowctl.8
>--- src/usr.sbin/flowctl/flowctl.8.orig	2012-05-17 03:34:08.000000000 +0900
>+++ src/usr.sbin/flowctl/flowctl.8	2012-05-17 03:34:42.000000000 +0900
>@@ -60,7 +60,7 @@
> .Dq "show ip cache flow"
> command of a Cisco router.
> It dumps the contents of the flow cache in Cisco-like format.
>-Specifing either
>+Specifying either
> .Cm ipv4
> or
> .Cm ipv6
>diff -u src/usr.sbin/freebsd-update/freebsd-update.8.orig src/usr.sbin/freebsd-update/freebsd-update.8
>--- src/usr.sbin/freebsd-update/freebsd-update.8.orig	2012-05-17 03:34:52.000000000 +0900
>+++ src/usr.sbin/freebsd-update/freebsd-update.8	2012-05-17 03:35:27.000000000 +0900
>@@ -62,7 +62,7 @@
> .Fx
> 9.0-CURRENT.
> .Sh OPTIONS
>-The following options are supported
>+The following options are supported:
> .Bl -tag -width "-f conffile"
> .It Fl b Ar basedir
> Operate on a system mounted at
>diff -u src/sbin/geom/class/eli/geli.8.orig src/sbin/geom/class/eli/geli.8
>--- src/sbin/geom/class/eli/geli.8.orig	2012-05-17 03:35:41.000000000 +0900
>+++ src/sbin/geom/class/eli/geli.8	2012-05-17 03:35:51.000000000 +0900
>@@ -333,7 +333,7 @@
> Consult the
> .Sx HISTORY
> section to find which metadata version is supported by which FreeBSD version.
>-Note that using older metadata version may limit numer of features available.
>+Note that using older metadata version may limit number of features available.
> .El
> .It Cm attach
> Attach the given provider.
>diff -u src/sbin/geom/class/multipath/gmultipath.8.orig src/sbin/geom/class/multipath/gmultipath.8
>--- src/sbin/geom/class/multipath/gmultipath.8.orig	2012-05-17 03:36:00.000000000 +0900
>+++ src/sbin/geom/class/multipath/gmultipath.8	2012-05-17 03:37:14.000000000 +0900
>@@ -135,7 +135,7 @@
> method.
> Label the first given provider with on-disk metadata using the specified
> .Ar name .
>-The rest of given providers will be retasted to detect these metadata.
>+The rest of given providers will be retested to detect these metadata.
> It reliably protects against specifying unrelated providers.
> Providers with no matching metadata detected will not be added to the device.
> .Pp
>diff -u src/sbin/geom/class/part/gpart.8.orig src/sbin/geom/class/part/gpart.8
>--- src/sbin/geom/class/part/gpart.8.orig	2012-05-17 03:37:29.000000000 +0900
>+++ src/sbin/geom/class/part/gpart.8	2012-05-17 03:38:31.000000000 +0900
>@@ -650,7 +650,7 @@
> for GPT.
> .It Cm ms-ldm-metadata
> A partition that contains Logical Disk Manager (LDM) database.
>-The scheme-specifig type is
>+The scheme-specific type is
> .Qq Li "!5808c8aa-7e8f-42e0-85d2-e1e90434cfb3"
> for GPT.
> .El
>@@ -971,7 +971,7 @@
> .Sx "PARTITION TYPES"
> section).
> If this variable set to 1 each component of the mirrored volume will be
>-present as independet partition.
>+present as independent partition.
> .Em NOTE :
> This may break a mirrored volume and lead to data damage.
> .El
>diff -u src/sbin/geom/class/raid/graid.8.orig src/sbin/geom/class/raid/graid.8
>--- src/sbin/geom/class/raid/graid.8.orig	2012-05-17 03:38:39.000000000 +0900
>+++ src/sbin/geom/class/raid/graid.8	2012-05-17 03:38:50.000000000 +0900
>@@ -294,7 +294,7 @@
> .Nm RAID
> GEOM class.
> .It Va kern.geom.raid.idle_threshold : No 1000000
>-Time in microseconds to consider a volume idle for rebuild puroses.
>+Time in microseconds to consider a volume idle for rebuild purpose.
> .It Va kern.geom.raid.name_format : No 0
> Providers name format: 0 -- raid/r{num}, 1 -- raid/{label}.
> .It Va kern.geom.raid.read_err_thresh : No 10
>diff -u src/sbin/inum/gvinum.8,v.orig src/sbin/inum/gvinum.8,v
>--- src/sbin/inum/gvinum.8,v.orig	2012-05-17 03:38:58.000000000 +0900
>+++ src/sbin/inum/gvinum.8,v	2012-05-17 03:42:17.000000000 +0900
>@@ -149,7 +149,7 @@
> .It Ic raid5 Oo Fl fv Oc Oo Fl s Ar stripesize Oc Oo Fl n Ar name Oc Ar drives
> Create a RAID-5 volume from the specified drives.
> If no name is specified,a unique name will be set by
>-.Ic gvinum.
>+.Ic gvinum .
> This organization requires at least three drives.
> .It Ic rename Oo Fl r Oc Ar drive | subdisk | plex | volume newname
> Change the name of the specified object.
>@@ -202,8 +202,9 @@
> if no parameters are specified.
> .It Ic stripe Oo Fl fv Oc Oo Fl n Ar name Oc Ar drives
> Create a striped volume from the specified drives. If no name is specified,
>-a unique name will be set by Ic gvinum. This organization requires at least two
>-drives.
>+a unique name will be set by
>+.Ic gvinum .
>+This organization requires at least two drives.
> .El
> .Sh DESCRIPTION
> The
>@@ -278,7 +279,8 @@
> .El
> .Sh EXAMPLES
> To create a mirror on disks /dev/ad1 and /dev/ad2, create a filesystem, mount,
>-unmount and then stop Ic gvinum:
>+unmount and then stop
>+.Ic gvinum :
> .Pp
> .Dl "gvinum mirror /dev/ad1 /dev/ad2"
> .Dl "newfs /dev/gvinum/gvinumvolume0"
>diff -u src/sbin/geom/classirstor/gvirstor.8,v.orig src/sbin/geom/classirstor/gvirstor.8,v
>--- src/sbin/geom/classirstor/gvirstor.8,v.orig	2012-05-17 03:42:29.000000000 +0900
>+++ src/sbin/geom/classirstor/gvirstor.8,v	2012-05-17 03:43:13.000000000 +0900
>@@ -113,7 +113,7 @@
> The specified virstor device must exist and be active
> .Pq i.e. module loaded, device present in Pa /dev .
> This action can be safely performed while the virstor device is in use
>-.Pq Qo hot Qc operation
>+.Pq Qo hot Qc operation .
> .It Cm remove
> Removes components from existing virtual device with the given
> .Ar name .
>@@ -268,7 +268,8 @@
> components will always remain constant during their existence.
> For alternative ways to implement virtual or resizable file systems see
> .Xr zfs 1M ,
>-.Xr gconcat 8 and
>+.Xr gconcat 8
>+and
> .Xr growfs 8 .
> .Pp
> Note that
>diff -u src/sbin/hastctl/hastctl.8.orig src/sbin/hastctl/hastctl.8
>--- src/sbin/hastctl/hastctl.8.orig	2012-05-17 04:21:06.000000000 +0900
>+++ src/sbin/hastctl/hastctl.8	2012-05-17 04:21:26.000000000 +0900
>@@ -211,7 +211,7 @@
> .Xr ggatel 8 ,
> .Xr hastd 8 ,
> .Xr mount 8 ,
>-.Xr newfs 8 .
>+.Xr newfs 8
> .Sh AUTHORS
> The
> .Nm
>diff -u src/sbin/hastd/hastd.8.orig src/sbin/hastd/hastd.8
>--- src/sbin/hastd/hastd.8.orig	2012-05-17 04:21:34.000000000 +0900
>+++ src/sbin/hastd/hastd.8	2012-05-17 04:21:50.000000000 +0900
>@@ -223,7 +223,7 @@
> .Xr hastctl 8 ,
> .Xr mount 8 ,
> .Xr newfs 8 ,
>-.Xr g_bio 9 .
>+.Xr g_bio 9
> .Sh AUTHORS
> The
> .Nm
>diff -u src/contrib/amd/hlfsd/hlfsd.8.orig src/contrib/amd/hlfsd/hlfsd.8
>--- src/contrib/amd/hlfsd/hlfsd.8.orig	2012-05-17 04:22:04.000000000 +0900
>+++ src/contrib/amd/hlfsd/hlfsd.8	2012-05-17 04:23:08.000000000 +0900
>@@ -267,7 +267,7 @@
> or mis-delivery of mail.
> The option is ignored on systems that can turn
> off the attribute-cache.
>-.It Fl D Ar log-options
>+.It Fl D Ar debug-options
> Select from a variety of debugging options.
> Prefixing an
> option with the string
>diff -u src/usr.sbin/i2c/i2c.8.orig src/usr.sbin/i2c/i2c.8
>--- src/usr.sbin/i2c/i2c.8.orig	2012-05-17 04:23:22.000000000 +0900
>+++ src/usr.sbin/i2c/i2c.8	2012-05-17 04:23:41.000000000 +0900
>@@ -88,7 +88,7 @@
> .It Fl s
> scan the bus for devices.
> .It Fl v
>-be verbose
>+be verbose.
> .It Fl w Ar 0|8|16
> device addressing width (in bits).
> .El
>diff -u src/sbin/ifconfig/ifconfig.8.orig src/sbin/ifconfig/ifconfig.8
>--- src/sbin/ifconfig/ifconfig.8.orig	2012-05-17 04:24:00.000000000 +0900
>+++ src/sbin/ifconfig/ifconfig.8	2012-05-17 04:25:53.000000000 +0900
>@@ -708,13 +708,13 @@
> .Cm sta ,
> .Cm ahdemo
> (or
>-.Cm adhoc-demo ),
>+.Cm adhoc-demo ) ,
> .Cm ibss ,
> (or
>-.Cm adhoc ),
>+.Cm adhoc ) ,
> .Cm ap ,
> (or
>-.Cm hostap ),
>+.Cm hostap ) ,
> .Cm wds ,
> .Cm tdma ,
> .Cm mesh ,
>@@ -2020,7 +2020,7 @@
> discover a path to us.
> .It Cm PROACTIVE
> Send broadcast path requests every two seconds and every node must reply with
>-with a path reply even if it already has a path to this root mesh station.
>+a path reply even if it already has a path to this root mesh station.
> .It Cm RANN
> Send broadcast root announcement (RANN) frames.
> Nodes on the mesh without a path to this root mesh station with try to
>@@ -2378,7 +2378,8 @@
> .It Cm grekey Ar key
> Configure the GRE key to be used for outgoing packets.
> Note that
>-.Xr gre 4 will always accept GRE packets with invalid or absent keys.
>+.Xr gre 4
>+will always accept GRE packets with invalid or absent keys.
> This command will result in a four byte MTU reduction on the interface.
> .El
> .Pp
>@@ -2590,7 +2591,7 @@
> printed.
> For example, the values of 802.11 WEP keys and
> .Xr carp 4
>-passphrases will be printed, if accessible to the current user.
>+passphrase will be printed, if accessible to the current user.
> This information is not printed by default, as it may be considered
> sensitive.
> .Pp
>diff -u src/contrib/ipfilter/man/ipf.8.orig src/contrib/ipfilter/man/ipf.8
>--- src/contrib/ipfilter/man/ipf.8.orig	2012-05-17 04:26:11.000000000 +0900
>+++ src/contrib/ipfilter/man/ipf.8	2012-05-17 04:27:51.000000000 +0900
>@@ -42,11 +42,11 @@
> .TP
> .B \-c <language>
> This option causes \fBipf\fP to generate output files for a compiler that
>-supports \fBlanguage\fI.  At present, the only target language supported is
>-\fBC\fB (-cc) for which two files - \fBip_rules.c\fP
>+supports \fBlanguage\fP.  At present, the only target language supported is
>+\fBC\fP (-cc) for which two files - \fBip_rules.c\fP
> and \fBip_rules.h\fP are generated in the \fBCURRENT DIRECTORY\fP when
> \fBipf\fP is being run.  These files can be used with the
>-\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticlly into
>+\fBIPFILTER_COMPILED\fP kernel option to build filter rules statically into
> the kernel.
> .TP
> .B \-d
>diff -u src/sbin/ipfw/ipfw.8.orig src/sbin/ipfw/ipfw.8
>--- src/sbin/ipfw/ipfw.8.orig	2012-05-17 04:28:12.000000000 +0900
>+++ src/sbin/ipfw/ipfw.8	2012-05-17 04:35:09.000000000 +0900
>@@ -7,7 +7,7 @@
> .Sh NAME
> .Nm ipfw
> .Nd User interface for firewall, traffic shaper, packet scheduler,
>-in-kernel NAT.
>+in-kernel NAT
> .Sh SYNOPSIS
> .Ss FIREWALL CONFIGURATION
> .Nm
>@@ -387,7 +387,7 @@
> for the place of invocation (e.g.\& trying to match a MAC header within
> .Cm ip_input
> or
>-.Cm ip6_input ),
>+.Cm ip6_input ) ,
> the match pattern will not match, but a
> .Cm not
> operator in front of such patterns
>@@ -843,7 +843,7 @@
> and
> .Cm return
> actions don't do any jumps and simply go to the next rule if memory
>-can't be allocated or stack overflowed/undeflowed.
>+can't be allocated or stack overflowed/underflowed.
> .Pp
> Internally stack for rule numbers is implemented using
> .Xr mbuf_tags 9
>@@ -914,7 +914,7 @@
> where
> .Ar code
> is a number from 0, 1, 3 or 4, or one of these aliases:
>-.Cm no-route, admin-prohib, address
>+.Cm no-route , admin-prohib , address
> or
> .Cm port .
> The search terminates.
>@@ -1525,7 +1525,7 @@
> .Cm port numbers
> (i.e., one or more comma-separated single values or ranges).
> You can use symbolic names for known values such as
>-.Em vlan , ipv4, ipv6 .
>+.Em vlan , ipv4 , ipv6 .
> Values can be entered as decimal or hexadecimal (if prefixed by 0x),
> and they are always printed as hexadecimal (unless the
> .Cm -N
>@@ -1781,11 +1781,11 @@
> The
> .Cm tablearg
> argument can be used with the following actions:
>-.Cm nat, pipe , queue, divert, tee, netgraph, ngtee, fwd, skipto, setfib,
>+.Cm nat, pipe , queue , divert , tee , netgraph , ngtee , fwd , skipto , setfib ,
> action parameters:
>-.Cm tag, untag,
>+.Cm tag , untag ,
> rule options:
>-.Cm limit, tagged.
>+.Cm limit , tagged .
> .Pp
> When used with
> .Cm fwd
>@@ -1883,7 +1883,7 @@
> are used here only to denote the initial match addresses, but they
> are completely equivalent afterwards).
> Dynamic rules will be checked at the first
>-.Cm check-state, keep-state
>+.Cm check-state , keep-state
> or
> .Cm limit
> occurrence, and the action performed upon a match will be the same
>@@ -2713,7 +2713,7 @@
> Global tracking is disabled
> .It Cm >1
> Enables tracking, the maximum number of addresses tracked for each
>-association is limited to this value
>+association is limited to this value.
> .El
> .Pp
> This variable is fully dynamic, the new value will be adopted for all newly
>@@ -2789,7 +2789,8 @@
> .It Va net.inet.ip.fw.default_rule : No 65535
> The default rule number (read-only).
> By the design of
>-.Nm , the default rule is the last one, so its number
>+.Nm ,
>+the default rule is the last one, so its number
> can also serve as the highest number allowed for a rule.
> .It Va net.inet.ip.fw.dyn_buckets : No 256
> The number of buckets in the hash table for dynamic rules.
>diff -u src/contrib/ipfilter/man/ipmon.8.orig src/contrib/ipfilter/man/ipmon.8
>--- src/contrib/ipfilter/man/ipmon.8.orig	2012-05-17 04:35:46.000000000 +0900
>+++ src/contrib/ipfilter/man/ipmon.8	2012-05-17 04:39:16.000000000 +0900
>@@ -49,7 +49,7 @@
> 4. The group and rule number of the rule, e.g., \fB@0:17\fP. These can be
> viewed with \fBipfstat -n\fP.
> .LP
>-5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fB\fP for a short
>+5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fBS\fP for a short
> packet, \fBn\fP did not match any rules or \fBL\fP for a log rule.
> .LP
> 6. The addresses.
>@@ -131,7 +131,7 @@
> .TP
> .B \-P <pidfile>
> Write the pid of the ipmon process to a file.  By default this is
>-\fI//etc/opt/ipf/ipmon.pid\fP (Solaris), \fI/var/run/ipmon.pid\fP (44BSD
>+\fI/etc/opt/ipf/ipmon.pid\fP (Solaris), \fI/var/run/ipmon.pid\fP (44BSD
> or later) or \fI/etc/ipmon.pid\fP for all others.
> .TP
> .B \-s
>diff -u src/contrib/ipfilter/man/ippool.8.orig src/contrib/ipfilter/man/ippool.8
>--- src/contrib/ipfilter/man/ippool.8.orig	2012-05-17 04:39:23.000000000 +0900
>+++ src/contrib/ipfilter/man/ippool.8	2012-05-17 04:39:36.000000000 +0900
>@@ -108,7 +108,7 @@
> type pools.
> .TP
> .B -t <type>
>-Sets the type of pool being defined.  Myst be one of
>+Sets the type of pool being defined.  Must be one of
> .B tree,
> .B hash,
> .B group-map.
>diff -u src/usr.sbin/jail/jail.8.orig src/usr.sbin/jail/jail.8
>--- src/usr.sbin/jail/jail.8.orig	2012-05-17 04:39:48.000000000 +0900
>+++ src/usr.sbin/jail/jail.8	2012-05-17 04:41:03.000000000 +0900
>@@ -255,7 +255,7 @@
> .Dq true
> and
> .Dq false .
>-Other partameters may have more than one value, specified as a
>+Other parameters may have more than one value, specified as a
> comma-separated list or with
> .Dq +=
> in the configuration file (see
>@@ -269,7 +269,7 @@
> can be seen with
> .Xr jls 8 ,
> and can (usually) be changed with
>-.Dq Nm Fl m.
>+.Dq Nm Fl m .
> Then there are pseudo-parameters that are only used by
> .Nm
> itself.
>@@ -580,7 +580,7 @@
> command lines that are run in either the system or prison environment.
> They may be given multiple values, which run would the specified
> commands in sequence.
>-All commands must succed (return a zero exit status), or the jail will
>+All commands must succeed (return a zero exit status), or the jail will
> not be created or removed.
> .Pp
> The pseudo-parameters are:
>@@ -657,7 +657,8 @@
> after sending them a
> .Dv SIGTERM
> signal (which happens after the
>-.Va exec.stop commands have completed).
>+.Va exec.stop
>+commands have completed).
> After this many seconds have passed, the prison will be removed, which
> will kill any remaining processes.
> If this is set to zero, no
>diff -u src/sys/boot/common/loader.8.orig src/sys/boot/common/loader.8
>--- src/sys/boot/common/loader.8.orig	2012-05-17 04:41:16.000000000 +0900
>+++ src/sys/boot/common/loader.8	2012-05-17 04:41:27.000000000 +0900
>@@ -423,7 +423,7 @@
> Defines the base i/o port used to access console UART
> (i386 and amd64 only).
> If the variable is not set, its assumed value is 0x3F8, which
>-corresponds to PC port COM1, unless overriden by
>+corresponds to PC port COM1, unless overridden by
> .Va BOOT_COMCONSOLE_PORT
> variable during the compilation of
> .Nm .
>diff -u src/sys/boot/forth/menu.4th.8.orig src/sys/boot/forth/menu.4th.8
>--- src/sys/boot/forth/menu.4th.8.orig	2012-05-17 04:41:50.000000000 +0900
>+++ src/sys/boot/forth/menu.4th.8	2012-05-17 04:41:55.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm menu.4th
>-.Nd FreeBSD dynamic menu boot module.
>+.Nd FreeBSD dynamic menu boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/sbin/mount/mount.8.orig src/sbin/mount/mount.8
>--- src/sbin/mount/mount.8.orig	2012-05-17 04:42:04.000000000 +0900
>+++ src/sbin/mount/mount.8	2012-05-17 04:42:29.000000000 +0900
>@@ -448,7 +448,7 @@
> .Cm smbfs ,
> .Cm udf ,
> and
>-.Cm unionfs ,
>+.Cm unionfs .
> .Nm
> will not call
> .Xr nmount 2
>diff -u src/sbin/natd/natd.8.orig src/sbin/natd/natd.8
>--- src/sbin/natd/natd.8.orig	2012-05-17 04:42:40.000000000 +0900
>+++ src/sbin/natd/natd.8	2012-05-17 04:42:50.000000000 +0900
>@@ -787,7 +787,7 @@
> .Pp
> Here the packet from internal network to Internet goes out via
> .Ql sis0
>-(rule number 2000) and gets catched by the
>+(rule number 2000) and gets caught by the
> .Ic globalport
> socket (3000).
> After that, either a match is found in a translation table
>diff -u src/usr.sbin/wpa/ndis_ents/ndis_events.8,v.orig src/usr.sbin/wpa/ndis_ents/ndis_events.8,v
>--- src/usr.sbin/wpa/ndis_ents/ndis_events.8,v.orig	2012-05-17 04:42:56.000000000 +0900
>+++ src/usr.sbin/wpa/ndis_ents/ndis_events.8,v	2012-05-17 04:43:11.000000000 +0900
>@@ -71,7 +71,7 @@
> interface, it transmits it via UDP packet on the loopback interface,
> where
> .Xr wpa_supplicant 8
>-is presumeably listening.
>+is presumably listening.
> The standard
> .Xr wpa_supplicant 8
> distribution includes its own version of this utility for use with
>diff -u src/usr.sbin/nfsroke/nfsrevoke.8,v.orig src/usr.sbin/nfsroke/nfsrevoke.8,v
>--- src/usr.sbin/nfsroke/nfsrevoke.8,v.orig	2012-05-17 04:43:22.000000000 +0900
>+++ src/usr.sbin/nfsroke/nfsrevoke.8,v	2012-05-17 04:43:37.000000000 +0900
>@@ -37,7 +37,7 @@
> .Ar ClientId
> .Sh DESCRIPTION
> .Nm
>-This command is used by a system administrator to revoke a client's access
>+command is used by a system administrator to revoke a client's access
> to the NFS Version 4 server. All Open/Lock state held by the client will
> be released.
> After revocation, the client will no longer be able to use state on the server
>diff -u src/usr.sbin/ntp/doc/ntp-keygen.8.orig src/usr.sbin/ntp/doc/ntp-keygen.8
>--- src/usr.sbin/ntp/doc/ntp-keygen.8.orig	2012-05-17 04:43:52.000000000 +0900
>+++ src/usr.sbin/ntp/doc/ntp-keygen.8	2012-05-17 04:51:18.000000000 +0900
>@@ -201,7 +201,7 @@
> Each cryptographic configuration involves selection of a signature scheme
> and identification scheme, called a cryptotype,
> as explained in the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> The default cryptotype uses RSA encryption, MD5 message digest
>@@ -290,7 +290,7 @@
> Trusted hosts prove identity using values provided by the TA,
> while the remaining hosts prove identity using values provided
> by a trusted host and certificate trails that end on that host.
>-The name of a trusted host is also the name of its sugroup
>+The name of a trusted host is also the name of its su group
> and also the subject and issuer name on its trusted certificate.
> The TA is not necessarily a trusted host in this sense, but often is.
> .Pp
>@@ -411,7 +411,7 @@
> to her clients.
> It doesn't matter which client key file goes to alice,
> since they all work the same way.
>-Alice copies the client key file to all of her cliens.
>+Alice copies the client key file to all of her clients.
> On client bob install a soft link from generic
> .Pa ntpkey_mvkey_ Ns Ar bob
> to the client key file.
>@@ -450,7 +450,7 @@
> Generate parameters for the IFF identification scheme,
> obsoleting any that may exist.
> .It Fl i Ar name
>-Set the suject name to
>+Set the subject name to
> .Ar name .
> This is used as the subject field in certificates
> and in the file name for host and sign keys.
>@@ -594,7 +594,7 @@
> and
> .Xr ntpdc 8
> utilities.
>-.Sh Bugs
>+.Sh BUGS
> It can take quite a while to generate some cryptographic values,
> from one to several minutes with modern architectures
> such as UltraSPARC and up to tens of minutes to an hour
>diff -u src/usr.sbin/ntp/doc/ntpdc.8.orig src/usr.sbin/ntp/doc/ntpdc.8
>--- src/usr.sbin/ntp/doc/ntpdc.8.orig	2012-05-17 23:38:04.000000000 +0900
>+++ src/usr.sbin/ntp/doc/ntpdc.8	2012-05-17 23:42:59.000000000 +0900
>@@ -608,7 +608,7 @@
> .It Cm monitor
> Enables the monitoring facility.
> See the
>-.Xr src/usr.sbin/ntp/doc/ntpdc.8 .
>+.Xr src/usr.sbin/ntp/doc/ntpdc.8
> program and the monlist command or further information.
> The default for this flag is enable.
> .It Cm ntp
>@@ -629,7 +629,7 @@
> .It Cm stats
> Enables the statistics facility.
> See the
>-.Sx Monitoring Options
>+.Sx Monitoring Support
> section of
> .Xr ntp.conf 5
> for further information.
>diff -u src/usr.sbin/ntp/doc/ntpq.8.orig src/usr.sbin/ntp/doc/ntpq.8
>--- src/usr.sbin/ntp/doc/ntpq.8.orig	2012-05-17 23:43:12.000000000 +0900
>+++ src/usr.sbin/ntp/doc/ntpq.8	2012-05-17 23:45:38.000000000 +0900
>@@ -32,7 +32,7 @@
> The
> .Nm
> can also obtain and print a list of peers in a common format
>-by sendingmultiple queries to the server.
>+by sending multiple queries to the server.
> .Pp
> If one or more request options is included on the command line
> when
>@@ -492,7 +492,7 @@
> billboard,
> called the tally code, shows the fate of each association
> in the clock selection process.
>-Following is a list of these characters, the pigeon used
>+Following is a list of these characters, the pidgeon used
> in the
> .Ic rv
> command, and a short explanation of the condition revealed.
>@@ -749,7 +749,7 @@
> .Sy TEST12
> check the authentication state using Autokey
> public-key cryptography, as described in the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> If
>@@ -790,7 +790,7 @@
> .Pq TEST5
> Cryptographic authentication fails.
> See the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> .It 0x020
>@@ -809,12 +809,12 @@
> .It 0x100
> .Pq TEST9
> Either the peer delay or dispersion is greater than one second, which is
>-higly unlikely unless the peer is on Mars.
>+highly unlikely unless the peer is on Mars.
> .It 0x200
> .Pq TEST10
> The autokey protocol has detected an authentication failure.
> See the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> .It 0x400
>@@ -822,7 +822,7 @@
> The autokey protocol has not verified the server or peer is proventic and
> has valid public key credentials.
> See the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> .It 0x800
>@@ -830,7 +830,7 @@
> A protocol or configuration error has occurred in the public key algorithms
> or a possible intrusion event has been detected.
> See the
>-.Sx Authentication Options
>+.Sx Authentication Commands
> section of
> .Xr ntp.conf 5 .
> .El
>diff -u src/lib/libpam/modules/pam_exec/pam_exec.8.orig src/lib/libpam/modules/pam_exec/pam_exec.8
>--- src/lib/libpam/modules/pam_exec/pam_exec.8.orig	2012-05-17 23:45:53.000000000 +0900
>+++ src/lib/libpam/modules/pam_exec/pam_exec.8	2012-05-17 23:46:11.000000000 +0900
>@@ -131,10 +131,10 @@
> .Xr pam 8 ,
> .Xr pam_sm_acct_mgmt 8 ,
> .Xr pam_sm_authenticate 8 ,
>-.Xr pam_sm_chauthtok 8,
>+.Xr pam_sm_chauthtok 8 ,
> .Xr pam_sm_close_session 8 ,
> .Xr pam_sm_open_session 8 ,
>-.Xr pam_sm_setcred 8 .
>+.Xr pam_sm_setcred 8
> .Sh AUTHORS
> The
> .Nm
>diff -u src/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8.orig src/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
>--- src/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8.orig	2012-05-17 23:46:18.000000000 +0900
>+++ src/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8	2012-05-17 23:46:50.000000000 +0900
>@@ -47,7 +47,7 @@
> .Bl -tag -width indent
> .It Fl c Ar file
> Perform an installation as directed by
>-.Ar file.
>+.Ar file .
> .El
> .Sh COMMANDS
> The
>@@ -69,7 +69,7 @@
> .It detect-laptop
> Tests to see if this system is a laptop or desktop.
> .It detect-emulation
>-Tests to see if this system is running in an emulator
>+Tests to see if this system is running in an emulator.
> .It detect-nics
> Returns a listing of the detected network cards on this system.
> .It list-components
>diff -u src/share/man/man8/picobsd.8.orig src/share/man/man8/picobsd.8
>--- src/share/man/man8/picobsd.8.orig	2012-05-17 23:47:00.000000000 +0900
>+++ src/share/man/man8/picobsd.8	2012-05-17 23:47:54.000000000 +0900
>@@ -54,7 +54,7 @@
> .Fl src ,
> .Fl init ,
> .Fl n and
>-.Fl v.
>+.Fl v .
> .Bl -tag -width indent
> .\"
> .It Fl -all_in_mfs
>@@ -94,7 +94,7 @@
> images.
> .\"
> .It Fl -iso
>-Generate an ISO image, picobsd.iso, in addition to the disk image picobsd.bin
>+Generate an ISO image, picobsd.iso, in addition to the disk image picobsd.bin.
> .\"
> .It Fl -modules
> Also build kernel modules.
>diff -u src/share/man/man8/rc.8.orig src/share/man/man8/rc.8
>--- src/share/man/man8/rc.8.orig	2012-05-17 23:48:13.000000000 +0900
>+++ src/share/man/man8/rc.8	2012-05-17 23:48:29.000000000 +0900
>@@ -253,7 +253,7 @@
> but a script can stop the boot if necessary by invoking the
> .Fn stop_boot
> function (from
>-.Xr rc.subr 8 ).
>+.Xr rc.subr 8 ) .
> .El
> .Pp
> Each script should contain
>diff -u src/usr.bin/rctl/rctl.8.orig src/usr.bin/rctl/rctl.8
>--- src/usr.bin/rctl/rctl.8.orig	2012-05-17 23:48:37.000000000 +0900
>+++ src/usr.bin/rctl/rctl.8	2012-05-17 23:48:46.000000000 +0900
>@@ -156,7 +156,7 @@
> for a list of supported signals.
> .Pp
> Not all actions are supported for all resources.
>-Attempt to add rule with action not supported by a given resouce will result
>+Attempt to add rule with action not supported by a given resource will result
> in error.
> .Pp
> Note that limiting RSS may kill the machine due to thrashing.
>diff -u src/usr.sbin/rtactl/rtadvctl.8,v.orig src/usr.sbin/rtactl/rtadvctl.8,v
>--- src/usr.sbin/rtactl/rtadvctl.8,v.orig	2012-05-17 23:48:54.000000000 +0900
>+++ src/usr.sbin/rtactl/rtadvctl.8,v	2012-05-17 23:49:08.000000000 +0900
>@@ -31,7 +31,8 @@
> .Sh NAME
> .Nm rtadvctl
> .Nd control program for
>-.Xr rtadvd 8 daemon
>+.Xr rtadvd 8
>+daemon
> .Sh SYNOPSIS
> .Nm
> .Op Fl v
>diff -u src/usr.sbin/rtad/rtadvd.8,v.orig src/usr.sbin/rtad/rtadvd.8,v
>--- src/usr.sbin/rtad/rtadvd.8,v.orig	2012-05-17 23:49:18.000000000 +0900
>+++ src/usr.sbin/rtad/rtadvd.8,v	2012-05-17 23:49:28.000000000 +0900
>@@ -140,7 +140,7 @@
> .It Fl p
> Specify an alternative file in which to store the process ID.
> The default is
>-.Pa /var/run/rtadvd.pid.
>+.Pa /var/run/rtadvd.pid .
> .It Fl R
> Accept router renumbering requests.
> If you enable it, certain IPsec setup is suggested for security reasons.
>diff -u src/usr.sbin/smbmsg/smbmsg.8.orig src/usr.sbin/smbmsg/smbmsg.8
>--- src/usr.sbin/smbmsg/smbmsg.8.orig	2012-05-17 23:51:03.000000000 +0900
>+++ src/usr.sbin/smbmsg/smbmsg.8	2012-05-17 23:51:14.000000000 +0900
>@@ -70,7 +70,7 @@
> The only valid additional option for this modus of operation (besides
> the
> .Fl p
>-option that choses the modus) is
>+option that chooses the modus) is
> .Fl f Ar dev .
> See below for a description.
> .Pp
>diff -u src/crypto/openssh/sshd.8.orig src/crypto/openssh/sshd.8
>--- src/crypto/openssh/sshd.8.orig	2012-05-17 23:51:23.000000000 +0900
>+++ src/crypto/openssh/sshd.8	2012-05-17 23:51:33.000000000 +0900
>@@ -386,7 +386,8 @@
> If the login is on a tty, records login time.
> .It
> Checks
>-.Pa /etc/nologin and
>+.Pa /etc/nologin
>+and
> .Pa /var/run/nologin ;
> if one exists, it prints the contents and quits
> (unless root).
>diff -u src/libexec/tftpd/tftpd.8.orig src/libexec/tftpd/tftpd.8
>--- src/libexec/tftpd/tftpd.8.orig	2012-05-17 23:51:49.000000000 +0900
>+++ src/libexec/tftpd/tftpd.8	2012-05-17 23:52:31.000000000 +0900
>@@ -165,7 +165,7 @@
> .Ar value .
> The debug level is a bitmask implemented in
> .Pa src/libexec/tftpd/tftp-utils.h .
>-Valid values are 0 (DEBUG_NONE), 1 (DEBUG_PACKETS), 2, (DEBUG_SIMPLE),
>+Valid values are 0 (DEBUG_NONE), 1 (DEBUG_PACKETS), 2 (DEBUG_SIMPLE),
> 4 (DEBUG_OPTIONS), and 8 (DEBUG_ACCESS).  Multiple debug values can be combined
> in the bitmask by logically OR'ing the values.  For example, specifying
> .Fl d
>@@ -218,7 +218,7 @@
> Note that this only works in directories writable by the user
> specified with
> .Fl u
>-option
>+option.
> .It Fl W
> As
> .Fl w
>diff -u src/usr.sbin/utx/utx.8.orig src/usr.sbin/utx/utx.8
>--- src/usr.sbin/utx/utx.8.orig	2012-05-17 23:52:40.000000000 +0900
>+++ src/usr.sbin/utx/utx.8	2012-05-17 23:52:58.000000000 +0900
>@@ -94,7 +94,7 @@
> .Sh SEE ALSO
> .Xr getent 1 ,
> .Xr w 1 ,
>-.Xr pututxline 3 .
>+.Xr pututxline 3
> .Sh HISTORY
> The
> .Nm
>diff -u src/sys/boot/forthersion.4th.8,v.orig src/sys/boot/forthersion.4th.8,v
>--- src/sys/boot/forthersion.4th.8,v.orig	2012-05-17 23:53:05.000000000 +0900
>+++ src/sys/boot/forthersion.4th.8,v	2012-05-17 23:53:42.000000000 +0900
>@@ -29,7 +29,7 @@
> .Os
> .Sh NAME
> .Nm version.4th
>-.Nd FreeBSD version string boot module.
>+.Nd FreeBSD version string boot module
> .Sh DESCRIPTION
> The file that goes by the name of
> .Nm
>diff -u src/cddl/contrib/opensolaris/cmd/zpool/zpool.8.orig src/cddl/contrib/opensolaris/cmd/zpool/zpool.8
>--- src/cddl/contrib/opensolaris/cmd/zpool/zpool.8.orig	2012-05-17 23:54:39.000000000 +0900
>+++ src/cddl/contrib/opensolaris/cmd/zpool/zpool.8	2012-05-17 23:56:33.000000000 +0900
>@@ -654,7 +654,7 @@
> .It Sy dedupditto Ns = Ns Ar number
> Threshold for the number of block ditto copies. If the reference count for a
> deduplicated block increases above this number, a new ditto copy of this block
>-is automatically stored. Deafult setting is
>+is automatically stored. Default setting is
> .Cm 0 .
> .It Sy delegation Ns = Ns Cm on No | Cm off
> Controls whether a non-privileged user is granted access based on the dataset
>@@ -832,7 +832,7 @@
> in use by another subsystem. There are some uses, such as being currently
> mounted, or specified as the dedicated dump device, that prevents a device from
> ever being used by
>-.Tn ZFS
>+.Tn ZFS .
> Other uses, such as having a preexisting
> .Sy UFS
> file system, can be overridden with the
>@@ -882,7 +882,8 @@
> .Ar ...
> .Xc
> Sets the given file system properties in the root file system of the pool. See
>-.Xr zfs 8 Properties
>+.Xr zfs 8
>+Properties
> for a list of valid properties that
> can be set.
> .It Fl R Ar root
>@@ -1110,7 +1111,7 @@
> and the
> .Qq Sy altroot
> property to
>-.Qq Ar root
>+.Qq Ar root .
> .It Fl F
> Recovery mode for a non-importable pool. Attempt to return the pool to an
> importable state by discarding the last few transactions. Not all damaged pools

Actions: View | Diff

Attachments on bug 168016: 124530