RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jul-2007 08:01:44
Branch: HEAD Handle: 2007070207014400
Modified files:
rpm/doc rpm.8 rpm2cpio.8 rpmbuild.8 rpmcache.8 rpmdeps.8
rpmgraph.8
Log:
make the manpages more compact again by removing the doubled blank
lines (a single one is fully sufficient and what is usually used by
manpages); use rpm5.org URL
Summary:
Revision Changes Path
1.33 +1 -46 rpm/doc/rpm.8
1.4 +0 -1 rpm/doc/rpm2cpio.8
1.10 +2 -22 rpm/doc/rpmbuild.8
1.7 +1 -6 rpm/doc/rpmcache.8
1.3 +0 -5 rpm/doc/rpmdeps.8
1.4 +1 -5 rpm/doc/rpmgraph.8
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/doc/rpm.8
============================================================================
$ cvs diff -u -r1.32 -r1.33 rpm.8
--- rpm/doc/rpm.8 25 May 2007 17:35:58 -0000 1.32
+++ rpm/doc/rpm.8 2 Jul 2007 06:01:44 -0000 1.33
@@ -10,63 +10,41 @@
.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] [\fBverify-options\fR]
-
-
\fBrpm\fR \fB--import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR
-
-
\fBrpm\fR {\fB-K|--checksig\fR} [\fB--nosignature\fR] [\fB--nodigest\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
.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\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--fileid \fIMD5\fB\fR] [\fB--hdrid \fISHA1\fB\fR] [\fB--pkgid
\fIMD5\fB\fR] [\fB--tid \fITID\fB\fR]
@@ -76,7 +54,6 @@
.SS "query-options"
.PP
-
[\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]
@@ -86,7 +63,6 @@
.SS "verify-options"
.PP
-
[\fB--nodeps\fR] [\fB--nofiles\fR] [\fB--noscripts\fR]
[\fB--nodigest\fR] [\fB--nosignature\fR]
[\fB--nolinkto\fR] [\fB--nomd5\fR] [\fB--nosize\fR] [\fB--nouser\fR]
@@ -95,7 +71,6 @@
.SS "install-options"
.PP
-
[\fB--aid\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]
@@ -186,26 +161,20 @@
.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
@@ -373,9 +342,7 @@
.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
@@ -437,9 +404,7 @@
.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
@@ -644,9 +609,7 @@
.PP
The general form of an rpm verify command is
.PP
-
\fBrpm\fR {\fB-V|--verify\fR} [\fBselect-options\fR] [\fBverify-options\fR]
-
.PP
Verifying a package compares information about the installed files in
the package with information about the files taken from the package
@@ -732,14 +695,10 @@
.PP
The general forms of rpm digital signature commands are
.PP
-
-
\fBrpm\fR \fB--import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR
-
\fBrpm\fR {\fB--checksig\fR} [\fB--nosignature\fR] [\fB--nodigest\fR]
\fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
-
.PP
The \fB--checksig\fR option checks all the digests and signatures contained
in
\fIPACKAGE_FILE\fR to ensure
@@ -768,9 +727,7 @@
\fBrpm -e gpg-pubkey-db42a60e\fR
.SS "SIGNING A PACKAGE"
.PP
-
\fBrpm\fR \fB--addsign|--resign\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
-
.PP
Both of the \fB--addsign\fR and \fB--resign\fR
options generate and insert new signatures for each package
@@ -823,9 +780,7 @@
.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]
-
.PP
Use \fB--initdb\fR to create a new database, use
\fB--rebuilddb\fR to rebuild the database indices from
@@ -977,7 +932,7 @@
\fBrpmbuild\fR(8),
.fi
-\fBhttp://wraptastic.org/ <URL:http://wraptastic.org/>
+\fBhttp://rpm5.org/ <URL:http://rpm5.org/>
\fR
.SH "AUTHORS"
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpm2cpio.8
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpm2cpio.8
--- rpm/doc/rpm2cpio.8 25 May 2007 17:35:58 -0000 1.3
+++ rpm/doc/rpm2cpio.8 2 Jul 2007 06:01:44 -0000 1.4
@@ -13,7 +13,6 @@
.I "\fBrpm2cpio rpm-1.1-1.i386.rpm\fP"
.br
.I "\fBrpm2cpio - < glint-1.0-1.i386.rpm\fP"
-
.SH SEE ALSO
.IR rpm (8)
.SH AUTHOR
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpmbuild.8
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpmbuild.8
--- rpm/doc/rpmbuild.8 25 May 2007 17:35:58 -0000 1.9
+++ rpm/doc/rpmbuild.8 2 Jul 2007 06:01:44 -0000 1.10
@@ -9,32 +9,19 @@
.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
-
.SS "rpmbuild-options"
.PP
-
-
[\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.
@@ -104,10 +91,7 @@
.PP
The general form of an rpm build command is
.PP
-
-\fBrpmbuild\fR \fB-b\fISTAGE\fB|-t\fISTAGE\fB\fR [ \fB rpmbuild-options
-\fR ] \fB\fIFILE\fB\fR\fI ...\fR
-
+\fBrpmbuild\fR \fB-b\fISTAGE\fB|-t\fISTAGE\fB\fR [\fBrpmbuild-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
@@ -188,9 +172,7 @@
.PP
There are two other ways to invoke building with rpm:
.PP
-
\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,
@@ -202,9 +184,7 @@
.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
@@ -261,7 +241,7 @@
\fBrpm\fR(8),
.fi
-\fBhttp://wraptastic.org/ <URL:http://wraptastic.org/>
+\fBhttp://rpm5.org/ <URL:http://rpm5.org/>
\fR
.SH "AUTHORS"
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpmcache.8
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpmcache.8
--- rpm/doc/rpmcache.8 25 May 2007 17:35:58 -0000 1.6
+++ rpm/doc/rpmcache.8 2 Jul 2007 06:01:44 -0000 1.7
@@ -8,10 +8,7 @@
rpmcache \- Cache RPM Package Headers
.SH SYNOPSIS
.PP
-
-
\fBrpmcache\fR [ \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR ]
-
.SH "DESCRIPTION"
.PP
\fBrpmcache\fR walks a file tree, possibly remotely using
@@ -111,12 +108,10 @@
using bugzilla:
http://bugzilla.redhat.com/ <URL:http://bugzilla.redhat.com/>
.SH "SEE ALSO"
-
\fBrpm\fR(8),
\fBglob\fR(7),
-\fB http://www.rpm.org/ <URL:http://www.rpm.org/>
+\fBhttp://rpm5.org/ <URL:http://rpm5.org/>
\fR
.SH "AUTHORS"
-
Jeff Johnson <[EMAIL PROTECTED]>
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpmdeps.8
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmdeps.8
--- rpm/doc/rpmdeps.8 25 May 2007 17:35:58 -0000 1.2
+++ rpm/doc/rpmdeps.8 2 Jul 2007 06:01:44 -0000 1.3
@@ -8,10 +8,7 @@
rpmdeps \- Generate RPM Package Dependencies
.SH SYNOPSIS
.PP
-
-
\fBrpmdeps\fR \fB{-P|--provides}\fR \fB{-R|--requires}\fR
\fB\fIFILE\fB\fR\fI ...\fR
-
.SH "DESCRIPTION"
.PP
\fBrpmdeps\fR generates package dependencies
@@ -22,8 +19,6 @@
.SH "SEE ALSO"
\fBrpm\fR(8),
-
\fBrpmbuild\fR(8),
.SH "AUTHORS"
-
Jeff Johnson <[EMAIL PROTECTED]>
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/rpmgraph.8
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmgraph.8
--- rpm/doc/rpmgraph.8 25 May 2007 17:35:58 -0000 1.3
+++ rpm/doc/rpmgraph.8 2 Jul 2007 06:01:44 -0000 1.4
@@ -8,10 +8,7 @@
rpmgraph \- Display RPM Package Dependency Graph
.SH SYNOPSIS
.PP
-
-
\fBrpmgraph\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
-
.SH "DESCRIPTION"
.PP
\fBrpmgraph\fR uses \fIPACKAGE_FILE\fR arguments
@@ -35,10 +32,9 @@
.SH "SEE ALSO"
\fBdot\fR(1),
-
\fBdotty\fR(1),
-\fB http://www.graphviz.org/ <URL:http://www.graphviz.org/>
+\fBhttp://www.graphviz.org/ <URL:http://www.graphviz.org/>
\fR
.SH "AUTHORS"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
