+2005-07-10 Junichi Uekawa <dancer@debian.org>

+
+	* pbuilder-user-mode-linux.1:
+	* pdebuild-user-mode-linux.1:
+	* pdebuild.1:
+	* pbuilder.8: use \- for dash.
+

6 files changed, 155 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ff1293..4f21887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-10  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-user-mode-linux.1: 
+	* pdebuild-user-mode-linux.1: 
+	* pdebuild.1: 
+	* pbuilder.8: use \- for dash.
+
 2005-07-03  Junichi Uekawa  <dancer@debian.org>
 
 	* testsuite/run-test.sh (RESULTFILE): remove vmstat and iostat. I don't really need them; 
diff --git a/debian/changelog b/debian/changelog
index fa0dec8..d50b18b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,14 @@ pbuilder (0.129) UNRELEASED; urgency=low
 
   * TODO items updated
   * updated testsuite to test sid/sarge/etch and upgrades.
+  * changed manpages to use \- instead of - for dash.
   
   TODO for this release:
   gnupg install and new key install hooks.
-  revert back to using --variant=buildd.
+  - revert back to using --variant=buildd, depends on 314858.
+  - work with new version of su.
   
- --
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 10 Jul 2005 20:03:34 +0900
 
 pbuilder (0.128) unstable; urgency=low
 
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 7497df3..f27a368 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -1,16 +1,16 @@
-.TH "pbuilder-user-mode-linux" 1 "2005 Jun 12" "Debian" "pbuilder"
+.TH "pbuilder\-user\-mode\-linux" 1 "2005 Jun 12" "Debian" "pbuilder"
 .SH NAME
-pbuilder-user-mode-linux \- personal package builder in UML
+pbuilder\-user\-mode\-linux \- personal package builder in UML
 .SH SYNOPSIS
-.BI "pbuilder-user-mode-linux create [" "options" "]"
+.BI "pbuilder\-user\-mode\-linux create [" "options" "]"
 .PP
-.BI "pbuilder-user-mode-linux update [" "options" "]"
+.BI "pbuilder\-user\-mode\-linux update [" "options" "]"
 .PP
-.BI "pbuilder-user-mode-linux build [" "options" "] " ".dsc-file"
+.BI "pbuilder\-user\-mode\-linux build [" "options" "] " ".dsc-file"
 .PP
-.BI "pbuilder-user-mode-linux execute [" "options" "] " "script"
+.BI "pbuilder\-user\-mode\-linux execute [" "options" "] " "script"
 .PP
-.BI "pbuilder-user-mode-linux login [" "options" "]"
+.BI "pbuilder-user\-mode\-linux login [" "options" "]"
 .SH DESCRIPTION
 Front end program to the 
 .B "pbuilder"
@@ -20,7 +20,7 @@ environment.
 
 Unlike 
 .B "pbuilder", 
-.B "pbuilder-user-mode-linux"
+.B "pbuilder\-user\-mode\-linux"
 does not require root privilege to run.
 It should be ran under a normal user.
 
@@ -38,7 +38,7 @@ Updates the
 user-mode-linux root image
 for the specified distribution.
 Also, by specifying the 
-.B "--distribution"
+.B "\-\-distribution"
 option, it is possible to switch the distribution.
 Specify a dummy distribution value 
 even for custom apt config files.
@@ -67,110 +67,110 @@ and run it.
 The remaining command-line arguments are passed on to the script.
 
 .TP
-.BI "--uml-image [" "UML image" "]"
+.BI "\-\-uml\-image [" "UML image" "]"
 Specify the UML image to use.
 
 .TP
-.BI "--eth0 [" "uml option for eth0" "]"
+.BI "\-\-eth0 [" "uml option for eth0" "]"
 Specify this option as parameter to UML.
 
 Specify
-.B "--eth0=slirp,12345,/usr/bin/slirp-fullbolt"
+.B "\-\-eth0=slirp,12345,/usr/bin/slirp\-fullbolt"
 to use the slirp connection.
 
 .TP
