summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2010-01-23 14:50:17 +0200
committerPanu Matilainen <pmatilai@redhat.com>2010-01-25 12:09:21 +0200
commitd390e2544660e028bf42441c8cec57b4b92c018e (patch)
tree88b5018529ef9150910b0faa50cf699b58db5ef3 /doc
parent5f2d9d118744367e607e553181aa1f6300edd766 (diff)
downloadrpm-d390e2544660e028bf42441c8cec57b4b92c018e.tar.gz
rpm-d390e2544660e028bf42441c8cec57b4b92c018e.tar.bz2
rpm-d390e2544660e028bf42441c8cec57b4b92c018e.zip
Document --conflicts in rpm(8).
Diffstat (limited to 'doc')
-rw-r--r--doc/rpm.813
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/rpm.8 b/doc/rpm.8
index 4e038f4e6..ae89d7955 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -77,11 +77,11 @@ rpm \- RPM Package Manager
.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]
- [\fB-R,--requires\fR] [\fB--scripts\fR] [\fB-s,--state\fR]
- [\fB--triggers,--triggerscripts\fR]
+ [\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\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 "verify-options"
.PP
@@ -590,6 +590,9 @@ Display change information for the package.
\fB-c, --configfiles\fR
List only configuration files (implies \fB-l\fR).
.TP
+\fB--conflicts\fR
+List capabilities this package conflicts with.
+.TP
\fB-d, --docfiles\fR
List only documentation files (implies \fB-l\fR).
.TP