Documentation fiddles (#3638).

CVS patchset: 3238
CVS date: 1999/08/18 18:28:36

diff --git a/doc/manual/signatures b/doc/manual/signatures
index 503b0f6..39c08f5 100644 (file)
--- a/doc/manual/signatures
+++ b/doc/manual/signatures
@@ -17,16 +17,19 @@ Whereas previously you needed many rpmrc entries to clue in
 RPM about keyring locations and such, RPM now behaves as PGP
 users would expect.  The PGPPATH environment variable can be
 used to specify keyring locations.  You can also use a
-"pgp_path:" line in your rpmrc to specify a different value
+"%_pgpbin" line in your macros file to specify a different value
 for RPM to use for PGPPATH.  If neither of these are used PGP
 uses its default ($HOME/.pgp).
 
-If you just want to verify packages, you do not need any entries
-in your rpmrc (except possibly "pgp_path:").  The minimal rpmrc
-entries to use PGP for package building are:
+If you just want to verify packages, you need to supply values
+for the macros
+       %_pgpbin        the path to the pgp executable
+       %_signature     the type of signature to use
 
-signature: pgp
-pgp_name: <name to uniquely select the key to use for signing>
+In order to be able to sign packages, you may also have to
+supply values for
+       %_pgp_name      the pgp signature to use for signing
+       %_pgp_path      the path to the key ring
 
 Signature Creation
 ------------------

diff --git a/doc/rpm.8 b/doc/rpm.8
index 9de0ced..e7ba8e3 100644 (file)
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -493,15 +493,15 @@ be built and signed.
 
 For example, to be able to use PGP to sign packages as the user
 \fp"John Doe <jdoe@foo.com>"\fP from the key rings located in
-\fB/etc/rpm/.pgp\fP you would include
-
-.IP "\fB%_signature\fP"
-\fBpgp\fP
-.IP "\fB%_pgp_name\fP"
-\fB/etc/rpm/.pgp\fP
-.IP "\fB%_pgp_name\fP"
-\fBJohn Doe <jdoe@foo.com>"
-.PP
+\fB/etc/rpm/.pgp\fP using the executable \fB/usr/bin/pgp\fP you would include
+
+.I "\fB%_signature pgp\fP"
+
+.I "\fB%_pgp_name /etc/rpm/.pgp\fP"
+
+.I "\fB%_pgp_name John Doe <jdoe@foo.com>\fP"
+
+.I "\fB%_pgpbin /usr/bin/pgp\fP"
 
 in a macro configuration file. Use \fB/etc/rpm/macros\fP for per-system
 configuration and \fB~/.rpmmacros\fP for per-user configuration.
@@ -578,9 +578,17 @@ This option may also be specified by configuring the macro \fB_httpport\fP.
 /usr/lib/rpm/rpmrc
 /etc/rpmrc
 ~/.rpmrc
-/var/lib/rpm/packages
-/var/lib/rpm/pathidx
-/var/lib/rpm/nameidx
+/usr/lib/rpm/macros
+/etc/rpm/macros
+~/.rpmmacros
+/var/lib/rpm/conflictsindex.rpm
+/var/lib/rpm/fileindex.rpm
+/var/lib/rpm/groupindex.rpm
+/var/lib/rpm/nameindex.rpm
+/var/lib/rpm/packages.rpm
+/var/lib/rpm/providesindex.rpm
+/var/lib/rpm/requiredby.rpm
+/var/lib/rpm/triggerindex.rpm
 /tmp/rpm*
 .fi
 .El