-.BI "--uml-ip [" "IP inside UML" "]"
+.BI "\-\-uml\-ip [" "IP inside UML" "]"
 Specify this to set the IP inside UML.
 
 .TP
-.BI "--uml-netmask [" "netmask" "]"
+.BI "\-\-uml\-netmask [" "netmask" "]"
 The netmask.
 
 .TP
-.BI "--uml-network [" "network" "]"
+.BI "\-\-uml\-network [" "network" "]"
 The network address.
 
 .TP
-.BI "--uml-broadcast [" "broadcast" "]"
+.BI "\-\-uml\-broadcast [" "broadcast" "]"
 The broadcast address.
 
 .TP
-.BI "--uml-gateway [" "gateway" "]"
+.BI "\-\-uml\-gateway [" "gateway" "]"
 The gateway address.
 
 .TP
-.BI "--mount-tmpfs [" "yes" "]"
+.BI "\-\-mount\-tmpfs [" "yes" "]"
 Specify whether to mount tmpfs inside UML chroot.
 
 .TP
-.BI "--uml-hostname [" "uml-host" "]"
+.BI "\-\-uml\-hostname [" "uml-host" "]"
 The hostname inside uml.
 
 .TP
-.BI "--distribution [" "sid" "]"
+.BI "\-\-distribution [" "sid" "]"
 Specify the distribution.
 see pbuilder.8
 
 .TP
-.BI "--binary-arch"
+.BI "\-\-binary-arch"
 Specify only to build binary-arch targets.
 see pbuilder.8
 
 .TP
-.BI "--timeout " "timeouttime"
+.BI "\-\-timeout " "timeouttime"
 Timeout build after specified time.
 see pbuilder.8
 
 .TP
-.BI "--configfile " "config file to read"
+.BI "\-\-configfile " "config file to read"
 Makes pbuilder to read the config file inside UML.
 pbuilder-user-mode-linux itself would be affected by the contents of the 
 config file.
 
 .TP
-.BI "--hookdir " "location of hooks"
+.BI "\-\-hookdir " "location of hooks"
 Makes pbuilder use the specified hookdir inside UML.
 
 .TP
-.BI "--aptconfdir " "apt configuretion directory"
+.BI "\-\-aptconfdir " "apt configuretion directory"
 Makes pbuilder to use specified apt configuration directory instead of 
 other settings. See pbuilder.8
 
 .TP 
-.BI "--override-config"
+.BI "\-\-override\-config"
 Specify this option along with
-.B --distribution 
+.B \-\-distribution 
 to switch distribution using 
-.B "pbuilder-user-mode-linux update"
+.B "pbuilder\-user\-mode\-linux update"
 
 .TP 
-.BI "--logfile " "logfilename"
+.BI "\-\-logfile " "logfilename"
 Specify this option to make the output go to 
 .I logfilename
 instead of standard output.
 
 .TP 
-.BI "--buildresult " "/dir/to/build/result"
+.BI "\-\-buildresult " "/dir/to/build/result"
 The directory where build result is placed to
 
 .TP
-.BI "--uml-debugmode"
-Enable tracing of shell scripts used by pbuilder-user-mode-linux.
+.BI "\-\-uml\-debugmode"
+Enable tracing of shell scripts used by pbuilder\-user\-mode\-linux.
 
 .TP 
-.BI "--bindmounts " "/dir/to/bind-mount"
+.BI "\-\-bindmounts " "/dir/to/bind-mount"
 Bind-mount the directory inside the chroot inside the user-mode-linux.
 
 .TP
-.BI "--buildplace " "place-to-put-COW-file"
+.BI "\-\-buildplace " "place-to-put-COW-file"
 Specify the directory to place the COW file.
 The user needs to be able to access that directory,
 and the directory must exist.
 
 .TP
-.BI "--uml-login-nocow"
+.BI "\-\-uml\-login\-nocow"
 Do not use COW filesystem when using 
-.B "pbuilder-user-mode-linux login"
+.B "pbuilder\-user\-mode\-linux login"
 so that changes made in the log in session will persist.
 
 Effective in 
