diff in manpages-ja

[NABETANI Hidenobu <nabetani@xxxxxxxxxxxxxxxxxxxxxxxxxxx>]

鍋谷です。

少し時間を作って、manpages-ja の diff を抜きだしてみました。

fileutiles_3.16-5.diff
findutils_4.1-27.diff
sysklogd_1.3-25.diff.gz
textutils_1.22-2.4.diff.gz
util-linux_2.7.1-3.diff.gz

の中の man に関する変更部分を抜きだしただけです。
JM に含まれるものは、これ以外にありますか？

textutils は、変更なしです。
shadow は、バージョンが異なっています。

大阪大学理学研究科物理学専攻 博士前期課程2年 大坪研究室(06-850-5346)
         鍋谷 栄展      nabetani@xxxxxxxxxxxxxxxxxxxxxxxxxxx

--- fileutils-3.16.orig/man/ls.1
+++ fileutils-3.16/man/ls.1
@@ -12,10 +12,13 @@
 [\-\-recursive] [\-\-sort={none,time,size,extension}]
 [\-\-format={long,verbose,commas,across,vertical,single-column}]
 [\-\-time={atime,access,use,ctime,status}] [\-\-help] [\-\-version]
-[\-\-color[={yes,no,tty}]] [\-\-colour[={yes,no,tty}]] [name...]
+[\-\-color[={none,auto,always}]] [\-\-colour[={none,auto,always}]] [name...]
 .SH DESCRIPTION
 This documentation is no longer being maintained and may be inaccurate
 or incomplete.  The Texinfo documentation is now the authoritative source.
+Note that the option "\-\-colour" should be read as option "\-\-color"
+because "\-\-colour" is not supported anymore/right now.  More on Debian
+GNU/Linux specific color support can be found in /usr/doc/fileutils/color-ls.gz.
 .PP
 This manual page
 documents the GNU version of
@@ -141,8 +144,8 @@
 Inhibit display of group information in a long format directory listing.
 .TP
 .I "\-L, \-\-dereference"
-List the files linked to by symbolic links instead of listing the
-contents of the links.
+List information for the files linked to by symbolic links instead of listing
+the contents of the links.
 .TP
 .I "\-N, \-\-literal"
 Do not quote file names.
