[yum-commits] docs/yum.8 docs/yum.conf.5

[James Antill]

 docs/yum.8      |    9 +++++++--
 docs/yum.conf.5 |   22 +++++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit 9ac470e821652ba781fe54e6f125c1da70098ba4
Author: James Antill <james at and.org>
Date:   Tue Apr 9 11:08:09 2013 -0400

    Update documentation for exclude, hopefully make it clearer to new users.

diff --git a/docs/yum.8 b/docs/yum.8
index 8d03a30..0af27bb 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -630,8 +630,13 @@ processing logic. For more information see the \fBupdate\fP command above.
 .br
 Configuration Option: \fBobsoletes\fP
 .IP "\fB\-x, \-\-exclude=package\fP"
-Exclude a specific package by name or glob from updates on all repositories.
-Configuration Option: \fBexclude\fP
+Exclude a specific package by name or glob from all repositories, so yum works
+as if that package was never in the repositories.
+This is commonly used so a package isn't upgraded or installed accidentally, but
+can be used to remove packages in any way that "yum list" will show packages.
+
+Can be disabled using --disableexcludes.
+Configuration Option: \fBexclude\fP, \fBincludepkgs\fP
 .br
 .IP "\fB\-\-color=[always|auto|never]\fP"
 Display colorized output automatically, depending on the output terminal,
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index e07d38c..15aaa06 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -149,10 +149,16 @@ Command-line option: \fB\-t\fP
 
 .IP
 \fBexclude\fR
-List of packages to exclude from updates or installs. This should be a space
+List of packages to exclude from all repositories, so yum works
+as if that package was never in the repositories.. This should be a space
 separated list.
+This is commonly used so a package isn't upgraded or installed accidentally, but
+can be used to remove packages in any way that "yum list" will show packages.
 Shell globs using wildcards (eg. * and ?) are allowed.
 
+Can be disabled using --disableexcludes.
+Command-line option: \fB\-x\fP
+
 .IP
 \fBexactarch\fR
 Either `1' or `0'. Set to `1' to make yum update only update the architectures
@@ -891,12 +897,18 @@ key will be automatically imported without user confirmation.
 Same as the [main] \fBexclude\fR option but only for this repository.
 Substitution variables, described below, are honored here.
 
+Can be disabled using --disableexcludes.
+
 .IP
 \fBincludepkgs\fR
-Inverse of exclude. This is a list of packages you want to use from a
-repository. If this option lists only one package then that is all yum will
-ever see from the repository. Defaults to an empty list.  Substitution
-variables, described below, are honored here.
+Inverse of exclude, yum will exclude any package in the repo. that doesn't
+match this list. This works in conjunction with exclude and doesn't override it,
+so if you exclude=*.i386 and includepkgs=python* then only packages starting
+with python that do not have an i386 arch. will be seen by yum in this repo.
+
+Substitution variables, described below, are honored here.
+
+Can be disabled using --disableexcludes.
 
 .IP
 \fBenablegroups\fR