@@ -182,7 +182,7 @@ options.
 \" copied from pbuilder.8
 
 .TP
-.BI "--mirror [" "mirror location" "]"
+.BI "\-\-mirror [" "mirror location" "]"
 Specifies the url of Debian mirror to be 
 specified in 
 .B "sources.list"
@@ -202,12 +202,12 @@ the chroot, and specifying
 will most probably fail.
 
 .TP
-.BI "--nonusmirror [" "mirror location" "]"
+.BI "\-\-nonusmirror [" "mirror location" "]"
 The non-US mirror, specified like the 
-.B "--mirror"
+.B "\-\-mirror"
 option
 .TP
-.BI "--othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
+.BI "\-\-othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
 The lines which is added to the sources.list, delimited with 
 .B "|"
 Like 
@@ -223,12 +223,12 @@ constructed sources file, so this is the place to list your
 .B "local"
 mirror sites; apt will then use them in preference to the ones 
 listed in 
-.B "--mirror"
+.B "\-\-mirror"
 and
-.B "--nonusmirror".
+.B "\-\-nonusmirror".
 
 These options are only valid when
-.B "--override-config"
+.B "\-\-override\-config"
 option is specified in 
 .B "update"
 target, or when
@@ -243,10 +243,10 @@ For
 and
 .B login
 targets, 
-.B pbuider-user-mode-linux
+.B pbuider\-user\-mode\-linux
 will try to use COW devices.
 
-Inside user-mode-linux, pbuilder-uml will mount 
+Inside user-mode-linux, pbuilder-user-mode-linux will mount 
 tmpfs as 
 .B /tmp
 to avoid temporary file race conditions with outside of UML.
@@ -262,11 +262,11 @@ The default settings for pbuilder, used as fallback for all
 values that is not specified in
 .B "/etc/pbuilderrc."
 .TP
-.B "/etc/pbuilder/pbuilder-uml.conf"
+.B "/etc/pbuilder/pbuilder\-uml.conf"
 System-wide configuration file for pbuilder-uml, 
 it will take priority over pbuilder configurations.
 .TP
-.B "/usr/share/pbuilder/pbuilder-uml.conf"
+.B "/usr/share/pbuilder/pbuilder\-uml.conf"
 Software-default configuration file for pbuilder-uml.
 .TP
 .B "${HOME}/.pbuilderrc"
@@ -277,7 +277,7 @@ User-default configuration file.
 .RI "rootstrap (" 1 "), "
 .RI "linux (" 1 "), "
 .RI "pbuilderrc (" 5 "), "
-.RI "pbuilder-uml.conf (" 5 ") "
+.RI "pbuilder\-uml.conf (" 5 ") "
 
 
 
diff --git a/pbuilder.8 b/pbuilder.8
index 05ef5b0..1606eac 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -1,4 +1,4 @@
-.TH "pbuilder" 8 "2005 Jun 3" "Debian" "pbuilder"
+.TH "pbuilder" 8 "2005 Jul 10" "Debian" "pbuilder"
 .SH NAME
 pbuilder \- personal package builder
 .SH SYNOPSIS
@@ -31,14 +31,14 @@ Updates the
 .B "base.tgz"
 for the specified distribution.
 Also, by specifying the 
-.B "--override-config"
+.B "\-\-override\-config"
 option, it is possible to install a new apt-line using 
 the given options and settings in the configuration file 
 for the base.tgz.
 
 For example, to switch the distribution of an existing
 base.tgz to etch, specify the
-.B "--distribution etch --override-config" 
+.B "\-\-distribution etch \-\-override\-config" 
 options to update.
 
 .TP
@@ -64,7 +64,7 @@ Any changes you make will not be kept.
 Only use this for temporary and debugging purposes.
 Do not bind-mount filesystems directly inside the chroot.
 Use
-.B "--bindmounts" 
+.B "\-\-bindmounts" 
 option to mount.
 
 .TP
