50 files changed, 252 insertions, 82 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 349ff871..05bd43c5 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.41 -
 =====================================
+  Generate man pages from templates and include version.
   Add usrlibdir and usrsbindir to configure.
   Fix conversion of md chunk size into sectors.
   Free text metadata buffer after a failure writing it.
diff --git a/configure b/configure
index f80ecc73..f4a1a715 100755
--- a/configure
+++ b/configure
@@ -663,6 +663,7 @@ target
 target_cpu
 target_vendor
 target_os
+SED
 AWK
 CC
 CFLAGS
@@ -1990,6 +1991,90 @@ case "$host_os" in
 esac
 
 ################################################################################
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_SED_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+    # Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_SED_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+SED="$ac_cv_path_SED"
+if test -z "$SED"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -12175,6 +12260,7 @@ target!$target$ac_delim
 target_cpu!$target_cpu$ac_delim
 target_vendor!$target_vendor$ac_delim
 target_os!$target_os$ac_delim
+SED!$SED$ac_delim
 AWK!$AWK$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
@@ -12222,7 +12308,6 @@ DM_IOCTLS!$DM_IOCTLS$ac_delim
 DM_LIB_VERSION!$DM_LIB_VERSION$ac_delim
 FSADM!$FSADM$ac_delim
 GROUP!$GROUP$ac_delim
-HAVE_LIBDL!$HAVE_LIBDL$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12264,6 +12349,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+HAVE_LIBDL!$HAVE_LIBDL$ac_delim
 HAVE_REALTIME!$HAVE_REALTIME$ac_delim
 HAVE_SELINUX!$HAVE_SELINUX$ac_delim
 INTL!$INTL$ac_delim
@@ -12289,7 +12375,7 @@ usrsbindir!$usrsbindir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index b1735b8a..5a82857a 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,7 @@ esac
 
 ################################################################################
 dnl -- Checks for programs.
+AC_PROG_SED
 AC_PROG_AWK
 AC_PROG_CC
 
diff --git a/make.tmpl.in b/make.tmpl.in
index b5b72474..88b7bfd4 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -26,6 +26,8 @@ MSGFMT = @MSGFMT@
 LCOV = @LCOV@
 GENHTML = @GENHTML@
 LN_S = @LN_S@
+SED = @SED@
+
 LIBS = @LIBS@
 DEFS += @DEFS@
 CFLAGS += @CFLAGS@
@@ -96,6 +98,8 @@ LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
 STRIP=
 #STRIP = -s
 
+LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
+
 LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
 		 awk -F '.' '{printf "%s.%s",$$1,$$2}')
 
diff --git a/man/Makefile.in b/man/Makefile.in
index 8ab3359c..aca79247 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -35,12 +35,25 @@ MAN8CLUSTER=clvmd.8
 MAN5DIR=${mandir}/man5
 MAN8DIR=${mandir}/man8
 
+CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN)
+
 include $(top_srcdir)/make.tmpl
 
 ifneq ("@CLVMD@", "none")
   install: install_cluster
 endif
 
+all: man
+
+.PHONY: man
+
+man: $(MAN5) $(MAN8) $(MAN8CLUSTER)
+
+$(MAN5) $(MAN8) $(MAN8CLUSTER):	Makefile
+
+%: %.in
+	$(SED) -e "s/#VERSION#/$(LVM_VERSION)/" $< > $@
+
 install:
 	@echo "Installing $(MAN8) in $(MAN8DIR)"
 	@for f in $(MAN8); \
diff --git a/man/clvmd.8 b/man/clvmd.8.in
index c43ff4cd..8fd9b2d3 100644
--- a/man/clvmd.8
+++ b/man/clvmd.8.in
@@ -1,4 +1,4 @@
-.TH CLVMD 8 "LVM TOOLS" "Red Hat Inc" \" -*- nroff -*-
+.TH CLVMD 8 "LVM TOOLS #VERSION#" "Red Hat Inc" \" -*- nroff -*-
 .SH NAME
 clvmd \- cluster LVM daemon
 .SH SYNOPSIS