@@ -203,20 +206,20 @@
 initial `.' in a filename does not match a wildcard at the start of
 .I pattern.
 .TP
-.I "\-\-color, \-\-colour, \-\-color=yes, \-\-colour=yes"
+.I "\-\-color, \-\-colour, \-\-color=always, \-\-colour=always"
 Colorize the names of files depending on the type of file.
 See
 .B DISPLAY COLORIZATION
 below.
 .TP
-.I "\-\-color=tty, \-\-colour=tty"
+.I "\-\-color=auto, \-\-colour=auto"
 Same as
 .I \-\-color
 but only if standard output is a terminal.  This is very useful for
 shell scripts and command aliases, especially if your favorite pager
 does not support color control codes.
 .TP
-.I "\-\-color=no, \-\-colour=no"
+.I "\-\-color=none, \-\-colour=none"
 Disables colorization.  This is the default.  Provided to override a
 previous color option.
 .TP
--- fileutils-3.16.orig/debian/sync.8
+++ fileutils-3.16/debian/sync.8
@@ -0,0 +1,46 @@
+.TH SYNC 8 "September 23rd" "GNU" "Debian GNU/Linux manual"
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+sync \- Synchronize data on disk with memory
+.SH SYNOPSIS
+.B sync
+.I "[options]" 
+.SH "DESCRIPTION"
+This manual page briefly documents the
+.BR sync
+command.
+This manual page was written for the Debian GNU/Linux distribution
+(but may be used by others), because the original program does not
+have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.B sync
+writes any data buffered in memory out to disk.  This can include (but
+is not limited to) modified superblocks, modified inodes, and delayed 
+reads and writes.  This must be implemented by the kernel; The
+.B sync
+program does nothing but exercise the sync(2) system call.
+.PP
+The kernel keeps data in memory to avoid doing (relatively slow) disk
+reads and writes.  This improves performance, but if the computer
+crashes, data may be lost or the filesystem corrupted as a result.
+.B sync
+ensures everything in memory is written to disk.
+.SH OPTIONS
+.B sync
+follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+.TP
+.B \-\-help
+Show summary of options.
+.TP
+.B \-\-version
+Show version of program.
+.SH "SEE ALSO"
+The original documentation is in
+.IR "GNU File Utilities" ,
+available via the Info system.
+.SH AUTHOR
+This manual page was written by Galen Hazelwood, 
+for the Debian GNU/Linux system.

--- findutils-4.1.orig/locate/locate.1
+++ findutils-4.1/locate/locate.1
@@ -3,7 +3,7 @@
 locate \- list files in databases that match a pattern
 .SH SYNOPSIS
 .B locate
-[\-d path] [\-\-database=path] [\-\-version] [\-\-help] pattern...
+[\-d path | \-\-database=path] [-e | --existing] [\-\-version] [\-\-help] pattern...
 .SH DESCRIPTION
 This manual page
 documents the GNU version of
@@ -59,6 +59,12 @@
 .B locate
 or
 .BR find .
+.TP
+.I "\-e, \-\-existing"
+Only print out such names that currently exist (instead of such names
+that existed when the database was created).
+Note that this may slow down the program a lot, if there are many matches
+in the database.
 .TP
 .I "\-\-help"
 Print a summary of the options to
--- findutils-4.1.orig/locate/updatedb.1
+++ findutils-4.1/locate/updatedb.1
@@ -55,11 +55,18 @@
 .TP
 .B \-\-output=\fIdbfile\fP
 The database file to build.
-Default is system-dependent, but typically /usr/local/var/locatedb.
+Default is system-dependent.  In Debian GNU/Linux, the default
+is /var/lib/locate/locatedb.
+.TP
+.B \-\-localuser=\fIuser\fP
+The user to search non-network directories as, using \fBsu\fP(1).
+Default is to search the non-network directories as the current user.
+You can also use the environment variable \fBLOCALUSER\fP to set this user.
 .TP
 .B \-\-netuser=\fIuser\fP
 The user to search network directories as, using \fBsu\fP(1).
 Default is \fBdaemon\fP.
+You can also use the environment variable \fBNETUSER\fP to set this user.
 .TP
 .B \-\-old\-format
 Create the database in the old format instead of the new one.

--- sysklogd-1.3.orig/debian/syslogd-listfiles.8
+++ sysklogd-1.3/debian/syslogd-listfiles.8
@@ -0,0 +1,76 @@
+.\" syslogd-listfiles.8 - generic routine for /etc/syslog.conf
+.\" Copyright (c) 1997  Martin Schulze <joey@debian.org>
+.\" 
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\" 
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\" 
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\"
+.TH SYSLOGD-LISTFILES 8 "1 January 1998" "Debian project" "Debian GNU/Linux"
+.SH NAME
+syslogd-listfiles \- list system logfiles
+.SH SYNOPSIS
+.B syslogd-listfiles
+.RB [ " \-a " | " \-\-all " ]
+.RB [ " \-\-auth " ] 
+.RB [ " \-f "
+.I config file
+]
+.RB [ " \-\-news " ]
+.RB [ " \-w " | " \-\-weekly " ]
+.SH DESCRIPTION
+.B Sysklogd
+provides a modern machanism to log system messages.  This mechanism is
+controlled by the file
+.IR /etc/syslog.conf .
+Messages are divided into logfiles which can grow quite big.
+Therefore the logfiles need to be rotated once per day, per week or
+per month.  On a Debian GNU/Linux system most of the files are rotated
+once per week.
+
+This program helps the rotation script to determine which logfiles
+need to be rotated and when.  It takes care of news logfiles that are
+handled by the
+.B news.daily
+script from INN.  In conjunction with the scripts in
+.IR /etc/cron.daily " and " /etc/cron.weekly
+it takes care of files with sentitive information.
+
+By default a list of files for daily rotation is generated.  At the
+moment this option only reflects the "*.*" lines.
+
+.SH OPTIONS
+.TP
+.BR "\-a" ", " "\-\-all"
+List all logfiles and ignore all other rules.
+.TP
+.BI "\-f " "config file"
+Specify an alternative configuration file instead of
+.IR /etc/syslog.conf ","
+which is the default.
+.TP
+.B "\-\-auth"
+Only list files containing sensitive information such as the one
+containing auth.*.
+.TP
+.B "\-\-news"
+Don't exclude news logfiles which are normally handled by the
+.B news.daily
+script from INN.
+.TP
+.BR "\-w" ", " "\-\-weekly"
+Generate the list for weekly rotation.
+.LP
+.SH SEE ALSO
+.BR syslog.conf (5),
+.BR syslogd (8),
+.BR savelog (8).
--- sysklogd-1.3.orig/klogd.8
+++ sysklogd-1.3/klogd.8
@@ -2,6 +2,7 @@
 .\" May be distributed under the GNU General Public License
 .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates
 .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates
+.\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates
 .\"
 .TH KLOGD 8 "24 November 1995" "Version 1.3" "Linux System Administration"
 .SH NAME
@@ -16,13 +17,16 @@
 .RB [ " \-f "
 .I fname
 ]
+.RB [ " \-iI " ]
 .RB [ " \-n " ]
 .RB [ " \-o " ]
+.RB [ " \-p " ]
 .RB [ " \-s " ]
 .RB [ " \-k "
 .I fname
 ]
 .RB [ " \-v " ]
+.RB [ " \-x " ]
 .LP
 .SH DESCRIPTION
 .B klogd
@@ -41,6 +45,12 @@
 .BI "\-f " file
 Log messages to the specified filename rather than to the syslog facility.
 .TP
+.BI "\-i \-I"
+Signal the currently executing klogd daemon.  Both of these switches control
+the loading/reloading of symbol information.  The \-i switch signals the
+daemon to reload the kernel module symbols.  The \-I switch signals for a
+reload of both the static kernel symbols and the kernel module symbols.
+.TP
 .B "\-n"
 Avoid auto-backgrounding. This is needed especially if the
 .B klogd
@@ -52,6 +62,12 @@
 all the messages that are found in the kernel message buffers.  After
 a single read and log cycle the daemon exits.
 .TP
+.B "-p"
+Enable paranoia.  This option controls when klogd loads kernel module symbol
+information.  Setting this switch causes klogd to load the kernel module
+symbol information whenever an Oops string is detected in the kernel message
+stream.
+.TP
 .B "-s"
 Force \fBklogd\fP to use the system call interface to the kernel message
 buffers.
@@ -61,6 +77,9 @@
 .TP
 .B "\-v"
 Print version and exit.
+.TP
+.B "\-x"
+Omits EIP translation and there doesn't read the System.map.
 .LP
 .SH OVERVIEW
 The functionality of klogd has been typically incorporated into other
@@ -72,15 +91,15 @@
 
 In Linux there are two potential sources of kernel log information: the 
 .I /proc
-filesystem and the syscall (sys_syslog) interface, although
+file system and the syscall (sys_syslog) interface, although
 ultimately they are one and the same.  Klogd is designed to choose
 whichever source of information is the most appropriate.  It does this
 by first checking for the presence of a mounted 
 .I /proc
-filesystem. If this is found the 
+file system. If this is found the 
 .I /proc/kmsg
 file is used as the source of kernel log
-information. If the proc filesystem is not mounted 
+information. If the proc file system is not mounted 
 .B klogd
 uses a
 system call to obtain kernel messages.  The command line switch
@@ -163,10 +182,43 @@
 .fi
 .PP
 .SH KERNEL ADDRESS RESOLUTION
+If the kernel detects an internal error condition a general protection
+fault will be triggered.  As part of the GPF handling procedure the
+kernel prints out a status report indicating the state of the
+processor at the time of the fault.  Included in this display are the
+contents of the microprocessor's registers, the contents of the kernel
+stack and a tracing of what functions were being executed at the time
+of the fault.
+
+This information is
+.B EXTREMELY IMPORTANT
+in determining what caused the internal error condition.  The
+difficulty comes when a kernel developer attempts to analyze this
+information.  The raw numeric information present in the protection
+fault printout is of very little use to the developers.  This is due
+to the fact that kernels are not identical and the addresses of
+variable locations or functions will not be the same in all kernels.
+In order to correctly diagnose the cause of failure a kernel developer
+needs to know what specific kernel functions or variable locations
+were involved in the error.
+
+As part of the kernel compilation process a listing is created which
+specified the address locations of important variables and function in
+the kernel being compiled.  This listing is saved in a file called
+System.map in the top of the kernel directory source tree.  Using this
+listing a kernel developer can determine exactly what the kernel was
+doing when the error condition occurred.
+
+The process of resolving the numeric addresses from the protection
+fault printout can be done manually or by using the
+.B ksymoops
+program which is included in the kernel sources.
+
+As a convenience
 .B klogd
 will attempt to resolve kernel numeric addresses to their symbolic
-forms if a kernel symbol table is available at execution time.
-A symbol table may be specified by using the \fB\-k\fR switch on the
+forms if a kernel symbol table is available at execution time.  A
+symbol table may be specified by using the \fB\-k\fR switch on the
 command line.  If a symbol file is not explicitly specified the
 following filenames will be tried:
 
@@ -192,19 +244,101 @@
 so that they will be recognized and translated by klogd.  Earlier
 kernels require a source code patch be applied to the kernel sources.
 This patch is supplied with the sysklogd sources.
+
+The process of analyzing kernel protections faults works very well
+with a static kernel.  Additional difficulties are encountered when
+attempting to diagnose errors which occur in loadable kernel modules.
+Loadable kernel modules are used to implement kernel functionality in
+a form which can be loaded or unloaded at will.  The use of loadable
+modules is useful from a debugging standpoint and can also be useful
+in decreasing the amount of memory required by a kernel.
+
+The difficulty with diagnosing errors in loadable modules is due to
+the dynamic nature of the kernel modules.  When a module is loaded the
+kernel will allocate memory to hold the module, when the module is
+unloaded this memory will be returned back to the kernel.  This
+dynamic memory allocation makes it impossible to produce a map file
+which details the addresses of the variable and functions in a kernel
+loadable module.  Without this location map it is not possible for a
+kernel developer to determine what went wrong if a protection fault
+involves a kernel module.
+
+.B klogd
+has support for dealing with the problem of diagnosing protection
+faults in kernel loadable modules.  At program start time or in
+response to a signal the daemon will interrogate the kernel for a
+listing of all modules loaded and the addresses in memory they are
+loaded at.  Individual modules can also register the locations of
+important functions when the module is loaded.  The addresses of these
+exported symbols are also determined during this interrogation
+process.
+
+When a protection fault occurs an attempt will be made to resolve
+kernel addresses from the static symbol table.  If this fails the
+symbols from the currently loaded modules are examined in an attempt
+to resolve the addresses.  At the very minimum this allows klogd to
+indicate which loadable module was responsible for generating the
+protection fault.  Additional information may be available if the
+module developer chose to export symbol information from the module.
+
+Proper and accurate resolution of addresses in kernel modules requires
+that
+.B klogd
+be informed whenever the kernel module status changes.  The
+.B \-i
+and
+.B \-I
+switches can be used to signal the currently executing daemon that
+symbol information be reloaded.  Of most importance to proper
+resolution of module symbols is the
+.B \-i
+switch.  Each time a kernel module is loaded or removed from the
+kernel the following command should be executed:
+
+.nf
+.I klogd \-i
+.fi
+
+The
+.B \-p
+switch can also be used to insure that module symbol information is up
+to date.  This switch instructs
+.B klogd
+to reload the module symbol information whenever a protection fault
+is detected.  Caution should be used before invoking the program in
+\'paranoid\' mode.  The stability of the kernel and the operating
+environment is always under question when a protection fault occurs.
+Since the klogd daemon must execute system calls in order to read the
+module symbol information there is the possibility that the system may
+be too unstable to capture useful information.  A much better policy
+is to insure that klogd is updated whenever a module is loaded or
+unloaded.  Having uptodate symbol information loaded increases the
+probability of properly resolving a protection fault if it should occur.
+
+Included in the sysklogd source distribution is a patch to the
+modules-2.0.0 package which allows the
+.B insmod,
+.B rmmod
+and
+.B modprobe
+utilities to automatically signal
+.B klogd
+whenever a module is inserted or removed from the kernel.  Using this
+patch will insure that the symbol information maintained in klogd is
+always consistent with the current kernel state.
 .PP
 .SH SIGNAL HANDLING
 The 
 .B klogd
-will respond to six signals:
-.BR SIGHUP ", " SIGINT ", " SIGKILL ", " SIGTERM ", " SIGTSTP " and " SIGCONT ". The"
+will respond to eight signals:
+.BR SIGHUP ", " SIGINT ", " SIGKILL ", " SIGTERM ", " SIGTSTP ", " SIGUSR1 ", "SIGUSR2 " and " SIGCONT ". The"
 .BR SIGINT ", " SIGKILL ", " SIGTERM " and " SIGHUP
 signals will cause the daemon to close its kernel log sources and
 terminate gracefully.
 
 The 
 .BR SIGTSTP " and " SIGCONT
-singals are used to start and stop kernel logging. Upon receipt of a 
+signals are used to start and stop kernel logging. Upon receipt of a 
 .B SIGTSTP
 signal the daemon will close its
 log sources and spin in an idle loop.  Subsequent receipt of a 
@@ -229,6 +363,26 @@
 .B LOG_INFO
 priority
 documenting the start/stop of logging.
+
+The 
+.BR SIGUSR1 " and " SIGUSR2
+signals are used to initiate loading/reloading of kernel symbol information.
+Receipt of the
+.B SIGUSR1
+signal will cause the kernel module symbols to be reloaded.  Signaling the
+daemon with
+.B SIGUSR2
+will cause both the static kernel symbols and the kernel module symbols to
+be reloaded.
+
+Provided that the System.map file is placed in an appropriate location the
+signal of generally greatest usefulness is the
+.B SIGUSR1
+signal.  This signal is designed to be used to signal the daemon when kernel
+modules are loaded/unloaded.  Sending this signal to the daemon after a
+kernel module state change will insure that proper resolution of symbols will
+occur if a protection fault occurs in the address space occupied by a kernel
+module.
 .LP
 .SH FILES
 .PD 0
@@ -241,7 +395,7 @@
 The file containing the process id of 
 .B klogd
 .TP
-.I /System.map, /usr/src/linux/System.map
+.I /boot/System.map, /System.map, /usr/src/linux/System.map
 Default locations for kernel system maps.
 .PD
 .SH BUGS
--- sysklogd-1.3.orig/sysklogd.8
+++ sysklogd-1.3/sysklogd.8
@@ -39,7 +39,7 @@
 .BR syslogd (8)
 derived from the
 stock BSD sources.  Support for kernel logging is provided by the
-.BR syslogd (8)
+.BR klogd (8)
 utility which allows kernel logging to be conducted in either a
 standalone fashion or as a client of syslogd.
 
@@ -91,7 +91,7 @@
 .TP
 .BI "\-l " "hostlist"
 Specify a hostname that should be logged only with its simple hostname
-and not the the fqdn. Multiple hosts may be specified using the colon
+and not the fqdn. Multiple hosts may be specified using the colon
 (``:'') separator.
 .TP
 .BI "\-m " "interval"
@@ -195,8 +195,8 @@
 .PP
 Under the new scheme this behavior remains the same.  The difference
 is the addition of four new specifiers, the asterisk (\fB*\fR)
-wildcard the equation sign (\fB=\fR), the exclamation mark
-(\fB!\fR) and the minus sign (\fB-\fR).
+wildcard, the equation sign (\fB=\fR), the exclamation mark
+(\fB!\fR), and the minus sign (\fB-\fR).
 
 The \fB*\fR specifies that all messages for the
 specified facility are to be directed to the destination.  Note that
@@ -215,7 +215,7 @@
 .IP
 .nf
 	# Sample syslog.conf
-	daemon.=debug			/usr/adm/debug
+	*.=debug			/usr/adm/debug
 .fi
 .PP
 .\" The \fB!\fR as the first character of a priority inverts the above
@@ -372,6 +372,11 @@
 machines. This, too, results in logging only their simple hostnames
 and not the fqdns.
 
+The UDP socket used to forward messages to remote hosts or to receive
+messages from them is only opened when it is needed.  In releases
+prior to 1.3-23 it was opened every time but not opened for reading or
+forwarding respectively.
+
 .SH OUTPUT TO NAMED PIPES (FIFOs)
 This version of syslogd has support for logging output to named pipes
 (fifos).  A fifo or named pipe can be used as a destination for log
@@ -456,11 +461,11 @@
 .SH DEBUGGING
 When debugging is turned on using
 .B "\-d"
-option the
+option then
 .B syslogd
-will very verbose by writing much of what it does on stdout. Whenever
+will be very verbose by writing much of what it does on stdout. Whenever
 the configuration file is reread and re-parsed you'll see a tabular,
-corresponding on the internal data structure. This tabular consists of
+corresponding to the internal data structure. This tabular consists of
 four fields:
 .TP
 .I number
@@ -489,7 +494,7 @@
 This field shows additional arguments to the actions in the last
 field. For file-logging this is the filename for the logfile; for
 user-logging this is a list of users; for remote logging this is the
-the hostname of the machine to log to; for console-logging this is the
+hostname of the machine to log to; for console-logging this is the
 used console; for tty-logging this is the specified tty; wall has no
 additional arguments.
 .SH FILES
--- sysklogd-1.3.orig/syslog.conf.5
+++ sysklogd-1.3/syslog.conf.5
@@ -1,4 +1,4 @@
-.\" syslog.conf - sysklogd(8) configuration file
+.\" syslog.conf - syslogd(8) configuration file
 .\" Copyright (c) 1995  Martin Schulze <Martin.Schulze@xxxxxxxx>
 .\" 
 .\" This file is part of the sysklogd package, a kernel and system log daemon.
@@ -15,11 +15,11 @@
 .\" 
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
 .\"
-.TH SYSLOG.CONF 5 "24 November 1995" "Version 1.3" "Linux System Administration"
+.TH SYSLOG.CONF 5 "1 January 1998" "Version 1.3" "Linux System Administration"
 .SH NAME
-syslog.conf \- sysklogd(8) configuration file
+syslog.conf \- syslogd(8) configuration file
 .SH DESCRIPTION
 The
 .I syslog.conf
@@ -40,6 +40,12 @@
 
 Lines starting with a hash mark (``#'') and empty lines are ignored.
 
+This release of
+.B syslogd
+is able to understand an extended syntax.  One rule can be divided
+into several lines if the leading line is terminated with an backslash
+(``\\'').
+
 .SH SELECTORS
 The selector field itself again consists of two parts, a
 .I facility
@@ -102,12 +108,12 @@
 
 You can specify multiple facilities with the same priority pattern in
 one statement using the comma (``,'') operator. You may specify as
-much facilities as you want. Remember that only the facility part from
+much facilities as you want.  Remember that only the facility part from
 such a statement is taken, a priority part would be skipped.
 
 Multiple selectors may be specified for a single
 .I action
-using the semicolon (``;'') separator. Remember that each selector in
+using the semicolon (``;'') separator.  Remember that each selector in
 the 
 .I selector
 field is capable to overwrite the preceding ones. Using this
@@ -201,7 +207,7 @@
 .LP
 This will store all messages with the priority
 .B crit
-or higher in the file
+in the file
 .IR /var/adm/critical ,
 except for any kernel message.
 
@@ -286,7 +292,8 @@
 .nf
 # Log info and notice messages to messages file
 #
-*.=info;*.=notice;mail.none  /var/log/messages
+*.=info;*.=notice;\\
+	mail.none  /var/log/messages
 .fi
 .LP
 This lets the
@@ -303,7 +310,8 @@
 .nf
 # Log info messages to messages file
 #
-*.=info;mail,news.none       /var/log/messages
+*.=info;\\
+	mail,news.none       /var/log/messages
 .fi
 .LP
 This statement causes the

--- util-linux-2.7.1.orig/disk-utils/cfdisk.8
+++ util-linux-2.7.1/disk-utils/cfdisk.8
@@ -120,18 +120,14 @@
 partition table entry for /dev/hda1, then (after exiting fdisk or cfdisk
 and rebooting Linux so that the partition table information is valid) you
 would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero
-the first 512 bytes of the partition.
-.B BE EXTREMELY CAREFUL
-if you use the
-.B dd
-command, since a small typo can make all of the data on your disk useless.
+the first 512 bytes of the partition. Note:
 
 .B BE EXTREMELY CAREFUL
 if you use the
 .B dd
 command, since a small typo can make all of the data on your disk useless.
 
-For best resutls, you should always use an OS-specific partition table
+For best results, you should always use an OS-specific partition table
 program.  For example, you should make DOS partitions with the DOS FDISK
 program and Linux partitions with the Linux fdisk or Linux cfdisk program.
 
--- util-linux-2.7.1.orig/disk-utils/fdisk.8
+++ util-linux-2.7.1/disk-utils/fdisk.8
@@ -114,16 +114,9 @@
 .TP
 .B \-l
 Lists the partition tables for
-.BR /dev/hda ,
-.BR /dev/hdb ,
-.BR /dev/sda ,
-.BR /dev/sdb ,
-.BR /dev/sdc ,
-.BR /dev/sdd ,
-.BR /dev/sde ,
-.BR /dev/sdf ,
-.BR /dev/sdg ,
-.BR /dev/sdh ,
+.BR /dev/hd[a-d] ,
+.BR /dev/sd[a-h] ,
+.BR /dev/ed[a-d] ,
 and then exits.
 .TP
 .BI \-s partition
--- util-linux-2.7.1.orig/disk-utils/fdisklabel.c
+++ util-linux-2.7.1/disk-utils/fdisklabel.c
@@ -47,6 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 
+#include <linux/types.h>
 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/fs.h>
@@ -682,7 +683,7 @@
   int t, sector;
 
 #if defined (i386)
-  sector = p -> start_sect;
+  sector = p ? p -> start_sect : 0;
 #elif defined (__alpha__)
   sector = 0;
 #endif
--- util-linux-2.7.1.orig/disk-utils/mkfs.8
+++ util-linux-2.7.1/disk-utils/mkfs.8
@@ -37,9 +37,9 @@
 is simply a front-end for the various file system builders
 (\fBmkfs\fR.\fIfstype\fR)
 available under Linux.
-The file system-specific builder is searched for in /etc/fs first,
-then in /etc and finally in the directories listed in the PATH
-enviroment variable.
+The file system-specific builder is searched for in /sbin/fs first,
+then in /sbin, and finally in the directories listed in the PATH
+environment variable.
 Please see the file system-specific builder manual pages for
 further details.
 .SH OPTIONS
--- util-linux-2.7.1.orig/login-utils/agetty.8
+++ util-linux-2.7.1/login-utils/agetty.8
@@ -158,9 +158,11 @@
 and the login prompt. Very useful in connection with the \-I option.
 .PP
 .SH EXAMPLES
-.na
-.nf
-This section shows sample command entries for the \fI/etc/inittab\fP file.
+.ad
+.fi
+This section shows examples for the process field of an entry in the
+\fI/etc/inittab\fP file.  You'll have to prepend appropriate values
+for the other fields.  See \fIinittab(5)\fP for more details.
 
 For a hard-wired line or a console tty:
 .ti +5
--- util-linux-2.7.1.orig/misc-utils/getoptprog.1
+++ util-linux-2.7.1/misc-utils/getoptprog.1
@@ -101,4 +101,3 @@
 .Nm set
 command to set the arguments without disrupting the value(s) of
 shell options varies from one shell version to another.
-varies from one shell version to another.
--- util-linux-2.7.1.orig/misc-utils/mcookie.1
+++ util-linux-2.7.1/misc-utils/mcookie.1
@@ -19,10 +19,7 @@
 .B \-f
 is specified), and several bytes of information from the first of the
 following devices which is present:
-.IR /dev/urandom ", " /dev/random ", " /dev/audio .
-Other files in
-.I /proc
-may be used as a last resort.
+.IR /dev/random ", " /dev/urandom ", files in " /proc ", " /dev/audio .
 .SH BUGS
 The entropy in the generated 128-bit is probably quite small (and,
 therefore, vulnerable to attack) unless a non-pseudorandom number generator
--- util-linux-2.7.1.orig/misc-utils/whereis.1
+++ util-linux-2.7.1/misc-utils/whereis.1
@@ -62,53 +62,7 @@
 resulting from use of source code control are also dealt with.
 .B whereis
 then attempts to locate the desired program in
-a list of standard Linux places:
-.IP
-.nf
-.ft B
-/bin
-/usr/bin
-/etc
-/usr/etc
-/sbin
-/usr/sbin
-/usr/games
-/usr/games/bin
-/usr/emacs/etc
-/usr/lib/emacs/19.22/etc
-/usr/lib/emacs/19.23/etc
-/usr/lib/emacs/19.24/etc
-/usr/lib/emacs/19.25/etc
-/usr/lib/emacs/19.26/etc
-/usr/lib/emacs/19.27/etc
-/usr/lib/emacs/19.28/etc
-/usr/lib/emacs/19.29/etc
-/usr/lib/emacs/19.30/etc
-/usr/TeX/bin
-/usr/tex/bin
-/usr/interviews/bin/LINUX
-/usr/bin/X11
-/usr/X11/bin
-/usr/X11R5/bin
-/usr/X11R6/bin
-/usr/X386/bin
-/usr/local/bin
-/usr/local/etc
-/usr/local/sbin
-/usr/local/games
-/usr/local/games/bin
-/usr/local/emacs/etc
-/usr/local/TeX/bin
-/usr/local/tex/bin
-/usr/local/bin/X11
-
-/usr/contrib",
-/usr/hosts",
-/usr/include",
-
-/usr/g++-include",
-.ft R
-.fi
+a list of standard Linux places.
 .SH OPTIONS
 .TP
 \fB\-b
@@ -169,19 +123,6 @@
 example% whereis \-u \-M /usr/man/man1 \-S /usr/src \-f *
 .fi
 .ft R
-.SH FILES
-.PD 0
-.TP 20
-.B /{bin,sbin,etc}
-.TP
-.B /usr/{lib,bin,old,new,local,games,include,etc,src,man,sbin,
-.B X386,TeX,g++-include}
-.TP
-.B /usr/local/{X386,TeX,X11,include,lib,man,etc,bin,games,
-.B emacs}
-.TP
-.B 
-.PD
 .SH SEE ALSO
 .BR chdir (2V)
 .SH BUGS
@@ -196,3 +137,7 @@
 .B \-B
 must be full; that is, they must begin with a
 .RB ` / '.
+.PP
+whereis has a hard-coded path, so may not always find what
+you're looking for.
+