[yum-commits] Branch 'yum-3_2_X' - docs/yum.conf.5

[James Antill]

 docs/yum.conf.5 |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 90f8085887a546bf41f0ebd9b2cae69b48f32c30
Author: James Antill <james at and.org>
Date:   Thu Jan 6 10:37:54 2011 -0500

    Add docs for protected_multilib.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 0281f1a..e1c3480 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -72,6 +72,16 @@ So any packages which should be protected can do so by including a file in
 
 Also if this configuration is set to anything, then yum will protect the
 package corresponding to the running version of the kernel.
+
+.IP
+\fBprotected_multilib\fR
+Either `1' or `0'. This tells yum whether or not it should perform a check to
+make sure that multilib packages are the same version. For example, if this
+option is off (rpm behaviour) pkgA-1.x86_64 and pkgA-2.i386 can be installed
+at the same time. However this is very rarely desired.
+install only packages, like the kernel, are excempt from this check.
+The default is `1'.
+
 .IP
 \fBlogfile\fR
 Full directory and file name for where yum should write its log file.