diff --git a/man/fsadm.8.in b/man/fsadm.8.in
new file mode 100644
index 00000000..56791bf7
--- /dev/null
+++ b/man/fsadm.8.in
@@ -0,0 +1,56 @@
+.TH "FSADM" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\""
+.SH "NAME"
+fsadm \- utility to resize or check filesystem on a device
+.SH "SYNOPSIS"
+.B fsdam
+.RI [options]\ check\ device
+
+.B fsdam
+.RI [options]\ resize\ device\ [new_size[BKMGTEP]]
+
+.SH "DESCRIPTION"
+\fBfsadm\fR utility resizes or checks the filesystem on a device. It tries to use the same API for \fBExt2/3\fR, \fBReiserFS\fR and \fBXFS\fR filesystem and simply resize and filesystem check operation.
+.SH "OPTIONS"
+.TP 
+\fB\-h \-\-help\fR
+\(em print help message
+.TP 
+\fB\-v \-\-verbose\fR
+\(em be more verbose
+.TP 
+\fB\-e \-\-ext\-offline\fR
+\(em unmount Ext2/3 filesystem before doing resize
+.TP 
+\fB\-f \-\-force\fR
+\(em bypass some sanity checks
+.TP 
+\fB\-n \-\-dry\-run\fR
+\(em print commands without running them
+.TP 
+\fB\-y \-\-yes\fR
+\(em answer "yes" at any prompts
+.TP  
+\fBnew_size\fR
+\(em Absolute number of filesystem blocks to be in the filesystem, or an absolute size using a suffix (in powers of 1024). If new_size is not supplied, the whole device is used.
+
+
+.SH "EXAMPLES"
+"fsadm \-e \-y resize /dev/vg/test 1000M" tries to resize the size of the filesystem on logical volume /dev/vg/test. If /dev/vg/test contains Ext2/3 filesystem it will be unmounted prior the resize. All [y|n] questions will be answered 'y'.
+.SH "ENVIRONMENT VARIABLES"
+.TP 
+\fBTMPDIR\fP 
+Where the temporary directory should be created.
+.TP 
+.BR 
+.SH "SEE ALSO"
+.BR lvm (8), 
+.BR lvresize (8), 
+.BR lvm.conf (5),
+.BR tune2fs (8),
+.BR resize2fs (8),
+.BR reiserfstune (8),
+.BR resize_reiserfs (8),
+.BR xfs_info (8),
+.BR xfs_growfs (8),
+.BR xfs_check (8)
+
diff --git a/man/lvchange.8 b/man/lvchange.8.in
index ec473e0f..71d04067 100644
--- a/man/lvchange.8
+++ b/man/lvchange.8.in
@@ -1,4 +1,4 @@
-.TH LVCHANGE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvchange \- change attributes of a logical volume
 .SH SYNOPSIS
diff --git a/man/lvconvert.8 b/man/lvconvert.8.in
index fbc1d7b9..6829dba8 100644
--- a/man/lvconvert.8
+++ b/man/lvconvert.8.in
@@ -1,4 +1,4 @@
-.TH LVCONVERT 8 "LVM TOOLS" "Red Hat, Inc" \" -*- nroff -*-
+.TH LVCONVERT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc" \" -*- nroff -*-
 .SH NAME
 lvconvert \- convert a logical volume from linear to mirror or snapshot
 .SH SYNOPSIS
diff --git a/man/lvcreate.8 b/man/lvcreate.8.in
index 04b155b4..0f245479 100644
--- a/man/lvcreate.8
+++ b/man/lvcreate.8.in
@@ -1,4 +1,4 @@
-.TH LVCREATE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvcreate \- create a logical volume in an existing volume group
 .SH SYNOPSIS
diff --git a/man/lvdisplay.8 b/man/lvdisplay.8.in
index 602c7fd1..7be68c6e 100644
--- a/man/lvdisplay.8
+++ b/man/lvdisplay.8.in
@@ -1,4 +1,4 @@
-.TH LVDISPLAY 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvdisplay \- display attributes of a logical volume
 .SH SYNOPSIS
diff --git a/man/lvextend.8 b/man/lvextend.8.in
index 7a3836c4..18fe7192 100644
--- a/man/lvextend.8
+++ b/man/lvextend.8.in
@@ -1,4 +1,4 @@
-.TH LVEXTEND 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVEXTEND 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvextend \- extend the size of a logical volume
 .SH SYNOPSIS
diff --git a/man/lvm.8 b/man/lvm.8.in
index a5e666de..5e5c5703 100644
--- a/man/lvm.8
+++ b/man/lvm.8.in
@@ -1,4 +1,4 @@
-.TH LVM 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVM 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvm \- LVM2 tools
 .SH SYNOPSIS
diff --git a/man/lvm.conf.5 b/man/lvm.conf.5.in
index 47666b4e..fdd728a9 100644
--- a/man/lvm.conf.5
+++ b/man/lvm.conf.5.in
@@ -1,4 +1,4 @@
-.TH LVM.CONF 5 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVM.CONF 5 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvm.conf \- Configuration file for LVM2
 .SH SYNOPSIS
diff --git a/man/lvmchange.8 b/man/lvmchange.8.in
index ef18c6b8..7c7c85a2 100644
--- a/man/lvmchange.8
+++ b/man/lvmchange.8.in
@@ -1,4 +1,4 @@
-.TH LVMCHANGE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVMCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvmchange \- change attributes of the logical volume manager
 .SH SYNOPSIS
diff --git a/man/lvmdiskscan.8 b/man/lvmdiskscan.8.in
index 00d14058..7cbb03de 100644
--- a/man/lvmdiskscan.8
+++ b/man/lvmdiskscan.8.in
@@ -1,4 +1,4 @@
-.TH LVMDISKSCAN 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVMDISKSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvmdiskscan \- scan for all devices visible to LVM2
 .SH SYNOPSIS
diff --git a/man/lvmdump.8 b/man/lvmdump.8.in
index 6567d922..33d44d09 100644
--- a/man/lvmdump.8
+++ b/man/lvmdump.8.in
@@ -1,4 +1,4 @@
-.TH LVMDUMP "8" "" "Red Hat, Inc."
+.TH LVMDUMP 8 "LVM TOOLS #VERSION#" "Red Hat, Inc."
 .SH NAME
 lvmdump - create lvm2 information dumps for diagnostic purposes
 .SH SYNOPSIS
diff --git a/man/lvreduce.8 b/man/lvreduce.8.in
index e7180cb8..3f4d9927 100644
--- a/man/lvreduce.8
+++ b/man/lvreduce.8.in
@@ -1,4 +1,4 @@
-.TH LVREDUCE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVREDUCE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvreduce \- reduce the size of a logical volume
 .SH SYNOPSIS
diff --git a/man/lvremove.8 b/man/lvremove.8.in
index 29308033..46597e48 100644
--- a/man/lvremove.8
+++ b/man/lvremove.8.in
@@ -1,4 +1,4 @@
-.TH LVREMOVE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvremove \- remove a logical volume
 .SH SYNOPSIS
diff --git a/man/lvrename.8 b/man/lvrename.8.in
index 11b4f24f..94c22423 100644
--- a/man/lvrename.8
+++ b/man/lvrename.8.in
@@ -1,4 +1,4 @@
-.TH LVRENAME 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVRENAME 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvrename \- rename a logical volume
 .SH SYNOPSIS
diff --git a/man/lvresize.8 b/man/lvresize.8.in
index 6666fa87..e34bb6d9 100644
--- a/man/lvresize.8
+++ b/man/lvresize.8.in
@@ -1,4 +1,4 @@
-.TH LVRESIZE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVRESIZE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvresize \- resize a logical volume
 .SH SYNOPSIS
diff --git a/man/lvs.8 b/man/lvs.8.in
index 6604902b..af6d79df 100644
--- a/man/lvs.8
+++ b/man/lvs.8.in
@@ -1,4 +1,4 @@
-.TH LVS 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvs \- report information about logical volumes
 .SH SYNOPSIS
diff --git a/man/lvscan.8 b/man/lvscan.8.in
index 04b2b873..cdcdc1db 100644
--- a/man/lvscan.8
+++ b/man/lvscan.8.in
@@ -1,4 +1,4 @@
-.TH LVSCAN 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH LVSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 lvscan \- scan (all disks) for logical volumes
 .SH SYNOPSIS
diff --git a/man/pvchange.8 b/man/pvchange.8.in
index b06e2388..8011853b 100644
--- a/man/pvchange.8
+++ b/man/pvchange.8.in
@@ -1,4 +1,4 @@
-.TH PVCHANGE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvchange \- change attributes of a physical volume
 .SH SYNOPSIS
diff --git a/man/pvck.8 b/man/pvck.8.in
index d92ae433..de3dfacb 100644
--- a/man/pvck.8
+++ b/man/pvck.8.in
@@ -1,4 +1,4 @@
-.TH PVCK 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVCK 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvck \- check physical volume metadata
 .SH SYNOPSIS
diff --git a/man/pvcreate.8 b/man/pvcreate.8.in
index 0ec6b6e1..265d5e6c 100644
--- a/man/pvcreate.8
+++ b/man/pvcreate.8.in
@@ -1,4 +1,4 @@
-.TH PVCREATE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvcreate \- initialize a disk or partition for use by LVM
 .SH SYNOPSIS
@@ -125,6 +125,13 @@ SCSI disk for later use by LVM:
 .B pvcreate /dev/sdc4 /dev/sde
 .sp
 .SH SEE ALSO
-.BR lvm "(8), " vgcreate "(8), " vgextend "(8), " lvcreate "(8), "
-.BR cfdisk "(8), " fdisk "(8), " losetup "(8), " mdadm "(8), "
-.BR vgcfgrestore "(8), " vgconvert "(8)"
+.BR lvm (8),
+.BR vgcreate (8), 
+.BR vgextend (8), 
+.BR lvcreate (8), 
+.BR cfdisk (8), 
+.BR fdisk (8), 
+.BR losetup (8), 
+.BR mdadm (8), 
+.BR vgcfgrestore (8), 
+.BR vgconvert (8)
diff --git a/man/pvdisplay.8 b/man/pvdisplay.8.in
index 0aa908c5..ae009b31 100644
--- a/man/pvdisplay.8
+++ b/man/pvdisplay.8.in
@@ -1,4 +1,4 @@
-.TH PVDISPLAY 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvdisplay \- display attributes of a physical volume
 .SH SYNOPSIS
@@ -44,7 +44,7 @@ Only display the size of the given physical volumes.
 Display the mapping of physical extents to logical volumes and
 logical extents.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR pvcreate (8), 
-.BR lvcreate (8), 
+.BR lvm (8),
+.BR pvcreate (8),
+.BR lvcreate (8),
 .BR vgcreate (8)
diff --git a/man/pvmove.8 b/man/pvmove.8.in
index 289d3c5f..a6412ce7 100644
--- a/man/pvmove.8
+++ b/man/pvmove.8.in
@@ -1,4 +1,4 @@
-.TH PVMOVE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvmove \- move physical extents
 .SH SYNOPSIS
@@ -93,6 +93,7 @@ to free physical extents elsewhere in the volume group, giving verbose
 runtime information, use:
 .sp
 \	pvmove -v /dev/hda4
-
+.sp
 .SH SEE ALSO
-.BR lvm (8), vgconvert (8)
+.BR lvm (8),
+.BR vgconvert (8)
diff --git a/man/pvremove.8 b/man/pvremove.8.in
index 7dcf4234..b435fc70 100644
--- a/man/pvremove.8
+++ b/man/pvremove.8.in
@@ -1,4 +1,4 @@
-.TH PVREMOVE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvremove \- remove a physical volume
 .SH SYNOPSIS
diff --git a/man/pvresize.8 b/man/pvresize.8.in
index 877d3b22..845f6d3c 100644
--- a/man/pvresize.8
+++ b/man/pvresize.8.in
@@ -1,4 +1,4 @@
-.TH PVRESIZE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVRESIZE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvresize \- resize a disk or partition in use by LVM2
 .SH SYNOPSIS
diff --git a/man/pvs.8 b/man/pvs.8.in
index 4306bf64..e5bae0a8 100644
--- a/man/pvs.8
+++ b/man/pvs.8.in
@@ -1,4 +1,4 @@
-.TH PVS 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvs \- report information about physical volumes
 .SH SYNOPSIS
diff --git a/man/pvscan.8 b/man/pvscan.8.in
index b8440c8f..4a6bcd74 100644
--- a/man/pvscan.8
+++ b/man/pvscan.8.in
@@ -1,4 +1,4 @@
-.TH PVSCAN 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH PVSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 pvscan \- scan all disks for physical volumes
 .SH SYNOPSIS
diff --git a/man/vgcfgbackup.8 b/man/vgcfgbackup.8.in
index b072af6a..6eb25c22 100644
--- a/man/vgcfgbackup.8
+++ b/man/vgcfgbackup.8.in
@@ -1,4 +1,4 @@
-.TH VGCFGBACKUP 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCFGBACKUP 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgcfgbackup \- backup volume group descriptor area
 .SH SYNOPSIS
diff --git a/man/vgcfgrestore.8 b/man/vgcfgrestore.8.in
index 84bd4c23..c62c8133 100644
--- a/man/vgcfgrestore.8
+++ b/man/vgcfgrestore.8.in
@@ -1,4 +1,4 @@
-.TH VGCFGRESTORE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCFGRESTORE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgcfgrestore \- restore volume group descriptor area
 .SH SYNOPSIS
diff --git a/man/vgchange.8 b/man/vgchange.8.in
index 978020d4..3905441c 100644
--- a/man/vgchange.8
+++ b/man/vgchange.8.in
@@ -1,4 +1,4 @@
-.TH VGCHANGE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgchange \- change attributes of a volume group
 .SH SYNOPSIS
diff --git a/man/vgck.8 b/man/vgck.8.in
index b5f388f0..58b02caf 100644
--- a/man/vgck.8
+++ b/man/vgck.8.in
@@ -1,4 +1,4 @@
-.TH VGCK 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCK 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgck \- check volume group metadata
 .SH SYNOPSIS
@@ -9,7 +9,7 @@ vgck checks LVM metadata for each named volume group for consistency.
 .SH OPTIONS
 See \fBlvm\fP for common options.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgcreate (8), 
-.BR vgchange (8), 
+.BR lvm (8),
+.BR vgcreate (8),
+.BR vgchange (8),
 .BR vgscan (8)
diff --git a/man/vgconvert.8 b/man/vgconvert.8.in
index 4de0da43..f5353a02 100644
--- a/man/vgconvert.8
+++ b/man/vgconvert.8.in
@@ -1,4 +1,4 @@
-.TH VGCONVERT 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCONVERT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgconvert \- convert volume group metadata format
 .SH SYNOPSIS
@@ -34,5 +34,6 @@ such PV to reformat it as it was, using the archive file that
 Finally run \fBvgcfgrestore\fP(8) with that archive file to restore
 the original metadata.
 .SH SEE ALSO
-.BR lvm "(8), " pvcreate "(8),"
-.BR vgcfgrestore "(8)"
+.BR lvm (8),
+.BR pvcreate (8),
+.BR vgcfgrestore (8)
diff --git a/man/vgcreate.8 b/man/vgcreate.8.in
index 811049e1..a53197e0 100644
--- a/man/vgcreate.8
+++ b/man/vgcreate.8.in
@@ -1,4 +1,4 @@
-.TH VGCREATE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgcreate \- create a volume group
 .SH SYNOPSIS
diff --git a/man/vgdisplay.8 b/man/vgdisplay.8.in
index fa1c1565..98f63722 100644
--- a/man/vgdisplay.8
+++ b/man/vgdisplay.8.in
@@ -1,4 +1,4 @@
-.TH VGDISPLAY 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgdisplay \- display attributes of volume groups
 .SH SYNOPSIS
diff --git a/man/vgexport.8 b/man/vgexport.8.in
index 8708bc08..883ec560 100644
--- a/man/vgexport.8
+++ b/man/vgexport.8.in
@@ -1,4 +1,4 @@
-.TH VGEXPORT 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGEXPORT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgexport \- make volume groups unknown to the system
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ See \fBlvm\fP for common options.
 .I \-a, \-\-all
 Export all inactive Volume Groups.
 .SH SEE ALSO
-.BR lvm (8), 
+.BR lvm (8),
 .BR pvscan (8),
-.BR vgimport (8), 
+.BR vgimport (8),
 .BR vgscan (8)
diff --git a/man/vgextend.8 b/man/vgextend.8.in
index 1e8d84aa..0749a336 100644
--- a/man/vgextend.8
+++ b/man/vgextend.8.in
@@ -1,4 +1,4 @@
-.TH VGEXTEND 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGEXTEND 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgextend \- add physical volumes to a volume group
 .SH SYNOPSIS
@@ -19,7 +19,7 @@ group "vg00" by the new physical volumes (see
 .B pvcreate(8)
 ) "/dev/sdn1" and /dev/sda4".
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgcreate (8), 
-.BR vgreduce (8), 
+.BR lvm (8),
+.BR vgcreate (8),
+.BR vgreduce (8),
 .BR pvcreate (8)
diff --git a/man/vgimport.8 b/man/vgimport.8.in
index 40ee9776..7af03940 100644
--- a/man/vgimport.8
+++ b/man/vgimport.8.in
@@ -1,4 +1,4 @@
-.TH VGIMPORT 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGIMPORT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgimport \- make exported volume groups known to the system
 .SH SYNOPSIS
@@ -19,7 +19,7 @@ See \fBlvm\fP for common options.
 .I \-a, \-\-all
 Import all exported Volume Groups.
 .SH SEE ALSO
-.BR lvm (8), 
+.BR lvm (8),
 .BR pvscan (8),
-.BR vgexport (8), 
+.BR vgexport (8),
 .BR vgscan (8)
diff --git a/man/vgmerge.8 b/man/vgmerge.8.in
index 172d9484..519624fd 100644
--- a/man/vgmerge.8
+++ b/man/vgmerge.8.in
@@ -1,4 +1,4 @@
-.TH VGMERGE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGMERGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgmerge \- merge two volume groups
 .SH SYNOPSIS
@@ -23,7 +23,7 @@ Do a test run WITHOUT making any real changes.
 into the active or inactive volume group named "databases" giving verbose
 runtime information.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgcreate (8), 
-.BR vgextend (8), 
+.BR lvm (8),
+.BR vgcreate (8),
+.BR vgextend (8),
 .BR vgreduce (8)
diff --git a/man/vgmknodes.8 b/man/vgmknodes.8.in
index 2ef53796..4eaab6b8 100644
--- a/man/vgmknodes.8
+++ b/man/vgmknodes.8.in
@@ -1,4 +1,4 @@
-.TH VGMKNODES 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGMKNODES 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgmknodes \- recreate volume group directory and logical volume special files
 .SH SYNOPSIS
@@ -12,6 +12,6 @@ logical volumes and creates any missing ones and removes unused ones.
 .SH OPTIONS
 See \fBlvm\fP for common options.
 .SH SEE ALSO
-.BR lvm (8), 
+.BR lvm (8),
 .BR vgscan (8),
 .BR dmsetup (8)
diff --git a/man/vgreduce.8 b/man/vgreduce.8.in
index a382454d..5a44227c 100644
--- a/man/vgreduce.8
+++ b/man/vgreduce.8.in
@@ -1,4 +1,4 @@
-.TH VGREDUCE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGREDUCE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgreduce \- reduce a volume group
 .SH SYNOPSIS
@@ -35,5 +35,5 @@ lost, you might want to try to salvage data first by activating your
 logical volumes with --partial as described in \fBlvm (8)\fP.
 
 .SH SEE ALSO
-.BR lvm (8), 
+.BR lvm (8),
 .BR vgextend (8)
diff --git a/man/vgremove.8 b/man/vgremove.8.in
index 7a51ed68..478ab8df 100644
--- a/man/vgremove.8
+++ b/man/vgremove.8.in
@@ -1,4 +1,4 @@
-.TH VGREMOVE 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgremove \- remove a volume group
 .SH SYNOPSIS
@@ -22,7 +22,7 @@ See \fBlvm\fP for common options.
 Force the removal of any logical volumes on the volume group
 without confirmation.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR lvremove (8), 
-.BR vgcreate (8), 
+.BR lvm (8),
+.BR lvremove (8),
+.BR vgcreate (8),
 .BR vgreduce (8)
diff --git a/man/vgrename.8 b/man/vgrename.8.in
index c56a9de9..de265029 100644
--- a/man/vgrename.8
+++ b/man/vgrename.8.in
@@ -1,4 +1,4 @@
-.TH VGRENAME 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGRENAME 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgrename \- rename a volume group
 .SH SYNOPSIS
@@ -43,7 +43,7 @@ one of the conflicting Volume Groups with
 \fBvgrename\fP.
 .TP
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgchange (8), 
-.BR vgcreate (8), 
+.BR lvm (8),
+.BR vgchange (8),
+.BR vgcreate (8),
 .BR lvrename (8)
diff --git a/man/vgs.8 b/man/vgs.8.in
index fcfb9eb5..84740533 100644
--- a/man/vgs.8
+++ b/man/vgs.8.in
@@ -1,4 +1,4 @@
-.TH VGS 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgs \- report information about volume groups
 .SH SYNOPSIS
diff --git a/man/vgscan.8 b/man/vgscan.8.in
index db383a2e..a2b90745 100644
--- a/man/vgscan.8
+++ b/man/vgscan.8.in
@@ -1,4 +1,4 @@
-.TH VGSCAN 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgscan \- scan all disks for volume groups and rebuild caches
 .SH SYNOPSIS
@@ -23,6 +23,6 @@ See \fBlvm\fP for common options.
 Also checks the LVM special files in /dev that are needed for active 
 logical volumes and creates any missing ones and removes unused ones.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgcreate (8), 
+.BR lvm (8),
+.BR vgcreate (8),
 .BR vgchange (8)
diff --git a/man/vgsplit.8 b/man/vgsplit.8.in
index 36e230ca..1f084deb 100644
--- a/man/vgsplit.8
+++ b/man/vgsplit.8.in
@@ -1,4 +1,4 @@
-.TH VGSPLIT 8 "LVM TOOLS" "Sistina Software UK" \" -*- nroff -*-
+.TH VGSPLIT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
 .SH NAME
 vgsplit \- split a volume group into two
 .SH SYNOPSIS
@@ -59,8 +59,8 @@ logical volume being split across volume groups.
 .SH OPTIONS
 See \fBlvm\fP for common options.
 .SH SEE ALSO
-.BR lvm (8), 
-.BR vgcreate (8), 
-.BR vgextend (8), 
+.BR lvm (8),
+.BR vgcreate (8),
+.BR vgextend (8),
 .BR vgreduce (8),
 .BR vgmerge (8)