8 files changed, 28 insertions, 15 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 8d1083ce260..16219c2160d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (EXTRA_DIST): Add bsnl.awk.
+
 2010-04-11  Karl Berry  <karl@tug.org>
 
 	* texmf.cnf ({TEXINPUTS,BIBINPUTS}.{ptex,platex,pbibtex}): new defns.
@@ -18,6 +22,12 @@
 
 	* types.h: doc fixes.
 
+2010-04-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* man/kpseaccess.man, man/kpsestat.man, man/mktexpk.man,
+	man/mktextfm.man: Uniform manpage formatting: bold for literals,
+	italic for variable items, roman for meta items.
+
 2010-04-05  Karl Berry  <karl@tug.org>
 
 	* progname.h: doc fix.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index c24230ca9cb..3db6693b10a 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -234,6 +234,8 @@ kpathsea.h: Makefile paths.h
 	      -e '/^win32lib\.h/d' \
 	      -e 's,^,#include <kpathsea/,' -e s',$$,>,' >>$@
 
+EXTRA_DIST += bsnl.awk
+
 DISTCLEANFILES = paths.h stamp-paths kpathsea.h
 
 ## The programs
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 80a9b5983e6..8eee832ace1 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -353,7 +353,8 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 SUBDIRS = . doc man
 EXTRA_DIST = BUGS PROJECTS putenv.c strcasecmp.c strtol.c strstr.c \
-	mktex.cnf Makefile.in.orig common.ac.orig withenable.ac
+	bsnl.awk mktex.cnf Makefile.in.orig common.ac.orig \
+	withenable.ac
 INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
 AM_CFLAGS = $(WARNING_CFLAGS)
 lib_LTLIBRARIES = libkpathsea.la
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index a431d2b1469..973cd58b4a9 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -23,7 +23,7 @@ dnl   binaries built between releases.
 m4_define([kpse_lib_major], [6])[]dnl
 m4_define([kpse_lib_minor], [0])[]dnl
 m4_define([kpse_lib_micro], [0])[]dnl
-m4_define([kpse_lib_devel], [dev])[]dnl or "dev"
+m4_define([kpse_lib_devel], [dev])[]dnl empty or "dev"
 m4_define([kpse_version], [kpse_lib_major.kpse_lib_minor.kpse_lib_micro[]kpse_lib_devel])[]dnl
 
 AC_INIT([Kpathsea], [kpse_version], [tex-k@tug.org])
diff --git a/Build/source/texk/kpathsea/man/kpseaccess.man b/Build/source/texk/kpathsea/man/kpseaccess.man
index e446c2bd879..91af3e85c1b 100644
--- a/Build/source/texk/kpathsea/man/kpseaccess.man
+++ b/Build/source/texk/kpathsea/man/kpseaccess.man
@@ -1,4 +1,4 @@
-.TH KPSEACCESS 1 "4 January 1998" "Kpathsea @VERSION@"
+.TH KPSEACCESS 1 "7 April 2010" "Kpathsea @VERSION@"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
@@ -20,7 +20,7 @@
 kpseaccess \- determine whether a file can be accessed
 .SH SYNOPSIS
 .B kpseaccess
-.I [-rwx]
+.RB [ \-rwx ]
 .I file
 .\"=====================================================================
 .SH DESCRIPTION
@@ -28,13 +28,13 @@ Exit successfully if
 .I file
 can be accessed with the specified mode.
 The mode is one or more letters of
-.IR rwx ,
+.BR rwx ,
 where
-.I r
+.B r
 is for readable,
-.I w
+.B w
 is for writable, and
-.I x
+.B x
 is for executable.
 .PP
 The difference between
diff --git a/Build/source/texk/kpathsea/man/kpsestat.man b/Build/source/texk/kpathsea/man/kpsestat.man
index a78882f9d29..0e1bd0eba5d 100644
--- a/Build/source/texk/kpathsea/man/kpsestat.man
+++ b/Build/source/texk/kpathsea/man/kpsestat.man
@@ -1,4 +1,4 @@
-.TH KPSESTAT 1 "4 January 1998" "Kpathsea @VERSION@"
+.TH KPSESTAT 1 "7 April 2010" "Kpathsea @VERSION@"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
@@ -34,7 +34,7 @@ on standard output.  The
 parameter accepts a subset of the symbolic permissions accepted by
 .BR chmod (1).
 Use
-.I =
+.B =
 as the mode to obtain the unchanged permissions.
 .\"=====================================================================
 .SH OPTIONS
diff --git a/Build/source/texk/kpathsea/man/mktexpk.man b/Build/source/texk/kpathsea/man/mktexpk.man
index 1d455532236..ec8428daa40 100644
--- a/Build/source/texk/kpathsea/man/mktexpk.man
+++ b/Build/source/texk/kpathsea/man/mktexpk.man
@@ -1,4 +1,4 @@
-.TH MKTEXPK 1 "4 January 1998" "Kpathsea @VERSION@"
+.TH MKTEXPK 1 "7 April 2010" "Kpathsea @VERSION@"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
@@ -40,7 +40,7 @@ if possible.
 If
 .I redirect
 is given, it must be string of the form
-.I >&n
+.BI >& n
 where
 .I n
 is the number of the file descriptor which is to receive, instead of
diff --git a/Build/source/texk/kpathsea/man/mktextfm.man b/Build/source/texk/kpathsea/man/mktextfm.man
index 5ed015ade4b..c6cb34017ce 100644
--- a/Build/source/texk/kpathsea/man/mktextfm.man
+++ b/Build/source/texk/kpathsea/man/mktextfm.man
@@ -1,4 +1,4 @@
-.TH MKTEXTFM 1 "4 January 1998" "Kpathsea @VERSION@"
+.TH MKTEXTFM 1 "7 April 2010" "Kpathsea @VERSION@"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
@@ -20,7 +20,7 @@
 mktextfm \- create a TFM file for a font
 .SH SYNOPSIS
 .B mktextfm
-.RI [options]
+.RI [ options ]
 .I font
 .\"=====================================================================
 .SH DESCRIPTION