docs: uniformize the header and footer lines in man pages

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@justemail.net>

91 files changed, 143 insertions, 142 deletions

diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 63cd91dbc..2b3d64c88 100644
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -3,7 +3,7 @@
 .\" Copyright 2007 Karel Zak <kzak@redhat.com>
 .\"
 .\" 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 10a2e3826..6321ee101 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 0fa9e8d45..67c5d03ea 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -1,8 +1,8 @@
 .\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 f4bb4d0c4..8f25b0bbd 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@cs.unc.edu)
 .\" 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 1951f02a6..678fd8060 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 09cc92480..02d8b0605 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 616c358c2..466d6409d 100644
--- a/disk-utils/mkfs.bfs.8
+++ b/disk-utils/mkfs.bfs.8
@@ -1,6 +1,6 @@
 .\" Copyright 1999 Andries E. Brouwer (aeb@cwi.nl)
 .\" 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 6a8ebaeb6..4ee0e819b 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@cs.unc.edu)
 .\" 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 ff959cb2c..59a93dcc3 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 9b4b9573d..b85080a5a 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 3e8103f46..327a65f26 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 c6ea14728..2798a7b53 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 66da0006d..2b12f34d4 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -1,9 +1,9 @@
 .\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" Copyright 1998 Andries E. Brouwer (aeb@cwi.nl)
 .\" 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 07eaaea20..c10bcba41 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 2e6fbdadf..a8e05ba88 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 5134403fd..4d6ab0a77 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 4a5eaa973..a9291e2cc 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 b27bec419..532940888 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 90514b8f2..393ccb70c 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 3e9faa40a..beb691784 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 1db2ca8e9..80fb3b3c8 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -1,6 +1,6 @@
 .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 6226c15af..bb5eb0097 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@cs.unc.edu
-.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 299fbd4fc..c797afa56 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 953e82a01..4d9b3d165 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 279562e59..dd3664a8f 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 b14e6b344..0b01e09a3 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 92db09d00..b75490301 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 27d85c66d..776bf662e 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 07cbdaed8..09d30e9cd 100644
--- a/misc-utils/kill.1
+++ b/misc-utils/kill.1
@@ -1,7 +1,7 @@
 .\" Copyright 1994 Salvatore Valente (svalente@mit.edu)
 .\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 af826ef50..98a1a0658 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@debian.org, 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 a6ab56880..bed3d2442 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 2fcc7e522..1e9b4cfc1 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 8e97c18ec..88e249d72 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 d2c3d1421..0cfe3810e 100644
--- a/misc-utils/rename.1
+++ b/misc-utils/rename.1
@@ -1,7 +1,7 @@
 .\" Written by Andries E. Brouwer (aeb@cwi.nl)
 .\" 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 60e015009..f1022fdd5 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 92dc2d437..6349b3a35 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 57bfb0bc3..dbf8d2fff 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 00a406d2e..1f3d99650 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 09bcb38fe..b0cd7635a 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@redhat.com> 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 d329c914d..f1db80bc9 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 b1666cbfc..e403c1a54 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -39,7 +39,7 @@
 .\" 010725, Nikita Danilov <NikitaDanilov@Yahoo.COM>: reiserfs options
 .\" 011124, Karl Eichwalder <ke@gnu.franken.de>: 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 709443cca..ee6a2fcf6 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 4bce485c2..934fb00f5 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 1c9280980..9dcd0a324 100644
--- a/partx/addpart.8
+++ b/partx/addpart.8
@@ -2,7 +2,7 @@
 .\" Copyright 2007 Karel Zak <kzak@redhat.com>
 .\" 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 7f35fb9da..433582f14 100644
--- a/partx/delpart.8
+++ b/partx/delpart.8
@@ -2,7 +2,7 @@
 .\" Copyright 2007 Karel Zak <kzak@redhat.com>
 .\" 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 c680d5113..4129d78c0 100644
--- a/partx/partx.8
+++ b/partx/partx.8
@@ -3,7 +3,7 @@
 .\" Copyright 2007 Red Hat, Inc.
 .\" Copyright 2010 Davidlohr Bueso <dave@gnu.org>
 .\" 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 e7f2c3e4d..eb3e90ba4 100644
