Update rpm.8 and rpmbuild.8 from docbook in max-rpm CVS.

CVS patchset: 5475
CVS date: 2002/06/09 17:12:35

2 files changed, 185 insertions, 105 deletions

diff --git a/doc/rpm.8 b/doc/rpm.8
index 913bb8543..76df95b7b 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -3,73 +3,119 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RPM" "8" "06 June 2001" "Red Hat, Inc." "Red Hat Linux"
+.TH "RPM" "8" "09 June 2002" "Red Hat, Inc." "Red Hat Linux"
 .SH NAME
 rpm \- RPM Package Manager
 .SH SYNOPSIS
 .SS "QUERYING AND VERIFYING PACKAGES:"
 .PP
 
+
 \fBrpm\fR {\fB-q|--query\fR} [\fBselect-options\fR] [\fBquery-options\fR]
 
+
+
 \fBrpm\fR {\fB-V|--verify\fR} [\fBselect-options\fR] [\fB--nodeps\fR] [\fB--nofiles\fR] [\fB--nomd5\fR] [\fB--noscripts\fR]
 
-\fBrpm\fR {\fB-K|--checksig\fR} [\fB--nogpg\fR] [\fB--nopgp\fR] [\fB--nomd5\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
+
+\fBrpm\fR {\fB-K|--checksig\fR} [\fB--nogpg\fR] [\fB--nopgp\fR] [\fB--nomd5\fR]
+    \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .SS "INSTALLING, UPGRADING, AND REMOVING PACKAGES:"
 .PP
 
+
 \fBrpm\fR {\fB-i|--install\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
 
+
+
 \fBrpm\fR {\fB-U|--upgrade\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
 
+
+
 \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
 
-\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+
+
+\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR]
+    [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI\ ...\fR
+
 .SS "BUILDING PACKAGES:"
 .PP
 
-\fBrpm\fR {\fB-ba|-bb|-bp|-bc|-bi|-bl|-bs\fR} [\fBbuild-options\fR] \fB\fISPECFILE\fB\fR\fI ...\fR
 
-\fBrpm\fR {\fB-ta|-tb|-tp|-tc|-ti|-tl|-ts\fR} [\fBbuild-options\fR] \fB\fITARBALL\fB\fR\fI ...\fR
+\fBrpm\fR {\fB-ba|-bb|-bp|-bc|-bi|-bl|-bs\fR} [\fBbuild-options\fR]
+    \fB\fISPECFILE\fB\fR\fI\ ...\fR
+
+
+
+\fBrpm\fR {\fB-ta|-tb|-tp|-tc|-ti|-tl|-ts\fR} [\fBbuild-options\fR]
+    \fB\fITARBALL\fB\fR\fI\ ...\fR
+
+
 
 \fBrpm\fR {\fB--rebuild|--recompile\fR} \fB\fISOURCEPKG\fB\fR\fI ...\fR
 
 .SS "MISCELLANEOUS:"
 .PP
 
+
 \fBrpm\fR {\fB--initdb|--rebuilddb\fR}
 
+
+
 \fBrpm\fR {\fB--addsign|--resign\fR} \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
 
+
+
 \fBrpm\fR {\fB--querytags|--showrc\fR}
 
+
+
 \fBrpm\fR {\fB--setperms|--setugids\fR} \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+
 .SS "SELECT-OPTIONS"
 .PP
 
-\fB[\fIPACKAGE_NAME\fB] [-a,--all]
-[-f,--file\ \fIFILE\fB] [-g,--group\ \fIGROUP\fB] [-p,--package\ \fIPACKAGE_FILE\fB]
-[--querybynumber\ \fINUMBER\fB] [--triggeredby\ \fIPACKAGE_NAME\fB]
-[--whatprovides\ \fICAPABILITY\fB] [--whatrequires\ \fICAPABILITY\fB]\fR
+
+ [\fB\fIPACKAGE_NAME\fB\fR] [\fB-a,--all\fR] [\fB-f,--file \fIFILE\fB\fR]
+ [\fB-g,--group \fIGROUP\fB\fR] {\fB-p,--package \fIPACKAGE_FILE\fB\fR]
+ [\fB--querybynumber \fINUMBER\fB\fR] [\fB--triggeredby \fIPACKAGE_NAME\fB\fR]
+ [\fB--whatprovides \fICAPABILITY\fB\fR] [\fB--whatrequires \fICAPABILITY\fB\fR]
+
 .SS "QUERY-OPTIONS"
 .PP
 
-\fB[--changelog] [-c,--configfiles] [-d,--docfiles] [--dump] [--filesbypkg]
-[-i,--info] [--last] [-l,--list] [--provides] [--qf,--queryformat\ \fIQUERYFMT\fB] [-R,--requires]
-[--scripts] [-s,--state] [--triggers,--triggerscripts]\fR
+
+ [\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB-d,--docfiles\fR] [\fB--dump\fR]
+ [\fB--filesbypkg\fR] [\fB-i,--info\fR] [\fB--last\fR] [\fB-l,--list\fR]
+ [\fB--provides\fR] [\fB--qf,--queryformat \fIQUERYFMT\fB\fR]
+ [\fB-R,--requires\fR] [\fB--scripts\fR] [\fB-s,--state\fR]
+ [\fB--triggers,--triggerscripts\fR]
+
 .SS "INSTALL-OPTIONS"
 .PP
 
-\fB[--allfiles] [--badreloc] [--excludepath\ \fIOLDPATH\fB] [--excludedocs] [--force] [-h,--hash]
-[--ignoresize] [--ignorearch] [--ignoreos] [--includedocs] [--justdb]
-[--nodeps] [--noorder] [--noscripts] [--notriggers]
-[--oldpackage] [--percent] [--prefix \fINEWPATH\fB] [--relocate\ \fIOLDPATH\fB=\fINEWPATH\fB]
-[--repackage] [--replacefiles] [--replacepkgs] [--test]\fR
+
+ [\fB--allfiles\fR] [\fB--badreloc\fR] [\fB--excludepath \fIOLDPATH\fB\fR]
+ [\fB--excludedocs\fR] [\fB--force\fR] [\fB-h,--hash\fR]
+ [\fB--ignoresize\fR] [\fB--ignorearch\fR] [\fB--ignoreos\fR]
+ [\fB--includedocs\fR] [\fB--justdb\fR] [\fB--nodeps\fR]
+ [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR]
+ [\fB--oldpackage\fR] [\fB--percent\fR] [\fB--prefix \fINEWPATH\fB\fR]
+ [\fB--relocate \fIOLDPATH\fB=\fINEWPATH\fB\fR]
+ [\fB--repackage\fR] [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
+ [\fB--test\fR]
+
 .SS "BUILD-OPTIONS"
 .PP
 
-\fB[--buildroot \fIDIRECTORY\fB] [--clean] [--nobuild] [--rmsource] [--rmspec]
-[--short-circuit] [--sign] [--target\ \fIPLATFORM\fB]\fR
+
+[\fB--buildroot \fIDIRECTORY\fB\fR] [\fB--clean\fR] [\fB--nobuild\fR]
+[\fB--rmsource\fR] [\fB--rmspec\fR] [\fB--short-circuit\fR]
+[\fB--sign\fR] [\fB--target \fIPLATFORM\fB\fR]
+
 .SH "DESCRIPTION"
 .PP
 \fBrpm\fR is a powerful \fBPackage Manager\fR,
@@ -130,7 +176,7 @@ information.
 Only the first file in the list must exist, and tildes will be
 expanded to the value of \fB$HOME\fR.
 The default \fIFILELIST\fR is
-\fI/usr/lib/rpm/rpmrc\fR:\fI/etc/rpmrc\fR:\fI~/.rpmrc\fR.
+\fI/usr/lib/rpm/rpmrc\fR:\fI/usr/lib/rpm/redhat/rpmrc\fR:\fI~/.rpmrc\fR.
 .TP
 \fB--pipe \fICMD\fB\fR
 Pipes the output of \fBrpm\fR to the command \fICMD\fR.
@@ -140,31 +186,38 @@ Use the database in \fIDIRECTORY\fR rathen
 than the default path \fI/var/lib/rpm\fR
 .TP
 \fB--root \fIDIRECTORY\fB\fR
-Use the system rooted at \fIDIRECTORY\fR for all operations.
-Note that this means the database will be read or modified under
-\fIDIRECTORY\fR and any
-\fB%pre\fR or
-\fB%post\fR
-scriptlet(s) are run after a chroot(2) to
+Use the file system tree rooted at \fIDIRECTORY\fR for all operations.
+Note that this means the database within
+\fIDIRECTORY\fR
+will be used for dependency checks and any scriptlet(s) (e.g.
+\fB%post\fR if installing, or
+\fB%prep\fR if building, a package)
+will be run after a chroot(2) to
 \fIDIRECTORY\fR.
 .SS "INSTALL AND UPGRADE OPTIONS"
 .PP
 The general form of an rpm install command is 
 .PP
+
 \fBrpm\fR {\fB-i|--install\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .PP
 This installs a new package.
 .PP
 The general form of an rpm upgrade command is 
 .PP
+
 \fBrpm\fR {\fB-U|--upgrade\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .PP
 This upgrades or installs the package currently installed
 to a newer version.  This is the same as install, except
 all other version(s) of the package are removed after the
 new package is installed.
 .PP
+
 \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .PP
 This will upgrade packages, but only if an earlier version
 currently exists. The \fIPACKAGE_FILE\fR
@@ -313,18 +366,22 @@ already installed, packages.
 Install the packages even if some of them are already installed
 on this system.
 .TP
-\fB--test\fR
+\fB--nobuild\fR
 Do not install the package, simply check for and report
 potential conflicts.
 .SS "QUERY OPTIONS"
 .PP
 The general form of an rpm query command is 
 .PP
+
 \fBrpm\fR {\fB-q|--query\fR} [\fBselect-options\fR] [\fBquery-options\fR]
+
 .PP
 You may specify the format that package information should be
 printed in. To do this, you use the
- {\fB--qf|--queryformat\fR} \fB\fIQUERYFMT\fB\fR
+
+ \fB--qf|--queryformat\fR \fB\fIQUERYFMT\fB\fR
+
 option, followed by the \fIQUERYFMT\fR
 format string.  Query formats are modifed versions of the
 standard \fBprintf(3)\fR formatting. The format
@@ -475,7 +532,9 @@ the package.
 .PP
 The general form of an rpm verify command is 
 .PP
+
 \fBrpm\fR {\fB-V|--verify\fR} [\fBselect-options\fR] [\fB--nodeps\fR] [\fB--nofiles\fR] [\fB--nomd5\fR] [\fB--noscripts\fR]
+
 .PP
 Verifying a package compares information about the installed files in
 the package with information about the files taken from the package
@@ -504,47 +563,44 @@ Don't verify file MD5 checksums.
 Don't execute the \fB%verifyscript\fR scriptlet (if any).
 .PP
 The format of the output is a string of 8 characters, a possible
-"\fBc\fR" denoting a configuration file, and then
-the file name. Each of the 8 characters denotes the result of
-a comparison of attribute(s) of the file to the value of those
-attribute(s) recorded in the database.
-A single
+attribute marker:
+
+.nf
+\fBc\fR \fB%config\fR configuration file
+\fBd\fR \fB%doc\fR documentation file
+\fBg\fR \fB%ghost\fR file (i.e. the file contents were not included in the package)
+.fi
+
+from the package header and then the file name.
+Each of the 8 characters denotes the result of a comparison of
+attribute(s) of the file to the value of those attribute(s) recorded
+in the database.  A single
 "\fB.\fR" (period)
 means the test passed, while a single
-"\fB?\fR"
+"\fB?\fR" (question mark)
 indicates the test could not be performed (e.g. file permissions
 prevent reading). Otherwise, the (mnemonically
 em\fBB\fRoldened) character denotes failure of
 the corresponding \fB--verify\fR test:
 
-\fBS\fR
-file \fBS\fRize differs
-
-\fBM\fR
-\fBM\fRode differs (includes permissions and file type)
-
-\fB5\fR
-MD\fB5\fR sum differs
-
-\fBD\fR
-\fBD\fRevice major/minor number mis-match
-
-\fBL\fR
-read\fBL\fRink(2) path mis-match
-
-\fBU\fR
-\fBU\fRser ownership differs
-
-\fBG\fR
-\fBG\fRroup ownership differs
+.nf
+\fBS\fR file \fBS\fRize differs
+\fBM\fR \fBM\fRode differs (includes permissions and file type)
+\fB5\fR MD\fB5\fR sum differs
+\fBD\fR \fBD\fRevice major/minor number mis-match
+\fBL\fR read\fBL\fRink(2) path mis-match
+\fBU\fR \fBU\fRser ownership differs
+\fBG\fR \fBG\fRroup ownership differs
+\fBT\fR m\fBT\fRime differs
+.fi
 
-\fBT\fR
-m\fBT\fRime differs
 .SS "SIGNATURE CHECKING"
 .PP
 The general form of an rpm signature check command is 
 .PP
-\fBrpm\fR \fB--checksig\fR [\fB--nogpg\fR] [\fB--nopgp\fR] [\fB--nomd5\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
+\fBrpm\fR {\fB--checksig\fR} [\fB--nogpg\fR] [\fB--nopgp\fR] [\fB--nomd5\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .PP
 This checks the GPG signature of package
 \fIPACKAGE_FILE\fR to ensure
@@ -555,7 +611,9 @@ for details.
 .PP
 The general form of an rpm erase command is 
 .PP
+
 \fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+
 .PP
 The following options may also be used:
 .TP
@@ -617,7 +675,9 @@ for debugging.
 .PP
 The general form of an rpm build command is 
 .PP
+
 \fBrpm\fR {\fB-b\fISTAGE\fB|-t\fISTAGE\fB\fR} [\fBbuild-options\fR] \fB\fIFILE\fB\fR\fI ...\fR
+
 .PP
 The argument used is \fB-b\fR if a spec file is being
 used to build the package and \fB-t\fR if \fBrpm\fR
@@ -696,7 +756,9 @@ accordingly.
 .PP
 There are two other ways to invoke building with rpm:
 .PP
+
 \fBrpm\fR {\fB--rebuild|--recompile\fR} \fB\fISOURCEPKG\fB\fR\fI ...\fR
+
 .PP
 When invoked this way, \fBrpm\fR installs the named source
 package, and does a prep, compile and install.  In addition,
@@ -706,7 +768,9 @@ has completed, the build directory is removed (as in
 the package are removed.
 .SS "SIGNING A PACKAGE"
 .PP
+
 \fBrpm\fR {\fB--addsign|--resign\fR} \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
+
 .PP
 The \fB--addsign\fR option generates and inserts
 new signatures for each package.  Any existing signatures will
@@ -759,7 +823,9 @@ for per-user configuration.
 .PP
 The general form of an rpm rebuild database command is 
 .PP
-\fBrpm\fR {\fB--initdb|--rebuilddb\fR} [\fB-v\fR] [\fB--dbpath\ \fIDIRECTORY\fB\fR] [\fB--root\ \fIDIRECTORY\fB\fR]
+
+\fBrpm\fR {\fB--initdb|--rebuilddb\fR} [\fB-v\fR] [\fB--dbpath \fIDIRECTORY\fB\fR] [\fB--root \fIDIRECTORY\fB\fR]
+
 .PP
 Use \fB--initdb\fR to create a new database, use
 \fB--rebuilddb\fR to rebuild the database indices from
@@ -824,48 +890,46 @@ of the default port. This option may also be specified by configuring
 the macro \fB%_httpport\fR.
 .SH "FILES"
 .PP
+.nf
 \fI/usr/lib/rpm/rpmrc\fR
-
+\fI/usr/lib/rpm/redhat/rpmrc\fR
 \fI/etc/rpmrc\fR
-
 \fI~/.rpmrc\fR
+.fi
 
+.nf
 \fI/usr/lib/rpm/macros\fR
-
+\fI/usr/lib/rpm/redhat/macros\fR
 \fI/etc/rpm/macros\fR
-
 \fI~/.rpmmacros\fR
+.fi
 
+.nf
 \fI/var/lib/rpm/Conflictname\fR
-
 \fI/var/lib/rpm/Basenames\fR
-
 \fI/var/lib/rpm/Group\fR
-
 \fI/var/lib/rpm/Name\fR
-
 \fI/var/lib/rpm/Packages\fR
-
 \fI/var/lib/rpm/Providename\fR
-
 \fI/var/lib/rpm/Requirename\fR
-
 \fI/var/lib/rpm/Triggername\fR
+.fi
 
 \fI/var/tmp/rpm*\fR
 .SH "SEE ALSO"
 
+.nf
 \fBpopt\fR(3),
-
 \fBrpm2cpio\fR(8),
-
 \fBrpmbuild\fR(8),
+.fi
 
-\fBhttp://www.rpm.org/\fR
+\fBhttp://www.rpm.org/ <URL:http://www.rpm.org/>
+\fR
 .SH "AUTHORS"
 
+.nf
 Marc Ewing <marc@redhat.com>
-
 Jeff Johnson <jbj@redhat.com>
-
 Erik Troan <ewt@redhat.com>
+.fi
diff --git a/doc/rpmbuild.8 b/doc/rpmbuild.8
index 50ae3ac60..e70240892 100644
--- a/doc/rpmbuild.8
+++ b/doc/rpmbuild.8
@@ -3,28 +3,38 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RPMBUILD" "8" "06 June 2001" "Red Hat, Inc." "Red Hat Linux"
+.TH "RPMBUILD" "8" "09 June 2002" "Red Hat, Inc." "Red Hat Linux"
 .SH NAME
 rpmbuild \- Build RPM Package(s)
 .SH SYNOPSIS
 .SS "BUILDING PACKAGES:"
 .PP
 
+
 \fBrpmbuild\fR {\fB-ba|-bb|-bp|-bc|-bi|-bl|-bs\fR} [\fBrpmbuild-options\fR] \fB\fISPECFILE\fB\fR\fI ...\fR
 
+
+
 \fBrpmbuild\fR {\fB-ta|-tb|-tp|-tc|-ti|-tl|-ts\fR} [\fBrpmbuild-options\fR] \fB\fITARBALL\fB\fR\fI ...\fR
 
+
+
 \fBrpmbuild\fR {\fB--rebuild|--recompile\fR} \fB\fISOURCEPKG\fB\fR\fI ...\fR
 
 .SS "MISCELLANEOUS:"
 .PP
 
-\fBrpmbuild\fR {\fB--showrc\fR}
+
+\fBrpmbuild\fR \fB--showrc\fR
+
 .SS "RPMBUILD-OPTIONS"
 .PP
 
-\fB[--buildroot \fIDIRECTORY\fB] [--clean] [--nobuild] [--rmsource] [--rmspec]
-[--short-circuit] [--sign] [--target \fIPLATFORM\fB]\fR
+
+ [\fB--buildroot \fIDIRECTORY\fB\fR] [\fB--clean\fR] [\fB--nobuild\fR]
+ [\fB--rmsource\fR] [\fB--rmspec\fR] [\fB--short-circuit\fR] [\fB--sign\fR]
+ [\fB--target \fIPLATFORM\fB\fR]
+
 .SH "DESCRIPTION"
 .PP
 \fBrpmbuild\fR is used to build both binary and source software packages.
@@ -72,7 +82,7 @@ information.
 Only the first file in the list must exist, and tildes will be
 expanded to the value of \fB$HOME\fR.
 The default \fIFILELIST\fR is
-\fI/usr/lib/rpm/rpmrc\fR:\fI/etc/rpmrc\fR:\fI~/.rpmrc\fR.
+\fI/usr/lib/rpm/rpmrc\fR:\fI/usr/lib/rpm/redhat/rpmrc\fR:\fI~/.rpmrc\fR.
 .TP
 \fB--pipe \fICMD\fB\fR
 Pipes the output of \fBrpm\fR to the command \fICMD\fR.
@@ -82,18 +92,22 @@ Use the database in \fIDIRECTORY\fR rathen
 than the default path \fI/var/lib/rpm\fR
 .TP
 \fB--root \fIDIRECTORY\fB\fR
-Use the system rooted at \fIDIRECTORY\fR for all operations.
-Note that this means the database will be read or modified under
-\fIDIRECTORY\fR and any
-\fB%pre\fR or
-\fB%post\fR
-scriptlet(s) are run after a chroot(2) to
+Use the file system tree rooted at \fIDIRECTORY\fR for all operations.
+Note that this means the database within
+\fIDIRECTORY\fR
+will be used for dependency checks and any scriptlet(s) (e.g.
+\fB%post\fR if installing, or
+\fB%prep\fR if building, a package)
+will be run after a chroot(2) to
 \fIDIRECTORY\fR.
 .SS "BUILD OPTIONS"
 .PP
 The general form of an rpm build command is 
 .PP
-\fBrpmbuild\fR {\fB-b\fISTAGE\fB|-t\fISTAGE\fB\fR} [\fBrpmbuild-options\fR] \fB\fIFILE\fB\fR\fI ...\fR
+
+\fBrpmbuild\fR \fB-b\fISTAGE\fB|-t\fISTAGE\fB\fR [ \fB     rpmbuild-options
+\fR ] \fB\fIFILE\fB\fR\fI ...\fR
+
 .PP
 The argument used is \fB-b\fR if a spec file is being
 used to build the package and \fB-t\fR if \fBrpmbuild\fR
@@ -159,7 +173,9 @@ and \fB-bi\fR.
 \fB--sign\fR
 Embed a GPG signature in the package. This signature can be used
 to verify the integrity and the origin of the package.  See the
-section on GPG SIGNATURES for configuration details.
+section on GPG SIGNATURES in
+\fBrpm\fR(8)
+for configuration details.
 .TP
 \fB--target \fIPLATFORM\fB\fR
 When building the package, interpret \fIPLATFORM\fR
@@ -172,7 +188,9 @@ accordingly.
 .PP
 There are two other ways to invoke building with rpm:
 .PP
-\fBrpmbuild\fR {\fB--rebuild|--recompile\fR} \fB\fISOURCEPKG\fB\fR\fI ...\fR
+
+\fBrpmbuild\fR \fB--rebuild|--recompile\fR \fB\fISOURCEPKG\fB\fR\fI ...\fR
+
 .PP
 When invoked this way, \fBrpmbuild\fR installs the named source
 package, and does a prep, compile and install.  In addition,
@@ -184,7 +202,9 @@ the package are removed.
 .PP
 The command
 .PP
+
 \fBrpmbuild\fR \fB--showrc\fR
+
 .PP
 shows the values \fBrpmbuild\fR will use for all of the
 options are currently set in
@@ -194,51 +214,47 @@ configuration file(s).
 .SH "FILES"
 .PP
 
+.nf
 \fI/usr/lib/rpm/rpmrc\fR
-
+\fI/usr/lib/rpm/redhat/rpmrc\fR
 \fI/etc/rpmrc\fR
-
 \fI~/.rpmrc\fR
+.fi
 
+.nf
 \fI/usr/lib/rpm/macros\fR
-
+\fI/usr/lib/rpm/redhat/macros\fR
 \fI/etc/rpm/macros\fR
-
 \fI~/.rpmmacros\fR
+.fi
 
+.nf
 \fI/var/lib/rpm/Conflictname\fR
-
 \fI/var/lib/rpm/Basenames\fR
-
 \fI/var/lib/rpm/Group\fR
-
 \fI/var/lib/rpm/Name\fR
-
 \fI/var/lib/rpm/Packages\fR
-
 \fI/var/lib/rpm/Providename\fR
-
 \fI/var/lib/rpm/Requirename\fR
-
 \fI/var/lib/rpm/Triggername\fR
+.fi
 
 \fI/var/tmp/rpm*\fR
 .SH "SEE ALSO"
 
+.nf
 \fBpopt\fR(3),
-
 \fBrpm2cpio\fR(8),
-
 \fBgendiff\fR(1),
-
 \fBrpm\fR(8),
+.fi
 
-\fB http://www.rpm.org/ <URL:http://www.rpm.org/>
+\fBhttp://www.rpm.org/ <URL:http://www.rpm.org/>
 \fR
 .SH "AUTHORS"
 
+.nf
 Marc Ewing <marc@redhat.com>
-
 Jeff Johnson <jbj@redhat.com>
-
 Erik Troan <ewt@redhat.com>
+.fi