@@ -94,7 +94,7 @@ and it does not accept most command-line options.
 This may change in the future.
 
 .TP
-.BI "--basetgz [" "basetgz-location" "]"
+.BI "\-\-basetgz [" "basetgz-location" "]"
 Specifies the location of 
 .B "base.tgz"
 
@@ -105,7 +105,7 @@ and
 .B "pbuilder create"
 
 .TP
-.BI "--buildplace [" "location of build" "]"
+.BI "\-\-buildplace [" "location of build" "]"
 Specifies the location where building and 
 .B "base.tgz"
 updating and creation takes place. This is 
@@ -115,7 +115,7 @@ A subdirectory of that directory using the current PID of the
 process is used.
 
 .TP
-.BI "--buildresult [" "location to put build result" "]"
+.BI "\-\-buildresult [" "location to put build result" "]"
 Specifies the location the build result gets into after building.
 The deb files and other files that have resulted from build 
 is copied there.
@@ -127,7 +127,7 @@ overwriting already existing deb files with
 the newly generated ones.
 
 .TP
-.BI "--mirror [" "mirror location" "]"
+.BI "\-\-mirror [" "mirror location" "]"
 Specifies the url of Debian mirror to be 
 specified in 
 .B "sources.list"
@@ -147,12 +147,12 @@ the chroot, and specifying
 will most probably fail.
 
 .TP
-.BI "--nonusmirror [" "mirror location" "]"
+.BI "\-\-nonusmirror [" "mirror location" "]"
 The non-US mirror, specified like the 
-.B "--mirror"
+.B "\-\-mirror"
 option
 .TP
-.BI "--othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
+.BI "\-\-othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]"
 The lines which is added to the sources.list, delimited with 
 .B "|"
 Like 
@@ -168,12 +168,12 @@ constructed sources file, so this is the place to list your
 .B "local"
 mirror sites; apt will then use them in preference to the ones 
 listed in 
-.B "--mirror"
+.B "\-\-mirror"
 and
-.B "--nonusmirror".
+.B "\-\-nonusmirror".
 
 These options are only valid when
-.B "--override-config"
+.B "\-\-override\-config"
 option is specified in 
 .B "update"
 target, or when
@@ -181,12 +181,12 @@ target, or when
 is being called.
 
 .TP
-.BI "--http-proxy [" "proxy" "]"
+.BI "\-\-http\-proxy [" "proxy" "]"
 Specifies the http proxy url. Something like
 .B "http://xxx.xxx.xxx.xxx:8080/"
 should do. 
 .TP
-.BI "--distribution [" "distribution" "]"
+.BI "\-\-distribution [" "distribution" "]"
 Specifies the distribution used. Currently the supported values are
 .B "sid"
 .B "sarge"
@@ -200,18 +200,18 @@ This option is only effective for
 or when 
 .B "pbuilder update"
 is specified with 
-.B "--override-config"
+.B "\-\-override\-config"
 option.
 
 .TP
-.BI "--aptcache [" "location of retrieved package files" "]"
+.BI "\-\-aptcache [" "location of retrieved package files" "]"
 Specifies the location where the packages downloaded by apt should
 be cached. Use
-.B "--aptcache """""
+.B "\-\-aptcache """""
 if you want caching to be turned off.
 
 .TP
-.BI "--removepackages [" "packages to remove" "]"
+.BI "\-\-removepackages [" "packages to remove" "]"
 Removes the packages on creating the 
 .BR "base.tgz" "."
 Use this option to remove potentially dangerous or undesirable
@@ -224,7 +224,7 @@ surrounded in double quotations, like
 .B """lilo gcc mawk"""
 
 .TP
-.BI "--extrapackages [" "packages to add" "]"
+.BI "\-\-extrapackages [" "packages to add" "]"
 Adds packages specified as an addition to the default,
 which is 
 .B "build-essential"
@@ -240,13 +240,13 @@ and
 The packages should be specified as a space-delimited list.
 
 .TP