--- a/schedutils/chrt.1
+++ b/schedutils/chrt.1
@@ -25,9 +25,9 @@
 .\" 2002-05-11 Robert Love <rml@tech9.net>
 .\" 	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 c6f0b47d7..acf6c92e9 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 9300fb377..8917c66f0 100644
--- a/schedutils/taskset.1
+++ b/schedutils/taskset.1
@@ -25,7 +25,7 @@
 .\" 2002-05-11 Robert Love <rml@tech9.net>
 .\" 	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 81b6b1ed6..96cbc0a8f 100644
--- a/sys-utils/arch.1
+++ b/sys-utils/arch.1
@@ -1,18 +1,18 @@
 .\" arch.1 -- 
 .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 bf006e340..4238d98de 100644
--- a/sys-utils/ctrlaltdel.8
+++ b/sys-utils/ctrlaltdel.8
@@ -1,6 +1,6 @@
 .\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 a1235b17d..8a2177582 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 4531edb55..3dc18cb0a 100644
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@ -1,6 +1,6 @@
 .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 003cb556d..2020437fb 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 55be5d8c9..3d7e10c1f 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 a10c053b4..7693861a3 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 1bca53b5f..18b5eafec 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 afeacafbe..eada9bbc3 100644
--- a/sys-utils/ipcmk.1
+++ b/sys-utils/ipcmk.1
@@ -1,6 +1,6 @@
 .\" Copyright 2008 Hayden A. James (hayden.james@gmail.com)
 .\" 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 7806f6fd3..d55574516 100644
--- a/sys-utils/ipcrm.1
+++ b/sys-utils/ipcrm.1
@@ -1,6 +1,6 @@
 .\" Copyright 2002 Andre C. Mazzone (linuxdev@karagee.com)
 .\" 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 76e50ac2b..652c0f330 100644
--- a/sys-utils/ipcs.1
+++ b/sys-utils/ipcs.1
@@ -1,6 +1,6 @@
 .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 7e57fec21..8ce14f3c1 100644
--- a/sys-utils/ldattach.8
+++ b/sys-utils/ldattach.8
@@ -1,6 +1,6 @@
 .\" Copyright 2008 Tilman Schmidt (tilman@imap.cc)
 .\" 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 4795e91c8..056e7a91b 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 be17c42dd..3c7d0841e 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 50c1768d9..2260957e9 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 a1ae95141..0be5dcab9 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 a06f54994..f283645c9 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 8bfd90d6e..a536f322c 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 4bb2b0333..0764a455b 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 7a14da31f..0d9580ece 100644
--- a/sys-utils/setsid.1
+++ b/sys-utils/setsid.1
@@ -1,7 +1,7 @@
 .\" Rick Sladkey <jrs@world.std.com>
 .\" In the public domain.
 .\" Path modifications by faith@cs.unc.edu
-.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 0f0f9e558..34ab0d051 100644
--- a/sys-utils/switch_root.8
+++ b/sys-utils/switch_root.8
@@ -1,7 +1,7 @@
 .\" Karel Zak <kzak@redhat.com>
-.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 9ed4452c5..8a7049beb 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 d27c35edf..5ee03ee12 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 c43f4561c..4083291de 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 5b0ed439c..f7e2f3db4 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 1e2f0f301..fdf67e24e 100644
--- a/term-utils/reset.1
+++ b/term-utils/reset.1
@@ -1,6 +1,6 @@
 .\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
 .\" 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 5f96b9c21..e111d08f5 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 5610eb156..184ff19a2 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 e5b3bb4ed..3eac3485f 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 b3b2aa50c..541a8d0ab 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@cs.unc.edu
 .\"
-.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 1c15f50c2..b60657518 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@cs.unc.edu
 .\"
-.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 fab02d65a..d9879d50f 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 b079a3837..e65c8e901 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 04a41b18c..38c4f4e20 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 ebeb1e30f..2050666e9 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 a5e2a8c10..20dbad24a 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 1cd0aa792..6305f6b85 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 1c9a51306..73f65a031 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 853e5afc0..22b05f59b 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 db0eecb36..7dc68045d 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
@@ -33,9 +33,9 @@
 .\"     Modified for Linux by Charles Hannum (mycroft@gnu.ai.mit.edu)
 .\"                       and Brian Koehmstedt (bpk@gnu.ai.mit.edu)
 .\"
-.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 e7c95264e..d64d2cabf 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 7992d72fc..6d935311a 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