blkid: clean up man pages

Signed-off-by: Karel Zak <kzak@redhat.com>

6 files changed, 25 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index ca1189e88..3ad174fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -750,8 +750,6 @@ include/Makefile
 lib/Makefile
 libs/Makefile
 libs/blkid/blkid.pc
-libs/blkid/libblkid.3
-libs/blkid/blkid.8
 libs/blkid/Makefile
 libs/blkid/bin/Makefile
 libs/blkid/src/Makefile
diff --git a/libs/blkid/.gitignore b/libs/blkid/.gitignore
index 195de631e..a8ec330ae 100644
--- a/libs/blkid/.gitignore
+++ b/libs/blkid/.gitignore
@@ -1,4 +1,3 @@
-*.[38]
 *.sh
 bin/blkid
 test_*
diff --git a/libs/blkid/Makefile.am b/libs/blkid/Makefile.am
index fdf89feb8..a27c85248 100644
--- a/libs/blkid/Makefile.am
+++ b/libs/blkid/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = src bin
 pkgconfigdir = $(usrlibexecdir)/pkgconfig
 pkgconfig_DATA = blkid.pc
 
-dist_man_MANS = libblkid.3 blkid.8
+dist_man_MANS = libblkid.3
 
-EXTRA_DIST = README.blkid blkid.pc blkid.pc.in libblkid.3.in blkid.8.in
+EXTRA_DIST = README.blkid blkid.pc blkid.pc.in libblkid.3
 
diff --git a/libs/blkid/bin/Makefile.am b/libs/blkid/bin/Makefile.am
index 358ed17d3..cc34c5738 100644
--- a/libs/blkid/bin/Makefile.am
+++ b/libs/blkid/bin/Makefile.am
@@ -4,6 +4,7 @@ AM_LDFLAGS += -L$(top_builddir)/libs/blkid/src -lblkid
 AM_CPPFLAGS += -I$(top_builddir)/libs/blkid/src/
 
 sbin_PROGRAMS = blkid
+dist_man_MANS = blkid.8
 
 shell_in_files = blkid.sh.in
 noinst_SCRIPTS = $(shell_in_files:.sh.in=.sh)
diff --git a/libs/blkid/blkid.8.in b/libs/blkid/bin/blkid.8
index e7eaf51e4..14aad9e99 100644
--- a/libs/blkid/blkid.8.in
+++ b/libs/blkid/bin/blkid.8
@@ -5,12 +5,18 @@
 .\" 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 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.TH BLKID 8 "February 2009" "Linux" "MAINTENANCE COMMANDS"
 .SH NAME
 blkid \- command\-line utility to locate/print block device attributes
 .SH SYNOPSIS
 .B blkid
-.RB [ \-ghlLv ]
+.RB \-L
+.IR label " | "
+.RB \-U
+.IR uuid
+
+.B blkid
+.RB [ \-ghlv ]
 .RB [ \-c
 .IR file ]
 .RB [ \-w
@@ -80,9 +86,15 @@ block devices.  If this option is not specified,
 .B blkid
 will print all of the devices that match the search parameter.
 .TP
-.B \-L
-Print the devices in a user-friendly list format.  This is the
-equivalent of using the option \fB-o list\fR.
+.B \-L " label "
+Look up one device that uses the label (same as: -l -o device -t
+LABEL=<label>).  This look up method is able to reliable use /dev/disk/by-label
+udev symlinks (depends on setting in /etc/blkid.conf). Avoid to use the
+symlinks directly. It is not reliable to use the symlinks without verification.
+The \fB-L\fR option is portable and works on systems with and without udev.
+.TP
+.B \-U " uuid "
+Look up one device that uses the uuid. For more details see the \fB-L\fR option.
 .TP
 .BI \-o " format"
 Display
@@ -180,3 +192,4 @@ The blkid command is part of the util-linux-ng package and is available from
 ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
 .SH "SEE ALSO"
 .BR libblkid (3)
+.BR findfs (8)
diff --git a/libs/blkid/libblkid.3.in b/libs/blkid/libblkid.3
index bd24cb1a2..89747ecf1 100644
--- a/libs/blkid/libblkid.3.in
+++ b/libs/blkid/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 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.TH LIBBLKID 3 "February 2009" "Linux" "MAINTENANCE COMMANDS""
 .SH NAME
 libblkid \- block device identification library
 .SH SYNOPSIS
@@ -55,8 +55,8 @@ from Ted Ts'o.  The library was subsequently heavily modified by Ted Ts'o.
 Caches data extracted from each recognized block device.
 .SH AVAILABILITY
 .B libblkid
-is part of the e2fsprogs package since version 1.33 and is available from
-http://e2fsprogs.sourceforge.net.
+is part of the util-linux-ng package since version 2.15 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
 .SH COPYING
 .B libblkid
 is available under the terms of the GNU Library General Public License (LGPL),
@@ -78,3 +78,4 @@ http://www.gnu.org/licenses/licenses.html#LGPL
 .UE
 .SH "SEE ALSO"
 .BR blkid (8)
+.BR findfs (8)