-.BI "--configfile [" "configuration file to load" "]"
+.BI "\-\-configfile [" "configuration file to load" "]"
 Loads the configuration file.
 
 \" START OF hookdir description
 
 .TP
-.BI "--hookdir [" "location of user scripts" "]"
+.BI "\-\-hookdir [" "location of user scripts" "]"
 Specifies the location where scripts for user intervention during
 the create and update process are stored. Currently scripts are
 executed at only one point, on exit from the chrooted environment,
@@ -262,10 +262,10 @@ environment. Files ending in ~ or .bak are ignored.
 Although it may not seem necessary, 
 .B "pbuilder update" 
 does not invoke the hooks if 
-.B "--hookdir"
+.B "\-\-hookdir"
 is empty, so if you want to avoid running hooks,
 run pbuilder with
-.B "--hookdir """""
+.B "\-\-hookdir """""
 
 If there is a distribution hook, for example, if 
 there was a file 
@@ -323,33 +323,33 @@ target.
 
 
 .TP
-.BI "--debemail [" "maintainer-name <email-address>" "]"
+.BI "\-\-debemail [" "maintainer-name <email-address>" "]"
 
 Specifies that dpkg-buildpackage be called with
 .BI "-m" "maintainer-name <email-address>"
 instead of default value specified in the environment
 variable, or pbuilderrc
 
-.B "This option is almost obsolete, use --debbuildopts instead"
+.B "This option is almost obsolete, use \-\-debbuildopts instead"
 
 .TP
-.BI "--debbuildopts [" "options" "]"
+.BI "\-\-debbuildopts [" "options" "]"
 
 List of options that are passed on to dpkg-buildpackage. Overrides
 any value given in DEBBUILDOPTS as specified in
 pbuilderrc.
 
 .TP
-.BI "--logfile [" "file to log" "]"
+.BI "\-\-logfile [" "file to log" "]"
 Specifies the logfile to create. 
 The messages generated during execution will be written to the file, 
 instead of messages coming to the 
 standard output.
 
 .TP
-.BI "--pkgname-logfile"
+.BI "\-\-pkgname\-logfile"
 Alternative option to 
-.B "--logfile"
+.B "\-\-logfile"
 option. 
 Automatically creates a logfile that is named by the .dsc file name,
 only really applicable for 
@@ -357,7 +357,7 @@ only really applicable for
 target
 
 .TP
-.BI "--aptconfdir [" "APT configuration directory to use" "]"
+.BI "\-\-aptconfdir [" "APT configuration directory to use" "]"
 Uses the apt configuration file found in the specified directory 
 as the chroot configuration.
 .B "/etc/apt"
@@ -368,16 +368,16 @@ This option overrides other options, and may cause some inconsistency
 problems.
 
 .TP
-.BI "--timeout [" "timeout in sleep time" "]"
+.BI "\-\-timeout [" "timeout in sleep time" "]"
 Time out building after sleeping set time.
 Specify something like
-.B "--timeout 10h"
+.B "\-\-timeout 10h"
 in the command line.
 Default is no timeout.
 
 
 .TP
-.BI "--override-config"
+.BI "\-\-override\-config"
 
 Specify to use different apt set up inside the chroot than it was used for creating the 
 base.tgz.
@@ -386,21 +386,21 @@ target set up.
 
 
 .TP
-.BI "--binary-arch"
+.BI "\-\-binary\-arch"
 
 Specify to build architecture specific targets instead of all targets.
 Setting
-.B "--debbuildopts"
+.B "\-\-debbuildopts"
 after this option will re-set some parts of the effect.
 
 Use this option rather than using 
-.B "--debbuildopts -B"
+.B "\-\-debbuildopts -B"
 
 .TP
-.BI "--no-targz"
+.BI "\-\-no\-targz"
 Not using base.tgz for operation.
 The
-.B "--buildplace"
+.B "\-\-buildplace"
 will not be deleted and reconstructed from
 a 
 .B .tar.gz
@@ -408,7 +408,7 @@ file.
 Also, 
 .B "pbuilder"
 will not add its process ID to the
