Hi,
The first of the patches uniformizes the .TH header lines in the
man pages, as proposed by Sami Kerola -- with the exception
that I use just "System Administration" instead of "System
Administration Utilities". The few man pages that are in troff
format, however, do not allow setting the top center header --
they insist on saying "BSD System Manager's Manual" (for 8)
or "BSD General Commands Manual" (for section 1).
The fifth patch redoes and improves the unapplied scriptreplay
man page patch from one of my previous mails.
The sixth patch removes the pluralization item from the TODO file.
Further messages will be pluralized when translators request it.
There are still some typos and small mistakes in some of the usage
help texts, but I'll supply fixes for those after the release of 2.20.
Regards,
Benno
--
http://www.fastmail.fm - The way an email service should be
From 069eb8dcd866a969af388255827f2a23c6db78d6 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Thu, 18 Aug 2011 22:18:34 +0200
Subject: [PATCH 1/6] manpages: uniformize the header and footer lines
Use dates without the day, use the full month name, put "util-linux" in
the lower left corner, and "User Commands" or "System Administration"
at the top center.
Also improve here and there the one-line program description.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
disk-utils/blockdev.8 | 2 +-
disk-utils/elvtune.8 | 2 +-
disk-utils/fdformat.8 | 4 ++--
disk-utils/fsck.minix.8 | 4 ++--
disk-utils/isosize.8 | 4 ++--
disk-utils/mkfs.8 | 2 +-
disk-utils/mkfs.bfs.8 | 2 +-
disk-utils/mkfs.minix.8 | 4 ++--
disk-utils/mkswap.8 | 2 +-
disk-utils/raw.8 | 2 +-
disk-utils/swaplabel.8 | 6 +++---
fdisk/cfdisk.8 | 6 +++---
fdisk/fdisk.8 | 4 ++--
fsck/fsck.8 | 2 +-
getopt/getopt.1 | 2 +-
hwclock/hwclock.8 | 2 +-
libblkid/libblkid.3 | 2 +-
login-utils/chfn.1 | 2 +-
login-utils/chsh.1 | 2 +-
login-utils/last.1 | 2 +-
login-utils/login.1 | 2 +-
login-utils/newgrp.1 | 4 ++--
misc-utils/blkid.8 | 2 +-
misc-utils/cal.1 | 7 ++++---
misc-utils/chkdupexe.1 | 2 +-
misc-utils/ddate.1 | 4 ++--
misc-utils/findfs.8 | 2 +-
misc-utils/findmnt.8 | 2 +-
misc-utils/kill.1 | 2 +-
misc-utils/logger.1 | 4 ++--
misc-utils/look.1 | 2 +-
misc-utils/lsblk.8 | 2 +-
misc-utils/namei.1 | 4 ++--
misc-utils/rename.1 | 2 +-
misc-utils/uuidd.8 | 2 +-
misc-utils/uuidgen.1 | 4 ++--
misc-utils/whereis.1 | 2 +-
misc-utils/wipefs.8 | 2 +-
mount/fstab.5 | 2 +-
mount/losetup.8 | 2 +-
mount/mount.8 | 2 +-
mount/swapon.8 | 2 +-
mount/umount.8 | 2 +-
partx/addpart.8 | 2 +-
partx/delpart.8 | 2 +-
partx/partx.8 | 2 +-
schedutils/chrt.1 | 6 +++---
schedutils/ionice.1 | 4 ++--
schedutils/taskset.1 | 4 ++--
sys-utils/arch.1 | 10 +++++-----
sys-utils/ctrlaltdel.8 | 2 +-
sys-utils/cytune.8 | 4 ++--
sys-utils/dmesg.1 | 2 +-
sys-utils/fallocate.1 | 4 ++--
sys-utils/flock.1 | 4 ++--
sys-utils/fsfreeze.8 | 10 ++++------
sys-utils/fstrim.8 | 2 +-
sys-utils/ipcmk.1 | 2 +-
sys-utils/ipcrm.1 | 2 +-
sys-utils/ipcs.1 | 2 +-
sys-utils/ldattach.8 | 2 +-
sys-utils/lscpu.1 | 4 ++--
sys-utils/mountpoint.1 | 2 +-
sys-utils/pivot_root.8 | 4 ++--
sys-utils/readprofile.1 | 4 ++--
sys-utils/renice.1 | 4 ++--
sys-utils/rtcwake.8 | 2 +-
sys-utils/setarch.8 | 2 +-
sys-utils/setsid.1 | 2 +-
sys-utils/switch_root.8 | 4 ++--
sys-utils/tunelp.8 | 2 +-
sys-utils/unshare.1 | 2 +-
term-utils/agetty.8 | 2 +-
term-utils/mesg.1 | 2 +-
term-utils/reset.1 | 2 +-
term-utils/script.1 | 4 ++--
term-utils/scriptreplay.1 | 2 +-
term-utils/setterm.1 | 2 +-
term-utils/wall.1 | 4 ++--
term-utils/write.1 | 2 +-
text-utils/col.1 | 4 ++--
text-utils/colcrt.1 | 4 ++--
text-utils/colrm.1 | 4 ++--
text-utils/column.1 | 10 ++++++----
text-utils/hexdump.1 | 4 ++--
text-utils/line.1 | 4 ++--
text-utils/more.1 | 4 ++--
text-utils/pg.1 | 4 ++--
text-utils/rev.1 | 4 ++--
text-utils/tailf.1 | 2 +-
text-utils/ul.1 | 4 ++--
91 files changed, 143 insertions(+), 142 deletions(-)
diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 63cd91d..2b3d64c 100644
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -3,7 +3,7 @@
.\" Copyright 2007 Karel Zak <kzak@xxxxxxxxxx>
.\"
.\" May be distributed under the GNU General Public License
-.TH BLOCKDEV 8 "Aug 2010" ""
+.TH BLOCKDEV 8 "August 2010" "util-linux" "System Administration"
.SH NAME
blockdev \- call block device ioctls from the command line
.SH SYNOPSIS
diff --git a/disk-utils/elvtune.8 b/disk-utils/elvtune.8
index 10a2e38..6321ee1 100644
--- a/disk-utils/elvtune.8
+++ b/disk-utils/elvtune.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH ELVTUNE 8 "14 March 2000" "Version 1.0"
+.TH ELVTUNE 8 "March 2000" "util-linux" "System Administration"
.SH NAME
elvtune \- I/O elevator tuner
.SH SYNOPSIS
diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8
index 0fa9e8d..67c5d03 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -1,8 +1,8 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH FDFORMAT "8" "July 2011" "util-linux" "System Administration Utilities"
+.TH FDFORMAT 8 "July 2011" "util-linux" "System Administration"
.SH NAME
-fdformat \- Low-level formats a floppy disk
+fdformat \- low-level format a floppy disk
.SH SYNOPSIS
.B fdformat
[\fIoptions\fR] \fIdevice\fR
diff --git a/disk-utils/fsck.minix.8 b/disk-utils/fsck.minix.8
index f4bb4d0..8f25b0b 100644
--- a/disk-utils/fsck.minix.8
+++ b/disk-utils/fsck.minix.8
@@ -1,9 +1,9 @@
.\" Copyright 1992, 1993, 1994 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be freely distributed.
.\" " for hilit19
-.TH FSCK 8 "2 July 1996" "Util-Linux 2.6" "Linux Programmer's Manual"
+.TH FSCK 8 "July 1996" "util-linux" "System Administration"
.SH NAME
-fsck.minix \- a file system consistency checker for Linux
+fsck.minix \- check consistency of Minix filesystem
.SH SYNOPSIS
.B fsck.minix
.RB [ \-larvsmf ]
diff --git a/disk-utils/isosize.8 b/disk-utils/isosize.8
index 1951f02..678fd80 100644
--- a/disk-utils/isosize.8
+++ b/disk-utils/isosize.8
@@ -1,6 +1,6 @@
-.TH ISOSIZE "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH ISOSIZE 8 "June 2011" "util-linux" "System Administration"
.SH NAME
-isosize \- outputs the length of an iso9660 filesystem
+isosize \- output the length of an iso9660 filesystem
.SH SYNOPSIS
.B isosize
[\fIoptions\fR] \fIiso9660_image_file\fR
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 09cc924..02d8b06 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MKFS "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH MKFS 8 "June 2011" "util-linux" "System Administration"
.SH NAME
mkfs \- build a Linux filesystem
.SH SYNOPSIS
diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8
index 616c358..466d640 100644
--- a/disk-utils/mkfs.bfs.8
+++ b/disk-utils/mkfs.bfs.8
@@ -1,6 +1,6 @@
.\" Copyright 1999 Andries E. Brouwer (aeb@xxxxxx)
.\" May be freely distributed.
-.TH MKFS.BFS "8" "July 2011" "util-linux" "System Administration Utilities"
+.TH MKFS.BFS 8 "July 2011" "util-linux" "System Administration"
.SH NAME
mkfs.bfs \- make an SCO bfs filesystem
.SH SYNOPSIS
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 6a8ebae..4ee0e81 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -1,8 +1,8 @@
.\" Copyright 1992, 1993, 1994 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be freely distributed.
-.TH MKFS.MINIX 8 "2 July 1996" "Util-linux 2.6" "Linux System Administrator's Manual"
+.TH MKFS.MINIX 8 "June 2011" "util-linux" "System Administration"
.SH NAME
-mkfs.minix \- make a Linux MINIX filesystem
+mkfs.minix \- make a Minix filesystem
.SH SYNOPSIS
.B mkfs.minix
.RB [ \-c | \-l
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index ff959cb..59a93dc 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -3,7 +3,7 @@
.\" May be distributed under the GNU General Public License
.\" Rewritten for 2.1.117, aeb, 981010.
.\"
-.TH MKSWAP 8 "13 March 2009" "Linux" "Linux Programmer's Manual"
+.TH MKSWAP 8 "March 2009" "util-linux" "System Administration"
.SH NAME
mkswap \- set up a Linux swap area
.SH SYNOPSIS
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index 9b4b957..b85080a 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH RAW 8 "Aug 1999" "Version 0.1"
+.TH RAW 8 "August 1999" "util-linux" "System Administration"
.SH NAME
raw \- bind a Linux raw character device
.SH SYNOPSIS
diff --git a/disk-utils/swaplabel.8 b/disk-utils/swaplabel.8
index 3e8103f..327a65f 100644
--- a/disk-utils/swaplabel.8
+++ b/disk-utils/swaplabel.8
@@ -2,9 +2,9 @@
.\"
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH SWAPLABEL 8 "2 April 2010" "Linux" "Linux Programmer's Manual"
+.TH SWAPLABEL 8 "April 2010" "util-linux" "System Administration"
.SH NAME
-swaplabel \- Print or change the label / UUID of a swap area
+swaplabel \- print or change the label or UUID of a swap area
.SH SYNOPSIS
.B swaplabel
.RB [ \-L
@@ -14,7 +14,7 @@ swaplabel \- Print or change the label / UUID of a swap area
.I device
.SH DESCRIPTION
.B swaplabel
-will display or change the label / UUID of a swap partition located on
+will display or change the label or UUID of a swap partition located on
.IR device
(or regular file).
.PP
diff --git a/fdisk/cfdisk.8 b/fdisk/cfdisk.8
index c6ea147..2798a7b 100644
--- a/fdisk/cfdisk.8
+++ b/fdisk/cfdisk.8
@@ -11,9 +11,9 @@
.\" permission notice identical to this one.
.\"
.\" " for hilit mode
-.TH CFDISK 8 "3 June 1995" "The BOGUS Linux Release" "Linux Programmer's Manual"
+.TH CFDISK 8 "July 2009" "util-linux" "System Administration"
.SH NAME
-cfdisk \- Curses based disk partition table manipulator for Linux
+cfdisk \- display or manipulate disk partition table
.SH SYNOPSIS
.B cfdisk
.RB [ \-agvz ]
@@ -28,7 +28,7 @@ cfdisk \- Curses based disk partition table manipulator for Linux
.RI [ device ]
.SH DESCRIPTION
.B cfdisk
-is a curses based program for partitioning any hard disk drive.
+is a curses-based program for partitioning any hard disk drive.
Typical values of the
.I device
argument are:
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index 66da000..2b12f34 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -1,9 +1,9 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" Copyright 1998 Andries E. Brouwer (aeb@xxxxxx)
.\" May be distributed under the GNU General Public License
-.TH FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
+.TH FDISK 8 "June 2010" "util-linux" "System Administration"
.SH NAME
-fdisk \- partition table manipulator for Linux
+fdisk \- manipulate disk partition table
.SH SYNOPSIS
.B fdisk
.RB [ \-uc ]
diff --git a/fsck/fsck.8 b/fsck/fsck.8
index 07eaaea..c10bcba 100644
--- a/fsck/fsck.8
+++ b/fsck/fsck.8
@@ -2,7 +2,7 @@
.\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH FSCK 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH FSCK 8 "February 2009" "util-linux" "System Administration"
.SH NAME
fsck \- check and repair a Linux filesystem
.SH SYNOPSIS
diff --git a/getopt/getopt.1 b/getopt/getopt.1
index 2e6fbda..a8e05ba 100644
--- a/getopt/getopt.1
+++ b/getopt/getopt.1
@@ -1,4 +1,4 @@
-.TH GETOPT 1 "May 31, 1997" Linux ""
+.TH GETOPT 1 "July 2009" "util-linux" "User Commands"
.SH NAME
getopt \- parse command options (enhanced)
.SH SYNOPSIS
diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8
index 5134403..4d6ab0a 100644
--- a/hwclock/hwclock.8
+++ b/hwclock/hwclock.8
@@ -1,4 +1,4 @@
-.TH HWCLOCK 8 "August 2011"
+.TH HWCLOCK 8 "August 2011" "util-linux" "System Administration"
.SH NAME
hwclock \- query or set the hardware clock (RTC)
.SH SYNOPSIS
diff --git a/libblkid/libblkid.3 b/libblkid/libblkid.3
index 4a5eaa9..a9291e2 100644
--- a/libblkid/libblkid.3
+++ b/libblkid/libblkid.3
@@ -5,7 +5,7 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Created Wed Sep 14 12:02:12 2001, Andreas Dilger
-.TH LIBBLKID 3 "May 2009" "util-linux"
+.TH LIBBLKID 3 "May 2009" "util-linux" "Programmer's Manual"
.SH NAME
libblkid \- block device identification library
.SH SYNOPSIS
diff --git a/login-utils/chfn.1 b/login-utils/chfn.1
index b27bec4..5329408 100644
--- a/login-utils/chfn.1
+++ b/login-utils/chfn.1
@@ -10,7 +10,7 @@
.\" $Revision: 1.1 $
.\" $Date: 1995/03/12 01:29:16 $
.\"
-.TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual"
+.TH CHFN 1 "July 2009" "util-linux" "User Commands"
.SH NAME
chfn \- change your finger information
.SH SYNOPSIS
diff --git a/login-utils/chsh.1 b/login-utils/chsh.1
index 90514b8..393ccb7 100644
--- a/login-utils/chsh.1
+++ b/login-utils/chsh.1
@@ -10,7 +10,7 @@
.\" $Revision: 1.1 $
.\" $Date: 1995/03/12 01:28:58 $
.\"
-.TH CHSH 1 "7 October 1998" "chsh" "Linux Reference Manual"
+.TH CHSH 1 "July 2009" "util-linux" "User Commands"
.SH NAME
chsh \- change your login shell
.SH SYNOPSIS
diff --git a/login-utils/last.1 b/login-utils/last.1
index 3e9faa4..beb6917 100644
--- a/login-utils/last.1
+++ b/login-utils/last.1
@@ -1,4 +1,4 @@
-.TH LAST 1 "20 March 1992"
+.TH LAST 1 "March 1992" "util-linux" "User Commands"
.SH NAME
last \(em indicate last logins by user or terminal
.SH SYNOPSIS
diff --git a/login-utils/login.1 b/login-utils/login.1
index 1db2ca8..80fb3b3 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH LOGIN 1 "4 November 1996" "Util-linux 1.6" "Linux Programmer's Manual"
+.TH LOGIN 1 "March 2009" "util-linux" "User Commands"
.SH NAME
login \- sign on
.SH SYNOPSIS
diff --git a/login-utils/newgrp.1 b/login-utils/newgrp.1
index 6226c15..bb5eb00 100644
--- a/login-utils/newgrp.1
+++ b/login-utils/newgrp.1
@@ -1,13 +1,13 @@
.\" Original author unknown. This man page is in the public domain.
.\" Modified Sat Oct 9 17:46:48 1993 by faith@xxxxxxxxxx
-.TH NEWGRP 1 "9 October 1993" "Linux 1.2" "Linux Programmer's Manual"
+.TH NEWGRP 1 "October 1993" "util-linux" "User Commands"
.SH NAME
newgrp \- log in to a new group
.SH SYNOPSIS
.B newgrp
.RI [ group ]
.SH DESCRIPTION
-.B Newgrp
+.B newgrp
changes the group identification of its caller, analogously to
.BR login (1).
The same person remains logged in, and the current directory
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index 299fbd4..c797afa 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -5,7 +5,7 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Based on uuidgen, Mon Sep 17 10:42:12 2000, Andreas Dilger
-.TH BLKID 8 "February 2011" "Linux" "MAINTENANCE COMMANDS"
+.TH BLKID 8 "February 2011" "util-linux" "System Administration"
.SH NAME
blkid \- locate/print block device attributes
.SH SYNOPSIS
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 953e82a..4d9b3d1 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -34,14 +34,15 @@
.\"
.\" @(#)cal.1 8.1 (Berkeley) 6/6/93
.\"
-.TH CAL "1" "June 2011" "util-linux" "User Commands"
+.TH CAL 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-cal \- displays a calendar
+cal \- display a calendar
.SH SYNOPSIS
.B cal
[\fIoptions\fR] [[[\fIday\fR] \fImonth\fR] \fIyear\fR]
.SH DESCRIPTION
-Cal displays a simple calendar. If arguments are not specified, the current
+.B cal
+displays a simple calendar. If no arguments are specified, the current
month is displayed.
.SH OPTIONS
.TP
diff --git a/misc-utils/chkdupexe.1 b/misc-utils/chkdupexe.1
index 279562e..dd3664a 100644
--- a/misc-utils/chkdupexe.1
+++ b/misc-utils/chkdupexe.1
@@ -24,7 +24,7 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\"
-.TH CHKDUPEXE 1 "11 Mar 1995" "" "Linux Programmer's Manual"
+.TH CHKDUPEXE 1 "March 1995" "util-linux" "User Commands"
.SH NAME
chkdupexe \- find duplicate executables
.SH SYNOPSIS
diff --git a/misc-utils/ddate.1 b/misc-utils/ddate.1
index b14e6b3..0b01e09 100644
--- a/misc-utils/ddate.1
+++ b/misc-utils/ddate.1
@@ -1,8 +1,8 @@
.\" All Rites Reversed. This file is in the PUBLIC DOMAIN.
.\" Kallisti.
-.TH DDATE 1 "59 Bureaucracy 3161" "" "Emperor Norton Utilities"
+.TH DDATE 1 "Bureaucracy 3161" "util-linux" "Emperor Norton User Command"
.SH NAME
-ddate \- converts Gregorian dates to Discordian dates
+ddate \- convert Gregorian dates to Discordian dates
.SH SYNOPSIS
.B ddate
.RI [ \fB+\fPformat]
diff --git a/misc-utils/findfs.8 b/misc-utils/findfs.8
index 92db09d..b754903 100644
--- a/misc-utils/findfs.8
+++ b/misc-utils/findfs.8
@@ -2,7 +2,7 @@
.\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH FINDFS 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH FINDFS 8 "February 2009" "util-linux" "System Administration"
.SH NAME
findfs \- find a filesystem by label or UUID
.SH SYNOPSIS
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 27d85c6..776bf66 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH FINDMNT 8 "Apr 2010" "Version 1.0"
+.TH FINDMNT 8 "April 2010" "util-linux" "System Administration"
.SH NAME
findmnt \- find a filesystem
.SH SYNOPSIS
diff --git a/misc-utils/kill.1 b/misc-utils/kill.1
index 07cbdae..09d30e9 100644
--- a/misc-utils/kill.1
+++ b/misc-utils/kill.1
@@ -1,7 +1,7 @@
.\" Copyright 1994 Salvatore Valente (svalente@xxxxxxx)
.\" Copyright 1992 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH KILL 1 "14 October 1994" "Linux Utilities" "Linux Programmer's Manual"
+.TH KILL 1 "February 2011" "util-linux" "User Commands"
.SH NAME
kill \- terminate a process
.SH SYNOPSIS
diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index af826ef..98a1a06 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -33,9 +33,9 @@
.\"
.\" Section on valid facility and level strings added by
.\" and1000@xxxxxxxxxx, 26 Oct 1997.
-.Dd June 6, 1993
+.Dd August 2011
.Dt LOGGER 1
-.Os BSD 4.3
+.Os util-linux
.Sh NAME
.Nm logger
.Nd a shell command interface to the syslog(3) system log module
diff --git a/misc-utils/look.1 b/misc-utils/look.1
index a6ab568..bed3d24 100644
--- a/misc-utils/look.1
+++ b/misc-utils/look.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)look.1 8.1 (Berkeley) 6/14/93
.\"
-.TH LOOK "1" "June 2011" "util-linux" "User Commands"
+.TH LOOK 1 "June 2011" "util-linux" "User Commands"
.SH NAME
look \- display lines beginning with a given string
.SH SYNOPSIS
diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 2fcc7e5..1e9b4cf 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH LSBLK 8 "Apr 2010" "Version 1.0"
+.TH LSBLK 8 "April 2010" "util-linux" "System Administration"
.SH NAME
lsblk \- list block devices
.SH SYNOPSIS
diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
index 8e97c18..88e249d 100644
--- a/misc-utils/namei.1
+++ b/misc-utils/namei.1
@@ -1,9 +1,9 @@
.\"
.\" Version 1.4 of namei
.\"
-.TH NAMEI 1 "Local"
+.TH NAMEI 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-namei - follow a pathname until a terminal point is found
+namei \- follow a pathname until a terminal point is found
.SH SYNOPSIS
.B namei
.RI [ options ]
diff --git a/misc-utils/rename.1 b/misc-utils/rename.1
index d2c3d14..0cfe381 100644
--- a/misc-utils/rename.1
+++ b/misc-utils/rename.1
@@ -1,7 +1,7 @@
.\" Written by Andries E. Brouwer (aeb@xxxxxx)
.\" Placed in the public domain
.\"
-.TH RENAME "1" "June 2011" "util-linux" "User Commands"
+.TH RENAME 1 "June 2011" "util-linux" "User Commands"
.SH NAME
rename \- rename files
.SH SYNOPSIS
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 60e0150..f1022fd 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH UUIDD "8" "June 2011" "util-linux" "System Administration Utilities"
+.TH UUIDD 8 "June 2011" "util-linux" "System Administration"
.SH NAME
uuidd \- UUID generation daemon
.SH SYNOPSIS
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index 92dc2d4..6349b3a 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -5,9 +5,9 @@
.\" This file may be copied under the terms of the GNU Public License.
.\"
.\" Created Wed Mar 10 17:42:12 1999, Andreas Dilger
-.TH UUIDGEN "1" "June 2011" "util-linux" "User Commands"
+.TH UUIDGEN 1 "June 2011" "util-linux" "User Commands"
.SH NAME
-uuidgen \- command\-line utility to create a new UUID value
+uuidgen \- create a new UUID value
.SH SYNOPSIS
.B uuidgen
[\fIoptions\fR]
diff --git a/misc-utils/whereis.1 b/misc-utils/whereis.1
index 57bfb0b..dbf8d2f 100644
--- a/misc-utils/whereis.1
+++ b/misc-utils/whereis.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)whereis.1 from UCB 4.2
-.TH WHEREIS 1 "8 May 1994"
+.TH WHEREIS 1 "July 2009" "util-linux" "User Commands"
.SH NAME
whereis \- locate the binary, source, and manual page files for a command
.SH SYNOPSIS
diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index 00a406d..1f3d996 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -2,7 +2,7 @@
.\" Copyright 2009 by Karel Zak. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
.\"
-.TH WIPEFS 8 "October 2009" "Linux" "MAINTENANCE COMMANDS"
+.TH WIPEFS 8 "October 2009" "util-linux" "System Administration"
.SH NAME
wipefs \- wipe a filesystem signature from a device
.SH SYNOPSIS
diff --git a/mount/fstab.5 b/mount/fstab.5
index 09bcb38..b0cd763 100644
--- a/mount/fstab.5
+++ b/mount/fstab.5
@@ -40,7 +40,7 @@
.\" Tue Jun 15 20:02:18 1999: added LABEL and UUID
.\" Sat Jul 14 2001: Michael K. Johnson <johnsonm@xxxxxxxxxx> added -O
.\"
-.TH FSTAB 5 "August 2010" "Linux 2.6" "Linux Programmer's Manual"
+.TH FSTAB 5 "August 2010" "util-linux" "File Formats"
.SH NAME
fstab \- static information about the filesystems
.SH SYNOPSIS
diff --git a/mount/losetup.8 b/mount/losetup.8
index d329c91..f1db80b 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
@@ -1,4 +1,4 @@
-.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
+.TH LOSETUP 8 "July 2003" "util-linux" "System Administration"
.SH NAME
losetup \- set up and control loop devices
.SH SYNOPSIS
diff --git a/mount/mount.8 b/mount/mount.8
index b1666cb..e403c1a 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -39,7 +39,7 @@
.\" 010725, Nikita Danilov <NikitaDanilov@xxxxxxxxx>: reiserfs options
.\" 011124, Karl Eichwalder <ke@xxxxxxxxxxxxxx>: tmpfs options
.\"
-.TH MOUNT 8 "2004-12-16" "Linux 2.6" "Linux Programmer's Manual"
+.TH MOUNT 8 "December 2004" "util-linux" "System Administration"
.SH NAME
mount \- mount a filesystem
.SH SYNOPSIS
diff --git a/mount/swapon.8 b/mount/swapon.8
index 709443c..ee6a2fc 100644
--- a/mount/swapon.8
+++ b/mount/swapon.8
@@ -38,7 +38,7 @@
.\" Mon Sep 25 14:12:38 1995: Added -v and -p information
.\" Tue Apr 30 03:32:07 1996: Added some text from A. Koppenhoefer
.\"
-.TH SWAPON 8 "25 September 1995" "Linux 1.x" "Linux Programmer's Manual"
+.TH SWAPON 8 "September 1995" "util-linux" "System Administration"
.SH NAME
swapon, swapoff \- enable/disable devices and files for paging and swapping
.SH SYNOPSIS
diff --git a/mount/umount.8 b/mount/umount.8
index 4bce485..934fb00 100644
--- a/mount/umount.8
+++ b/mount/umount.8
@@ -23,7 +23,7 @@
.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
.\" USA.
.\"
-.TH UMOUNT 8 "26 July 1997" "Linux 2.0" "Linux Programmer's Manual"
+.TH UMOUNT 8 "March 2010" "util-linux" "System Administration"
.SH NAME
umount \- unmount file systems
.SH SYNOPSIS
diff --git a/partx/addpart.8 b/partx/addpart.8
index 1c92809..9dcd0a3 100644
--- a/partx/addpart.8
+++ b/partx/addpart.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 Karel Zak <kzak@xxxxxxxxxx>
.\" Copyright 2007 Red Hat, Inc.
.\" May be distributed under the GNU General Public License
-.TH ADDPART 8 "11 Jan 2007"
+.TH ADDPART 8 "January 2007" "util-linux" "System Administration"
.SH NAME
addpart \-
simple wrapper around the "add partition" ioctl
diff --git a/partx/delpart.8 b/partx/delpart.8
index 7f35fb9..433582f 100644
--- a/partx/delpart.8
+++ b/partx/delpart.8
@@ -2,7 +2,7 @@
.\" Copyright 2007 Karel Zak <kzak@xxxxxxxxxx>
.\" Copyright 2007 Red Hat, Inc.
.\" May be distributed under the GNU General Public License
-.TH DELPART 8 "11 Jan 2007"
+.TH DELPART 8 "January 2007" "util-linux" "System Administration"
.SH NAME
delpart \-
simple wrapper around the "del partition" ioctl
diff --git a/partx/partx.8 b/partx/partx.8
index c680d51..4129d78 100644
--- a/partx/partx.8
+++ b/partx/partx.8
@@ -3,7 +3,7 @@
.\" Copyright 2007 Red Hat, Inc.
.\" Copyright 2010 Davidlohr Bueso <dave@xxxxxxx>
.\" May be distributed under the GNU General Public License
-.TH PARTX 8 "1 Feb 2011"
+.TH PARTX 8 "February 2011" "util-linux" "System Administration"
.SH NAME
partx \-
tell the Linux kernel about the presence and numbering of on-disk partitions
diff --git a/schedutils/chrt.1 b/schedutils/chrt.1
index e7f2c3e..eb3e90b 100644
--- a/schedutils/chrt.1
+++ b/schedutils/chrt.1
@@ -25,9 +25,9 @@
.\" 2002-05-11 Robert Love <rml@xxxxxxxxx>
.\" Initial version
.\"
-.TH CHRT "1" "June 2010" "schedutils" "Linux User's Manual"
+.TH CHRT 1 "June 2010" "util-linux" "User Commands"
.SH NAME
-chrt \- manipulate real-time attributes of a process
+chrt \- manipulate the real-time attributes of a process
.SH SYNOPSIS
.B chrt
.RI [ options ]\ prio
@@ -39,7 +39,7 @@ chrt \- manipulate real-time attributes of a process
.RI [ prio ]\ pid
.SH DESCRIPTION
.PP
-.BR chrt
+.B chrt
sets or retrieves the real-time scheduling attributes of an existing \fIpid\fR,
or runs \fIcommand\fR with the given attributes. Both policy (one of
.BR SCHED_OTHER ,
diff --git a/schedutils/ionice.1 b/schedutils/ionice.1
index c6f0b47..acf6c92 100644
--- a/schedutils/ionice.1
+++ b/schedutils/ionice.1
@@ -1,6 +1,6 @@
-.TH IONICE "1" "July 2011" "util-linux" "User Commands"
+.TH IONICE 1 "July 2011" "util-linux" "User Commands"
.SH NAME
-ionice \- sets or gets process I/O scheduling class and priority
+ionice \- set or get process I/O scheduling class and priority
.SH SYNOPSIS
.B ionice
[[ \fB\-c\fR
diff --git a/schedutils/taskset.1 b/schedutils/taskset.1
index 9300fb3..8917c66 100644
--- a/schedutils/taskset.1
+++ b/schedutils/taskset.1
@@ -25,7 +25,7 @@
.\" 2002-05-11 Robert Love <rml@xxxxxxxxx>
.\" Initial version
.\"
-.TH TASKSET "1" "Apr 2003" "schedutils" "Linux User's Manual"
+.TH TASKSET 1 "April 2003" "util-linux" "User Commands"
.SH NAME
taskset \- retrieve or set a process's CPU affinity
.SH SYNOPSIS
@@ -39,7 +39,7 @@ taskset \- retrieve or set a process's CPU affinity
.RI [ mask ]\ pid
.SH DESCRIPTION
.PP
-.BR taskset
+.B taskset
is used to set or retrieve the CPU affinity of a running process given its PID
or to launch a new COMMAND with a given CPU affinity. CPU affinity is a
scheduler property that "bonds" a process to a given set of CPUs on the system.
diff --git a/sys-utils/arch.1 b/sys-utils/arch.1
index 81b6b1e..96cbc0a 100644
--- a/sys-utils/arch.1
+++ b/sys-utils/arch.1
@@ -1,18 +1,18 @@
.\" arch.1 --
.\" Copyright 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" Public domain: may be freely distributed.
-.TH ARCH 1 "4 July 1997" "Linux 2.0" "Linux Programmer's Manual"
+.TH ARCH 1 "July 1997" "util-linux" "User Commands"
.SH NAME
arch \- print machine architecture
.SH SYNOPSIS
.B arch
.SH DESCRIPTION
.B arch
-is deprecated command since release util-linux 2.13. Use
-.BR "uname -m"
+is a deprecated command since util-linux 2.13. Use
+.B "uname -m"
or use
-.BR arch
-from the coreutils package.
+.B arch
+from the GNU coreutils package.
On current Linux systems,
.B arch
diff --git a/sys-utils/ctrlaltdel.8 b/sys-utils/ctrlaltdel.8
index bf006e3..4238d98 100644
--- a/sys-utils/ctrlaltdel.8
+++ b/sys-utils/ctrlaltdel.8
@@ -1,6 +1,6 @@
.\" Copyright 1992, 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH CTRLALTDEL 8 "25 October 1993" "Linux 1.2" "Linux Programmer's Manual"
+.TH CTRLALTDEL 8 "October 1993" "util-linux" "System Administration"
.SH NAME
ctrlaltdel \- set the function of the Ctrl-Alt-Del combination
.SH SYNOPSIS
diff --git a/sys-utils/cytune.8 b/sys-utils/cytune.8
index a1235b1..8a21775 100644
--- a/sys-utils/cytune.8
+++ b/sys-utils/cytune.8
@@ -24,9 +24,9 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\" "
-.TH CYTUNE 8 " 4 Mar 1995" "" "Linux Programmer's Manual"
+.TH CYTUNE 8 "March 1995" "util-linux" "System Administration"
.SH NAME
-cytune \- Tune driver parameters for Cyclades-Z multiport serial card
+cytune \- tune driver parameters for Cyclades-Z multiport serial card
.SH SYNOPSIS
.B cytune
.RB [ \-q
diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1
index 4531edb..3dc18cb 100644
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH DMESG 1 "Jul 2011"
+.TH DMESG 1 "July 2011" "util-linux" "User Commands"
.SH NAME
dmesg \- print or control the kernel ring buffer
.SH SYNOPSIS
diff --git a/sys-utils/fallocate.1 b/sys-utils/fallocate.1
index 003cb55..2020437 100644
--- a/sys-utils/fallocate.1
+++ b/sys-utils/fallocate.1
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
-.TH FALLOCATE 1 "Jul 2009" "Version 1.0"
+.TH FALLOCATE 1 "July 2009" "util-linux" "User Commands"
.SH NAME
-fallocate \- preallocate space to a file.
+fallocate \- preallocate space to a file
.SH SYNOPSIS
.B fallocate
.RB [ \-n ]
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 55be5d8..3d7e10c 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -24,9 +24,9 @@
.\" OTHER DEALINGS IN THE SOFTWARE.
.\"
.\" -----------------------------------------------------------------------
-.TH FLOCK "1" "4 Feb 2006" "flock utility" "H. Peter Anvin"
+.TH FLOCK 1 "February 2006" "util-linux" "User Commands"
.SH NAME
-flock \- Manage locks from shell scripts
+flock \- manage locks from shell scripts
.SH SYNOPSIS
\fBflock\fP [\fB\-sxon\fP] [\fB\-w\fP \fItimeout\fP] \fIlockfile\fP [\fB\-c\fP] \fIcommand...\fP
.PP
diff --git a/sys-utils/fsfreeze.8 b/sys-utils/fsfreeze.8
index a10c053..7693861 100644
--- a/sys-utils/fsfreeze.8
+++ b/sys-utils/fsfreeze.8
@@ -1,14 +1,12 @@
.\" -*- nroff -*-
-.TH FSFREEZE 8 "May 2010"
+.TH FSFREEZE 8 "May 2010" "util-linux" "System Administration"
.SH NAME
-fsfreeze \- suspend access to an filesystem (Linux Ext3/4, ReiserFS, JFS, XFS).
+fsfreeze \- suspend access to a filesystem (Linux Ext3/4, ReiserFS, JFS, XFS)
.SH SYNOPSIS
-.B fsfreeze
-.RB \-f
+.B fsfreeze \-f
.I mountpoint
-.B fsfreeze
-.RB \-u
+.B fsfreeze \-u
.I mountpoint
.SH DESCRIPTION
diff --git a/sys-utils/fstrim.8 b/sys-utils/fstrim.8
index 1bca53b..18b5eaf 100644
--- a/sys-utils/fstrim.8
+++ b/sys-utils/fstrim.8
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH FSTRIM 8 "Nov 2010"
+.TH FSTRIM 8 "November 2010" "util-linux" "System Administration"
.SH NAME
fstrim \- discard unused blocks on a mounted filesystem
.SH SYNOPSIS
diff --git a/sys-utils/ipcmk.1 b/sys-utils/ipcmk.1
index afeacaf..eada9bb 100644
--- a/sys-utils/ipcmk.1
+++ b/sys-utils/ipcmk.1
@@ -1,6 +1,6 @@
.\" Copyright 2008 Hayden A. James (hayden.james@xxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH "IPCMK" "1" "21 March 2008" "ipcmk" "Linux Programmer's Manual"
+.TH IPCMK 1 "March 2008" "util-linux" "User Commands"
.SH "NAME"
ipcmk \- create various ipc resources
.SH "SYNOPSIS"
diff --git a/sys-utils/ipcrm.1 b/sys-utils/ipcrm.1
index 7806f6f..d555745 100644
--- a/sys-utils/ipcrm.1
+++ b/sys-utils/ipcrm.1
@@ -1,6 +1,6 @@
.\" Copyright 2002 Andre C. Mazzone (linuxdev@xxxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH IPCRM 1 "last change: 19 March 2002" "ipcrm" "Linux Programmer's Manual"
+.TH IPCRM 1 "March 2002" "util-linux" "User Commands"
.SH NAME
ipcrm \- remove a message queue, semaphore set or shared memory id
.SH SYNOPSIS
diff --git a/sys-utils/ipcs.1 b/sys-utils/ipcs.1
index 76e50ac..652c0f3 100644
--- a/sys-utils/ipcs.1
+++ b/sys-utils/ipcs.1
@@ -1,6 +1,6 @@
.\" Copyright 1993 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH IPCS 1 "9 October 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH IPCS 1 "February 2008" "util-linux" "User Commands"
.SH NAME
ipcs \- provide information on ipc facilities
.SH SYNOPSIS
diff --git a/sys-utils/ldattach.8 b/sys-utils/ldattach.8
index 7e57fec..8ce14f3 100644
--- a/sys-utils/ldattach.8
+++ b/sys-utils/ldattach.8
@@ -1,6 +1,6 @@
.\" Copyright 2008 Tilman Schmidt (tilman@xxxxxxx)
.\" May be distributed under the GNU General Public License version 2 or later
-.TH LDATTACH 8 "14 February 2010" "Linux 2.6" "Linux Programmer's Manual"
+.TH LDATTACH 8 "February 2010" "util-linux" "System Administration"
.SH NAME
ldattach \- attach a line discipline to a serial line
.SH SYNOPSIS
diff --git a/sys-utils/lscpu.1 b/sys-utils/lscpu.1
index 4795e91..056e7a9 100644
--- a/sys-utils/lscpu.1
+++ b/sys-utils/lscpu.1
@@ -1,9 +1,9 @@
.\" Process this file with
.\" groff -man -Tascii lscpu.1
.\"
-.TH LSCPU 1 "February 2011" Linux "User Manuals"
+.TH LSCPU 1 "February 2011" "util-linux" "User Commands"
.SH NAME
-lscpu \- CPU architecture information helper
+lscpu \- display information on CPU architecture
.SH SYNOPSIS
.B lscpu
.RB [ \-hpx ]
diff --git a/sys-utils/mountpoint.1 b/sys-utils/mountpoint.1
index be17c42..3c7d084 100644
--- a/sys-utils/mountpoint.1
+++ b/sys-utils/mountpoint.1
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MOUNTPOINT 1 "June 2011"
+.TH MOUNTPOINT 1 "June 2011" "util-linux" "User Commands"
.SH NAME
mountpoint \- see if a directory is a mountpoint
.SH SYNOPSIS
diff --git a/sys-utils/pivot_root.8 b/sys-utils/pivot_root.8
index 50c1768..2260957 100644
--- a/sys-utils/pivot_root.8
+++ b/sys-utils/pivot_root.8
@@ -1,6 +1,6 @@
-.TH PIVOT_ROOT 8 "Feb 23, 2000" "Linux" "Maintenance Commands"
+.TH PIVOT_ROOT 8 "February 2000" "util-linux" "System Administration"
.SH NAME
-pivot_root \- change the root file system
+pivot_root \- change the root filesystem
.SH SYNOPSIS
.B pivot_root
.I new_root put_old
diff --git a/sys-utils/readprofile.1 b/sys-utils/readprofile.1
index a1ae951..0be5dca 100644
--- a/sys-utils/readprofile.1
+++ b/sys-utils/readprofile.1
@@ -1,7 +1,7 @@
-.TH READPROFILE 1 "May 1996"
+.TH READPROFILE 1 "May 1996" "util-linux" "User Commands"
.UC 4
.SH NAME
-readprofile - a tool to read kernel profiling information
+readprofile - read kernel profiling information
.SH SYNOPSIS
.B readprofile
.RI [ options ]
diff --git a/sys-utils/renice.1 b/sys-utils/renice.1
index a06f549..f283645 100644
--- a/sys-utils/renice.1
+++ b/sys-utils/renice.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)renice.8 8.1 (Berkeley) 6/9/93
.\"
-.Dd June 9, 1993
+.Dd November 2010
.Dt RENICE 1
-.Os BSD 4
+.Os util-linux
.Sh NAME
.Nm renice
.Nd alter priority of running processes
diff --git a/sys-utils/rtcwake.8 b/sys-utils/rtcwake.8
index 8bfd90d..a536f32 100644
--- a/sys-utils/rtcwake.8
+++ b/sys-utils/rtcwake.8
@@ -16,7 +16,7 @@
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
.\" 02110-1301, USA.
.\"
-.TH rtcwake 8 "2007-07-13" "" "Linux Programmer's Manual"
+.TH RTCWAKE 8 "July 2007" "util-linux" "System Administration"
.SH NAME
rtcwake - enter a system sleep state until specified wakeup time
.SH SYNOPSIS
diff --git a/sys-utils/setarch.8 b/sys-utils/setarch.8
index 4bb2b03..0764a45 100644
--- a/sys-utils/setarch.8
+++ b/sys-utils/setarch.8
@@ -1,4 +1,4 @@
-.TH SETARCH 8 "Jun 2007" setarch "Linux Programmer's Manual"
+.TH SETARCH 8 "June 2007" "util-linux" "System Administration"
.SH NAME
setarch \- change reported architecture in new program environment and set personality flags
.SH SYNOPSIS
diff --git a/sys-utils/setsid.1 b/sys-utils/setsid.1
index 7a14da3..0d9580e 100644
--- a/sys-utils/setsid.1
+++ b/sys-utils/setsid.1
@@ -1,7 +1,7 @@
.\" Rick Sladkey <jrs@xxxxxxxxxxxxx>
.\" In the public domain.
.\" Path modifications by faith@xxxxxxxxxx
-.TH SETSID 1 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH SETSID 1 "November 1993" "util-linux" "User Commands"
.SH NAME
setsid \- run a program in a new session
.SH SYNOPSIS
diff --git a/sys-utils/switch_root.8 b/sys-utils/switch_root.8
index 0f0f9e5..34ab0d0 100644
--- a/sys-utils/switch_root.8
+++ b/sys-utils/switch_root.8
@@ -1,7 +1,7 @@
.\" Karel Zak <kzak@xxxxxxxxxx>
-.TH SWITCH_ROOT 8 "June 2009" "Linux"
+.TH SWITCH_ROOT 8 "June 2009" "util-linux" "System Administration"
.SH NAME
-switch_root \- switch to another filesystem as the root of the mount tree.
+switch_root \- switch to another filesystem as the root of the mount tree
.SH SYNOPSIS
.B switch_root
.RB [ \-hV ]
diff --git a/sys-utils/tunelp.8 b/sys-utils/tunelp.8
index 9ed4452..8a7049b 100644
--- a/sys-utils/tunelp.8
+++ b/sys-utils/tunelp.8
@@ -5,7 +5,7 @@
.\" Public license for conditions under which this file may be redistributed.
.\"
.\" Polished a bit - aeb
-.TH tunelp 8 "7 May 1999" "tunelp" "Linux Programmer's Manual"
+.TH TUNELP 8 "May 1999" "util-linux" "System Administration"
.SH NAME
tunelp \- set various parameters for the lp device
.SH SYNOPSIS
diff --git a/sys-utils/unshare.1 b/sys-utils/unshare.1
index d27c35e..5ee03ee 100644
--- a/sys-utils/unshare.1
+++ b/sys-utils/unshare.1
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii lscpu.1
.\"
-.TH UNSHARE 1 "OCTOBER 2008" Linux "User Manuals"
+.TH UNSHARE 1 "October 2008" "util-linux" "User Commands"
.SH NAME
unshare \- run program with some namespaces unshared from parent
.SH SYNOPSIS
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index c43f456..4083291 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -1,4 +1,4 @@
-.TH AGETTY 8
+.TH AGETTY 8 "May 2011" "util-linux" "System Administration"
.SH NAME
agetty \- alternative Linux getty
diff --git a/term-utils/mesg.1 b/term-utils/mesg.1
index 5b0ed43..f7e2f3d 100644
--- a/term-utils/mesg.1
+++ b/term-utils/mesg.1
@@ -36,7 +36,7 @@
.\"
.\"
.\" "
-.TH MESG 1 "10 March 1995" "Linux 1.2" "Linux Programmer's Manual"
+.TH MESG 1 "April 2011" "util-linux" "User Commands"
.SH NAME
mesg \- display (do not display) messages from other users
.SH SYNOPSIS
diff --git a/term-utils/reset.1 b/term-utils/reset.1
index 1e2f0f3..fdf67e2 100644
--- a/term-utils/reset.1
+++ b/term-utils/reset.1
@@ -1,6 +1,6 @@
.\" Copyright 1992 Rickard E. Faith (faith@xxxxxxxxxx)
.\" May be distributed under the GNU General Public License
-.TH RESET 1 "10 October 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH RESET 1 "October 1993" "util-linux" "User Commands"
.SH NAME
reset \- reset the terminal
.SH SYNOPSIS
diff --git a/term-utils/script.1 b/term-utils/script.1
index 5f96b9c..e111d08 100644
--- a/term-utils/script.1
+++ b/term-utils/script.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)script.1 6.5 (Berkeley) 7/27/91
.\"
-.Dd Feb 20, 2011
+.Dd February 2011
.Dt SCRIPT 1
-.Os Linux
+.Os util-linux
.Sh NAME
.Nm script
.Nd make typescript of terminal session
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index 5610eb1..184ff19 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -138,7 +138,7 @@
.\" ======================================================================
.\"
.IX Title "REPLAY 1"
-.TH REPLAY 1 "perl v5.6.0" "2001-09-03" "User Contributed Perl Documentation"
+.TH REPLAY 1 "September 2001" "util-linux" "User Commands"
.UC
.SH "NAME"
scriptreplay \- play back typescripts, using timing information
diff --git a/term-utils/setterm.1 b/term-utils/setterm.1
index e5b3bb4..3eac348 100644
--- a/term-utils/setterm.1
+++ b/term-utils/setterm.1
@@ -8,7 +8,7 @@
.\" Undocumented: -snow, -softscroll, -standout; these are
.\" commented out in the source
.\"
-.TH SETTERM 1 "7 January 2000" "Util-Linux 2.10" "Linux Programmer's Manual"
+.TH SETTERM 1 "January 2000" "util-linux" "User Commands"
.SH NAME
setterm \- set terminal attributes
.SH SYNOPSIS
diff --git a/term-utils/wall.1 b/term-utils/wall.1
index b3b2aa5..541a8d0 100644
--- a/term-utils/wall.1
+++ b/term-utils/wall.1
@@ -33,9 +33,9 @@
.\"
.\" Modified for Linux, Mon Mar 8 18:07:38 1993, faith@xxxxxxxxxx
.\"
-.Dd March 8, 1993
+.Dd April 2011
.Dt WALL 1
-.Os "Linux 0.99"
+.Os util-linux
.Sh NAME
.Nm wall
.Nd write a message to users
diff --git a/term-utils/write.1 b/term-utils/write.1
index 1c15f50..b606575 100644
--- a/term-utils/write.1
+++ b/term-utils/write.1
@@ -36,7 +36,7 @@
.\"
.\" Modified for Linux, Sun Mar 12 10:21:01 1995, faith@xxxxxxxxxx
.\"
-.TH WRITE 1 "12 March 1995" "" "Linux Programmer's Manual"
+.TH WRITE 1 "March 1995" "util-linux" "User Commands"
.SH NAME
write \- send a message to another user
.SH SYNOPSIS
diff --git a/text-utils/col.1 b/text-utils/col.1
index fab02d6..d9879d5 100644
--- a/text-utils/col.1
+++ b/text-utils/col.1
@@ -34,9 +34,9 @@
.\"
.\" @(#)col.1 6.8 (Berkeley) 6/17/91
.\"
-.Dd June 17, 1991
+.Dd May 2011
.Dt COL 1
-.Os
+.Os util-linux
.Sh NAME
.Nm col
.Nd filter reverse line feeds from input
diff --git a/text-utils/colcrt.1 b/text-utils/colcrt.1
index b079a38..e65c8e9 100644
--- a/text-utils/colcrt.1
+++ b/text-utils/colcrt.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)colcrt.1 8.1 (Berkeley) 6/30/93
.\"
-.Dd June 30, 1993
+.Dd May 2011
.Dt COLCRT 1
-.Os BSD 3
+.Os util-linux
.Sh NAME
.Nm colcrt
.Nd filter nroff output for CRT previewing
diff --git a/text-utils/colrm.1 b/text-utils/colrm.1
index 04a41b1..38c4f4e 100644
--- a/text-utils/colrm.1
+++ b/text-utils/colrm.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)colrm.1 6.6 (Berkeley) 3/14/91
.\"
-.Dd March 14, 1991
+.Dd May 2011
.Dt COLRM 1
-.Os BSD 3
+.Os util-linux
.Sh NAME
.Nm colrm
.Nd remove columns from a file
diff --git a/text-utils/column.1 b/text-utils/column.1
index ebeb1e3..2050666 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)column.1 8.1 (Berkeley) 6/6/93
.\"
-.TH COLUMN 1 "Local"
+.TH COLUMN 1 "October 2010" "util-linux" "User Commands"
.SH NAME
column - columnate lists
.SH SYNOPSIS
@@ -39,9 +39,11 @@ column - columnate lists
.RI [ options ]
.IR file ...
.SH DESCRIPTION
-The column utility formats its input into multiple columns. Rows
-are filled before columns. Input is taken from file or, by
-default, from the standard input. Empty lines are ignored.
+The
+.B column
+utility formats its input into multiple columns. Rows
+are filled before columns. Input is taken from \fIfile\fR or, by
+default, from standard input. Empty lines are ignored.
.PP
.SH OPTIONS
.IP "\fB\-c, \-\-columns\fP \fIwidth\fP"
diff --git a/text-utils/hexdump.1 b/text-utils/hexdump.1
index a5e2a8c..20dbad2 100644
--- a/text-utils/hexdump.1
+++ b/text-utils/hexdump.1
@@ -31,9 +31,9 @@
.\"
.\" from: @(#)hexdump.1 8.2 (Berkeley) 4/18/94
.\"
-.Dd April 18, 1994
+.Dd July 2009
.Dt HEXDUMP 1
-.Os
+.Os util-linux
.Sh NAME
.Nm hexdump
.Nd ascii, decimal, hexadecimal, octal dump
diff --git a/text-utils/line.1 b/text-utils/line.1
index 1cd0aa7..6305f6b 100644
--- a/text-utils/line.1
+++ b/text-utils/line.1
@@ -1,12 +1,12 @@
.\" This page is in the public domain
-.TH LINE 1 "2002-07-07" "" "User Commands"
+.TH LINE 1 "July 2002" "util-linux" "User Commands"
.SH NAME
line \- read one line
.SH SYNOPSIS
.B line
.SH DESCRIPTION
The utility
-.I line
+.B line
copies one line (up to a newline) from standard input to standard output.
It always prints at least a newline and returns an exit status of 1
on EOF or read error.
diff --git a/text-utils/more.1 b/text-utils/more.1
index 1c9a513..73f65a0 100644
--- a/text-utils/more.1
+++ b/text-utils/more.1
@@ -37,9 +37,9 @@
.\" conform with the more 5.19 currently in use by the Linux community.
.\"
.\" .Dd July 29, 1991 (Modified December 25, 1992)
-.Dd December 25, 1992
+.Dd February 2011
.Dt MORE 1
-.Os "Linux 0.98"
+.Os util-linux
.Sh NAME
.Nm more
.Nd file perusal filter for crt viewing
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 853e5af..22b05f5 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -1,5 +1,5 @@
.\" @(#)pg.1 1.7 (gritter) 4/25/01
-.TH PG 1 "2001-04-25" "Gunnar Ritter" "User Commands"
+.TH PG 1 "April 2001" "util-linux" "User Commands"
.SH NAME
pg \- browse pagewise through text files
.SH SYNOPSIS
@@ -12,7 +12,7 @@ pg \- browse pagewise through text files
.RB [ +/\fIpattern\fP/ ]
.RI [ file ...]
.SH DESCRIPTION
-.I Pg
+.B pg
displays a text file on a
.SM CRT
one screenful at once.
diff --git a/text-utils/rev.1 b/text-utils/rev.1
index db0eecb..7dc6804 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
@@ -33,9 +33,9 @@
.\" Modified for Linux by Charles Hannum (mycroft@xxxxxxxxxxxxxx)
.\" and Brian Koehmstedt (bpk@xxxxxxxxxxxxxx)
.\"
-.Dd March 21, 1992
+.Dd April 2011
.Dt REV 1
-.Os
+.Os util-linux
.Sh NAME
.Nm rev
.Nd reverse lines of a file or files
diff --git a/text-utils/tailf.1 b/text-utils/tailf.1
index e7c9526..d64d2ca 100644
--- a/text-utils/tailf.1
+++ b/text-utils/tailf.1
@@ -22,7 +22,7 @@
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\"
-.TH TAILF 1 "13 February 2003" "" "Linux Programmer's Manual"
+.TH TAILF 1 "February 2003" "util-linux" "User Commands"
.SH NAME
tailf \- follow the growth of a log file
.SH SYNOPSIS
diff --git a/text-utils/ul.1 b/text-utils/ul.1
index 7992d72..6d93531 100644
--- a/text-utils/ul.1
+++ b/text-utils/ul.1
@@ -31,9 +31,9 @@
.\"
.\" @(#)ul.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd June 6, 1993
+.Dd August 2011
.Dt UL 1
-.Os BSD 4
+.Os util-linux
.Sh NAME
.Nm ul
.Nd do underlining
--
1.7.0.4
From 26b6869d1215b37200cf209e1454bac0a596f9d7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 19 Aug 2011 22:14:37 +0200
Subject: [PATCH 2/6] uuidd: (man page) repair the snipped up description of option -T
Also use lower case and no equals sign for option arguments,
return to using normal formatting macros, and indent the example.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/uuidd.8 | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index f1022fd..6df4ee5 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -7,7 +7,7 @@
uuidd \- UUID generation daemon
.SH SYNOPSIS
.B uuidd
-[\fIoptions\fR]
+.RI [ options ]
.SH DESCRIPTION
The
.B uuidd
@@ -17,65 +17,65 @@ in a secure and guaranteed-unique fashion, even in the face of large
numbers of threads running on different CPUs trying to grab UUIDs.
.SH OPTIONS
.TP
-\fB\-p\fR, \fB\-\-pid\fR=\fIPATH\fR
+.BR \-p , " \-\-pid " \fIpath\fR
Specify the pathname where the pid file should be written. By default,
the pid file is written to /var/run/uuidd/uuidd.pid.
.TP
-\fB\-s\fR, \fB\-\-socket\fR=\fIPATH\fR
+.BR \-s , " \-\-socket " \fIpath\fR
Specify the pathname used for the unix-domain socket used by uuidd. By
default, the pathname used is /var/run/uuidd/request. This is primarily
for debugging purposes, since the pathname is hard-coded in the libuuid
library.
.TP
-\fB\-T\fR, \fB\-\-timeout\fR=\fISEC\fR
+.BR \-T , " \-\-timeout " \fItimeout\fR
Specify a timeout for uuidd. If specified, then uuidd will exit after
+.I timeout
+seconds of inactivity.
.TP
-\fB\-k\fR, \fB\-\-kill\fR
+.BR \-k , " \-\-kill "
If currently a uuidd daemon is running, kill it.
.TP
-\fB\-r\fR, \fB\-\-random\fR
+.BR \-r , " \-\-random "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a random-based UUID.
.TP
-\fB\-t\fR, \fB\-\-time\fR
+.BR \-t , " \-\-time "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a time-based UUID.
.TP
-\fB\-n\fR, \fB\-\-uuids\fR=\fINUM\fR
+.BR \-n , " \-\-uuids " \fInumber\fR
When issuing a test request to a running uuidd, request a bulk response
of
.I number
UUIDs.
.TP
.B \-d
-Run
-.B uuidd
-in debugging mode. This prevents uuidd from running as a daemon.
+Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
.TP
.BI \-q
Suppress some failure messages.
-.I timeout
-seconds of inactivity.
.TP
-\fB\-V\fR, \fB\-\-version\fR
+.BR \-V , " \-\-version "
Output version information and exit.
.TP
-\fB\-h\fR, \fB\-\-help\fR
+.BR \-h , " \-\-help "
Display help screen and exit.
.SH EXAMPLE
-Start up a daemon, print few keys and at the end stop the daemon.
+Start up a daemon, print 42 random keys, and then stop the daemon.
.PP
+.RS
.nf
uuidd -p /tmp/uuidd.pid -s /tmp/uuidd.socket
uuidd -d -r -n 42 -s /tmp/uuidd.socket
uuidd -d -k -s /tmp/uuidd.socket
.nf
+.RE
.SH AUTHOR
The
.B uuidd
daemon was written by Theodore Ts'o <tytso@xxxxxxx>.
.SH AVAILABILITY
-uuidd is part of the util-linux package and is available from
+The uuidd daemon is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
.SH "SEE ALSO"
.BR uuid (3),
--
1.7.0.4
From 1a3ae418f8912afe937ea81c026325e6bef5d2a5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 19 Aug 2011 22:24:02 +0200
Subject: [PATCH 3/6] uuidd: (man page) alphabetize the options
---
misc-utils/uuidd.8 | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 6df4ee5..8e82b10 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -17,10 +17,32 @@ in a secure and guaranteed-unique fashion, even in the face of large
numbers of threads running on different CPUs trying to grab UUIDs.
.SH OPTIONS
.TP
+.B \-d
+Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
+.TP
+.BR \-h , " \-\-help "
+Display help screen and exit.
+.TP
+.BR \-k , " \-\-kill "
+If currently a uuidd daemon is running, kill it.
+.TP
+.BR \-n , " \-\-uuids " \fInumber\fR
+When issuing a test request to a running uuidd, request a bulk response
+of
+.I number
+UUIDs.
+.TP
.BR \-p , " \-\-pid " \fIpath\fR
Specify the pathname where the pid file should be written. By default,
the pid file is written to /var/run/uuidd/uuidd.pid.
.TP
+.B \-q
+Suppress some failure messages.
+.TP
+.BR \-r , " \-\-random "
+Test uuidd by trying to connect to a running uuidd daemon and
+request it to return a random-based UUID.
+.TP
.BR \-s , " \-\-socket " \fIpath\fR
Specify the pathname used for the unix-domain socket used by uuidd. By
default, the pathname used is /var/run/uuidd/request. This is primarily
@@ -32,34 +54,12 @@ Specify a timeout for uuidd. If specified, then uuidd will exit after
.I timeout
seconds of inactivity.
.TP
-.BR \-k , " \-\-kill "
-If currently a uuidd daemon is running, kill it.
-.TP
-.BR \-r , " \-\-random "
-Test uuidd by trying to connect to a running uuidd daemon and
-request it to return a random-based UUID.
-.TP
.BR \-t , " \-\-time "
Test uuidd by trying to connect to a running uuidd daemon and
request it to return a time-based UUID.
.TP
-.BR \-n , " \-\-uuids " \fInumber\fR
-When issuing a test request to a running uuidd, request a bulk response
-of
-.I number
-UUIDs.
-.TP
-.B \-d
-Run uuidd in debugging mode. This prevents uuidd from running as a daemon.
-.TP
-.BI \-q
-Suppress some failure messages.
-.TP
.BR \-V , " \-\-version "
Output version information and exit.
-.TP
-.BR \-h , " \-\-help "
-Display help screen and exit.
.SH EXAMPLE
Start up a daemon, print 42 random keys, and then stop the daemon.
.PP
--
1.7.0.4
From e5d259c268365457a0f0bd7654aae7d6cfcc0c17 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 19 Aug 2011 22:38:46 +0200
Subject: [PATCH 4/6] pg: normalize formatting of the man page, and tweak some of its wording
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
text-utils/pg.1 | 73 +++++++++++++++++++++++++-----------------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 22b05f5..93b0209 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -16,63 +16,59 @@ pg \- browse pagewise through text files
displays a text file on a
.SM CRT
one screenful at once.
-After each page, a prompt is displayed. The user may then either press the
+After each page, a prompt is displayed. The user may then either press the
newline key to view the next page or one of the keys described below.
.PP
If no filename is given on the command line,
-.I pg
+.B pg
reads from standard input.
-If the standard output is not a terminal,
-.I pg
+If standard output is not a terminal,
+.B pg
acts like
.IR cat (1)
but precedes each file with its name if there is more than one.
.PP
If input comes from a pipe,
-.I pg
+.B pg
stores the data in a buffer file while reading
to make navigation possible.
.SH OPTIONS
-.I Pg
+.B pg
accepts the following options:
.TP
.BI \- number
-The number of lines per page. Usually, this is the number of
+The number of lines per page. Usually, this is the number of
.SM CRT
-lines
-minus one.
+lines minus one.
.TP
.B \-c
-Clear the screen before a page is displayed
+Clear the screen before a page is displayed,
if the terminfo entry for the terminal provides this capability.
.TP
.B \-e
-.I pg
-will not pause and display
+Do not pause and display
.SM (EOF)
at the end of a file.
.TP
.B \-f
-.I pg
-does not split long lines.
+Do not split long lines.
.TP
.B \-n
-Without this option, commands must be terminated by a newline character. With
-this option,
-.I pg
+Without this option, commands must be terminated by a newline character.
+With this option,
+.B pg
advances once a command letter is entered.
.TP
.BI \-p \ string
-Instead of the prompt
-.I " :"
-,
+Instead of the normal prompt
+.IR : ,
.I string
is displayed.
If
.I string
contains
-.I %d
-, its first occurrence is replaced by the number of the current page.
+.IR %d ,
+its first occurrence is replaced by the number of the current page.
.TP
.B \-r
Disallow the shell escape.
@@ -80,7 +76,7 @@ Disallow the shell escape.
.B \-s
Print messages in
.I standout
-mode
+mode,
if the terminfo entry for the terminal provides this capability.
.TP
.BI + number
@@ -91,7 +87,7 @@ Start at the line containing the Basic Regular Expression
.I pattern
given.
.SH USAGE
-The following commands may be entered at the prompt. Commands preceded by
+The following commands may be entered at the prompt. Commands preceded by
.I i
in this document accept a number as argument, positive or negative.
If this argument starts with
@@ -105,7 +101,7 @@ otherwise relative to the beginning.
Display the next or the indicated page.
.TP
\fIi\fR\fBd\fR or \fB^D\fR
-Display the next halfpage. If
+Display the next halfpage. If
.I i
is given, it is always interpreted relative to the current position.
.TP
@@ -135,9 +131,9 @@ Advance to the last line of the input file.
Search forward until the first or the \fIi\fR-th
occurrence of the Basic Regular Expression
.I pattern
-is found. The search starts
-after the current page and stops at the end of the file. No wrap-around is
-performed.
+is found. The search starts
+after the current page and stops at the end of the file.
+No wrap-around is performed.
.I i
must be a positive number.
.TP
@@ -145,13 +141,13 @@ must be a positive number.
Search backward until the first or the \fIi\fR-th
occurrence of the Basic Regular Expression
.I pattern
-is found. The search starts
+is found. The search starts
before the current page and stops at the beginning of the file.
No wrap-around is performed.
.I i
must be a positive number.
.PP
-The search commands accept an added letter. If
+The search commands accept an added letter. If
.B t
is given, the line containing the pattern is displayed at the top of the
screen, which is the default.
@@ -187,17 +183,17 @@ using the shell.
Quit.
.PP
If the user presses the interrupt or quit key while
-.I pg
+.B pg
reads from the
input file or writes on the terminal,
-.I pg
+.B pg
will immediately display the prompt.
In all other situations these keys will terminate
-.I pg.
+.BR pg .
.SH "ENVIRONMENT VARIABLES"
The following environment variables
affect the behaviour of
-.I pg:
+.BR pg :
.TP
.B COLUMNS
Overrides the system-supplied number of columns if set.
@@ -211,8 +207,7 @@ Overrides the system-supplied number of lines if set.
.TP
.B SHELL
Used by the
-.B !
-command.
+.BR ! " command."
.TP
.B TERM
Determines the terminal type.
@@ -225,13 +220,13 @@ Determines the terminal type.
.BR regex (7),
.BR term (7)
.SH NOTES
-.I pg
-expects the terminal tabulators to set on eight positions.
+.B pg
+expects the terminal tabulators to be set every eight positions.
.PP
Files that include
.SM NUL
characters cannot be displayed by
-.IR pg .
+.BR pg .
.SH AVAILABILITY
The pg command is part of the util-linux package and is available from
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
--
1.7.0.4
From 5707e636a7cb16c88e7092ed97de7df0412543b9 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 20 Aug 2011 11:29:50 +0200
Subject: [PATCH 5/6] scriptreplay: improve synopsis and formatting and wording in man page
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
term-utils/scriptreplay.1 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index 184ff19..7788af7 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -145,6 +145,8 @@ scriptreplay \- play back typescripts, using timing information
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.B scriptreplay
+.RI [ options ]
+.RB [ \-t ]
.I timingfile
.RI [ typescript
.RI [ divisor ]]
@@ -165,7 +167,7 @@ which
.B scriptreplay
is sending its output.
.PP
-The timings information is what
+The timing information is what
.BR script (1)
outputs to standard error if it is
run with the
@@ -173,31 +175,33 @@ run with the
parameter.
.PP
By default, the typescript to display is assumed to be named \*(L"typescript\*(R",
-but other filenames may be specified, as the second parameter.
+but other filenames may be specified, as the second parameter or with option
+.BR \-s .
.PP
-If the third parameter is specified, it is used as a speed-up multiplier. For
-example, a speed-up of 2 makes
+If the third parameter is specified, it is used as a speed-up multiplier.
+For example, a speed-up of 2 makes
.B scriptreplay
-go twice as fast and a speed-up of 0.1 makes it go ten times slower
+go twice as fast, and a speed-up of 0.1 makes it go ten times slower
than the original session.
.SH OPTIONS
-The options will overide old style arguments.
+The first three options will overide old-style arguments.
.TP
-.BR \-t , " \-\-timing FILE"
+.BR \-t , " \-\-timing " \fIfile\fR
File containing script timing output.
.TP
-.BR \-s , " \-\-typescript FILE"
-Script terminal output file.
+.BR \-s , " \-\-typescript " \fIfile\fR
+File containing the script terminal output.
.TP
-.BR \-d , " \-\-divisor NUM"
-Speed up or slow down replay displaying by divisor. The argument
-is floating point number.
+.BR \-d , " \-\-divisor " \fInumber\fR
+Speed up the replay displaying this \fInumber\fR of times.
+The argument is a floating point number. It's called divisor
+because it divides the timings by this factor.
.TP
.BR \-V , " \-\-version"
-Print version information.
+Display version information and exit.
.TP
.BR \-h , " \-\-help"
-Print a help message.
+Display a help message and exit.
.SH "EXAMPLE"
.IX Header "EXAMPLE"
.Vb 7
--
1.7.0.4
From acd90fd8836aca007bc6a9cf519f4ee6f4791f50 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 20 Aug 2011 11:33:38 +0200
Subject: [PATCH 6/6] TODO: drop the pluralization item with ngettext()
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
TODO | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/TODO b/TODO
index 4f1678d..cab1ff7 100644
--- a/TODO
+++ b/TODO
@@ -225,15 +225,6 @@ misc
- move all mountpoints to the newroot (there are hardcoded /proc /sys and /dev paths now)
- add --dont-move[=<list of dirs>] options
- - use ngettext() for strings with plurals, for example
-
- /* include/nls.h */
- #define P_(id, id_plural, n) ngettext(id, id_plural, n)
-
- printf(P_("%d used sector",
- "%d used sectors", sectors),
- sectors);
-
- use TZ=UTC and LANG=en_US.UTF-8 for tests
- add mllockall() and SCHED_FIFO to hwclock,
--
1.7.0.4
