Make it clearer that PACKAGE_FILE logic applies to all -F, -U, and -i.

(cherry picked from commit 0f29cc7f2781cdcedab9c8a03786d45f14fc316b)

1 files changed, 15 insertions, 19 deletions

diff --git a/doc/rpm.8 b/doc/rpm.8
index bf858faa1..4ac5ceb3a 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -184,41 +184,37 @@ will be run after a chroot(2) to
 \fIDIRECTORY\fR.
 .SS "INSTALL AND UPGRADE OPTIONS"
 .PP
+In these options, \fIPACKAGE_FILE\fR can be either \fBrpm\fR binary
+file or ASCII package manifest (see \fBPACKAGE SELECTION OPTIONS\fR), and
+may be specified as an
+\fBftp\fR or
+\fBhttp\fR URL,
+in which case the package will be downloaded before being
+installed. See \fBFTP/HTTP OPTIONS\fR
+for information on \fBrpm\fR's internal
+\fBftp\fR and
+\fBhttp\fR
+client support.
+.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 can be either \fBrpm\fR binary
-file or ASCII package manifest (see \fBPACKAGE SELECTION OPTIONS\fR), and
-may be specified as an
-\fBftp\fR or
-\fBhttp\fR URL,
-in which case the package will be downloaded before being
-installed. See \fBFTP/HTTP OPTIONS\fR
-for information on \fBrpm\fR's internal
-\fBftp\fR and
-\fBhttp\fR
-client support. 
+This will upgrade packages, but only ones for which an earlier version is
+installed.
 .PP
 .TP
 \fB--aid\fR
@@ -536,7 +532,7 @@ See \fBFTP/HTTP OPTIONS\fR for information on
 \fBhttp\fR
 client support. The \fIPACKAGE_FILE\fR argument(s),
 if not a binary package, will be interpreted as an ASCII package
-manifest unless \fB--nomanifest\fI option is used.  
+manifest unless \fB--nomanifest\fR option is used.  
 In manifests, comments are permitted, starting with a '#', and each
 line of a package manifest file may include white space separated
 glob expressions, including URL's,