-.B "--buildplace"
+.B "\-\-buildplace"
 as it usually would.
 
 Useful when experimenting with 
@@ -417,19 +417,19 @@ of
 .B "pbuilder."
 
 .TP
-.BI "--preserve-buildplace"
+.BI "\-\-preserve\-buildplace"
 Do not clean the
-.B "--buildplace"
+.B "\-\-buildplace"
 if it has the same contents as the
 .B .tar.gz
 file, and no modifications are done.
 
 As with
-.BR "--no-targz" ","
+.BR "\-\-no\-targz" ","
 suppresses appending
 .BR "pbuilder" "'s"
 process ID to the
-.BR "--buildplace" "."
+.BR "\-\-buildplace" "."
 
 This is useful if you want to attempt to build a large number of
 packages successively, but you expect that many of them cannot have
@@ -439,13 +439,13 @@ It will clean up the build place on failure,
 or after a successful build.
 
 .TP
-.BI "--bindmounts " "bind-mount-points"
+.BI "\-\-bindmounts " "bind-mount-points"
 Bind-mount the specified directories to inside the chroot.
 .I "bind-mount-points"
 is a space-delimited list of directories to bind-mount.
 
 .TP
-.BI "--debug"
+.BI "\-\-debug"
 
 Turn on Debug mode of pbuilder, to be verbose about errors,
 and try to avoid cleanup processing when error happens in 
@@ -455,13 +455,13 @@ and try to avoid cleanup processing when error happens in
 targets.
 
 .TP
-.BI "--debootstrapopts " "--variant=buildd"
+.BI "\-\-debootstrapopts " "\-\-variant=buildd"
 Add extra command-line options to debootstrap.
 
 .TP
-.BI "--save-after-login "
+.BI "\-\-save\-after\-login "
 .TP
-.BI "--save-after-exec "
+.BI "\-\-save\-after\-exec "
 Save the chroot image after exiting from the chroot instead of 
 deleting changes.
 Effective for 
@@ -472,14 +472,14 @@ session.
 
 
 .TP
-.BI "--autocleanaptcache"
+.BI "\-\-autocleanaptcache"
 Clean apt cache automatically, to run apt-get autoclean to only 
 keep the packages which are required for the version of Debian.
 This is useful when you keep a aptcache directory for each distribution
 and want to keep the size of the aptcache down.
 
 .TP
-.BI "--help"
+.BI "\-\-help"
 
 Show a brief help message.
 
diff --git a/pdebuild-user-mode-linux.1 b/pdebuild-user-mode-linux.1
index f5e1535..83bc92b 100644
--- a/pdebuild-user-mode-linux.1
+++ b/pdebuild-user-mode-linux.1
@@ -1,12 +1,12 @@
-.TH "pdebuild-user-mode-linux" 1 "2004 Jul 29" "Debian" "pbuilder"
+.TH "pdebuild\-user\-mode\-linux" 1 "2005 Jul 10" "Debian" "pbuilder"
 .SH NAME
-pdebuild-user-mode-linux \- pbuilder-user-mode-linux way of doing debuild
+pdebuild\-user\-mode\-linux \- pbuilder\-user\-mode\-linux way of doing debuild
 .SH SYNOPSIS
-.BI "pdebuild-user-mode-linux [" "pdebuild-user-mode-linux options" "] -- [" "pbuilder-user-mode-linux options" "]"
+.BI "pdebuild\-user\-mode\-linux [" "pdebuild\-user\-mode\-linux options" "] \-\- [" "pbuilder\-user\-mode\-linux options" "]"
 .PP
 .SH "DESCRIPTION"
 A convenience program for 
-.B pbuilder-user-mode-linux
+.B pbuilder\-user\-mode\-linux
 which invokes pbuilder after obtaining appropriate root privilate 
 in a Debian source directory.
 One must be inside the source tree containing the
@@ -16,46 +16,46 @@ directory, in order to make it work.
 .SH "PDEBUILD OPTIONS"
 .TP
 
