summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2009-04-06 23:08:15 +0300
committerPanu Matilainen <pmatilai@redhat.com>2009-04-09 14:19:26 +0300
commitb6211ac1754986632a03efc6ed0de002e15f6d05 (patch)
tree844a2198c24e8740c5cc24c6a1cb28fbacc73195
parent79f3da5335ec7d6a9ab8734769e548668af2f4da (diff)
downloadrpm-b6211ac1754986632a03efc6ed0de002e15f6d05.tar.gz
rpm-b6211ac1754986632a03efc6ed0de002e15f6d05.tar.bz2
rpm-b6211ac1754986632a03efc6ed0de002e15f6d05.zip
Make it clearer that PACKAGE_FILE logic applies to all -F, -U, and -i.
(cherry picked from commit 0f29cc7f2781cdcedab9c8a03786d45f14fc316b)
-rw-r--r--doc/rpm.834
1 files changed, 15 insertions, 19 deletions
diff --git a/doc/rpm.8 b/doc/rpm.8
index f17874f07..c127659ea 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -185,41 +185,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
@@ -537,7 +533,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,