-.BI "--buildsourceroot [" "fakeroot" "]"
+.BI "\-\-buildsourceroot [" "fakeroot" "]"
 The command used to gain root privilege for 
 invoking dpkg-buildpackage
 
 .TP
-.BI "--auto-debsign"
+.BI "\-\-auto\-debsign"
 
 Invoke debsign at the end of pdebuild process.
 
 .TP
-.BI "--debsign-k [" "key-id" "]"
+.BI "\-\-debsign\-k [" "key-id" "]"
 
 Pass 
-.B -k
+.B "\-k"
 option to debsign to specify which keyid to sign.
 
 .TP
-.BI "--buildresult [" "Directory for build results" "]"
+.BI "\-\-buildresult [" "Directory for build results" "]"
 
 The place which build result is stored.
 
 .TP
-.BI "--configfile [" "Extra config file to use" "]"
+.BI "\-\-configfile [" "Extra config file to use" "]"
 
 The configuration file is used, but not passed on to 
-.BR "pbuilder-user-mode-linux" .
+.BR "pbuilder\-user\-mode\-linux" .
 
 .TP
-.BI "--debbuildopts [" "options to pass to dpkg-buildpackage" "]"
+.BI "\-\-debbuildopts [" "options to pass to dpkg\-buildpackage" "]"
 
-The space-delimited list of options are passed to dpkg-buildpackage.
+The space-delimited list of options are passed to dpkg\-buildpackage.
 This option overrides pbuilder option 
-.B "--debbuildopts"
+.B "\-\-debbuildopts"
 
 .TP
-.BI "--use-pdebuild-internal"
+.BI "\-\-use\-pdebuild\-internal"
 Uses a different implementation of pdebuild, which calls clean and build inside 
 the chroot, using bind-mounts.
 
-.B "pdebuild-internal"
+.B "pdebuild\-internal"
 tries to run debian/rules clean inside the chroot.
 To achieve the goal, the working directory is passed on inside the chroot,
 in the form of bind-mounting and
@@ -66,32 +66,32 @@ This option will not protect the working directory and its parent directories
 from the build scripts.
 
 .TP
-.BI "-- [" "pbuilder options" "]"
+.BI "\-\- [" "pbuilder options" "]"
 
 After the 
-.B "--"
+.B "\-\-"
 symbol, an arbitrary number of pbuilder options can be specified.
 See pbuilder-user-mode-linux.1 for full list of options.
 
 
 There is an exception that
-.B "--buildresult"
+.B "\-\-buildresult"
 needs to be specified as pdebuild option before the 
-.B "--"
+.B "\-\-"
 to be effective.
 
 .SH "FILES"
 .TP
 .I "/etc/pbuilderrc"
-The configuration file for pbuilder-user-mode-linux, used in pdebuild-user-mode-linux.
+The configuration file for pbuilder\-user\-mode\-linux, used in pdebuild\-user\-mode\-linux.
 
 .TP
 .I "/usr/share/pbuilder/pbuilderrc"
-The default configuration file for pbuilder-user-mode-linux, used in pdebuild-user-mode-linux.
+The default configuration file for pbuilder\-user\-mode\-linux, used in pdebuild\-user\-mode\-linux.
 
 .TP
 .I "${HOME}/.pbuilderrc"
-Configuration file for pbuilder-user-mode-linux, used in pdebuild-user-mode-linux,
+Configuration file for pbuilder\-user\-mode\-linux, used in pdebuild\-user\-mode\-linux,
 overrides what is written in
 .B /etc/pbuilderrc
 
@@ -103,6 +103,6 @@ The homepage is available at
 .B "\%http://www.netfort.gr.jp/~dancer/software/pbuilder.html"
 
 .SH "SEE ALSO"
-.RI "pbuilder-user-mode-linux (" 1 "), "
+.RI "pbuilder\-user\-mode\-linux (" 1 "), "
 .RI "pbuilderrc (" 5 "), "
-.RI "pbuilder-uml.conf (" 5 ") "
+.RI "pbuilder\-uml.conf (" 5 ") "
diff --git a/pdebuild.1 b/pdebuild.1
index 92b719b..9682922 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -1,8 +1,8 @@
-.TH "pdebuild" 1 "2002 Sep 25" "Debian" "pbuilder"
+.TH "pdebuild" 1 "2005 Jul 10" "Debian" "pbuilder"
 .SH NAME
 pdebuild \- pbuilder way of doing debuild
 .SH SYNOPSIS
-.BI "pdebuild [" "pdebuild options" "] -- [" "pbuilder options" "]"
+.BI "pdebuild [" "pdebuild options" "] \-\- [" "pbuilder options" "]"
 .PP
 .SH DESCRIPTION
 A convenience program for 
@@ -15,28 +15,28 @@ directory, in order to make it work.
 
 .SH "PDEBUILD OPTIONS"
 .TP
-.BI "--buildsourceroot [" "fakeroot" "]"
+.BI "\-\-buildsourceroot [" "fakeroot" "]"
 The command used to gain root privilege for 
 invoking dpkg-buildpackage
 
 .TP
-.BI "--pbuilderroot [" "sudo" "]"
+.BI "\-\-pbuilderroot [" "sudo" "]"
 The command used to gain root privilege for 
 invoking pbuilder.
 
 .TP
-.BI "--auto-debsign"
+.BI "\-\-auto\-debsign"
 
 Invoke debsign at the end of pdebuild process.
 
 .TP
-.BI "--debsign-k [" "key-id" "]"
+.BI "\-\-debsign\-k [" "key\-id" "]"
 Pass 
-.B -k
+.B \-k
 option to debsign to specify which keyid to sign.
 
 .TP
-.BI "--buildresult [" "Directory for build results" "]"
+.BI "\-\-buildresult [" "Directory for build results" "]"
 
 The place which build result is stored.
 
@@ -44,24 +44,24 @@ Note that for pdebuild, the setting for buildresult needs to be specified
 here in the command-line.
 
 .TP
-.BI "--configfile [" "Extra config file to use" "]"
+.BI "\-\-configfile [" "Extra config file to use" "]"
 
 The configuration file is used, and passed on to 
 .BR "pbuilder" .
 
 .TP
-.BI "--debbuildopts [" "options to pass to dpkg-buildpackage" "]"
+.BI "\-\-debbuildopts [" "options to pass to dpkg-buildpackage" "]"
 
 The space-delimited list of options are passed to dpkg-buildpackage.
 This option overrides pbuilder option 
-.B "--debbuildopts"
+.B "\-\-debbuildopts"
 
 .TP
-.BI "--use-pdebuild-internal"
+.BI "\-\-use\-pdebuild\-internal"
 Uses a different implementation of pdebuild, which calls clean and build inside 
 the chroot, using bind-mounts.
 
-.B "pdebuild-internal"
+.B "pdebuild\-internal"
 tries to run debian/rules clean inside the chroot.
 To achieve the goal, the working directory is passed on inside the chroot,
 in the form of bind-mounting and
@@ -72,30 +72,30 @@ This option will not protect the working directory and its parent directories
 from the build scripts.
 
 .TP
-.BI "--logfile [" "file to log" "]"
+.BI "\-\-logfile [" "file to log" "]"
 Specifies the logfile to create. 
 The messages generated during execution will be written to the file, 
 instead of messages coming to the 
 standard output.
 
 .TP
-.BI "--help"
+.BI "\-\-help"
 
 Show a brief help message.
 
 .TP
-.BI "-- [" "pbuilder options" "]"
+.BI "\-\- [" "pbuilder options" "]"
 
 After the 
-.B "--"
+.B "\-\-"
 symbol, an arbitrary number of pbuilder options can be specified.
 See pbuilder.8 for full list of options.
 
 
 There is an exception that
-.B "--buildresult"
+.B "\-\-buildresult"
 needs to be specified as pdebuild option before the 
-.B "--"
+.B "\-\-"
 to be effective.
 
 .SH "FILES"