|
 |
d2a170 |
commit 102915d4d402493c48d434ae1d1756225c4468e0
|
|
|
d2a170 |
Author: James Antill <james@and.org>
|
|
|
d2a170 |
Date: Mon Jun 14 01:15:21 2010 -0400
|
|
|
d2a170 |
|
|
|
d2a170 |
Port manpage files path fixups.
|
|
|
d2a170 |
|
|
|
d2a170 |
diff --git a/docs/yum.8 b/docs/yum.8
|
|
|
d2a170 |
index d5ede0a..3bdb408 100644
|
|
|
d2a170 |
--- a/docs/yum.8
|
|
|
d2a170 |
+++ b/docs/yum.8
|
|
|
d2a170 |
@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met:
|
|
|
d2a170 |
1. The plugin module file must be installed in the plugin path as just
|
|
|
d2a170 |
described.
|
|
|
d2a170 |
.LP
|
|
|
d2a170 |
-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
|
|
|
d2a170 |
+2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
|
|
|
d2a170 |
.LP
|
|
|
d2a170 |
3. A configuration file for the plugin must exist in
|
|
|
d2a170 |
/etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
|
|
|
d2a170 |
@@ -584,9 +584,9 @@ configuration options.
|
|
|
d2a170 |
.PP
|
|
|
d2a170 |
.SH "FILES"
|
|
|
d2a170 |
.nf
|
|
|
d2a170 |
-/etc/yum/yum.conf
|
|
|
d2a170 |
+/etc/yum.conf
|
|
|
d2a170 |
/etc/yum/version-groups.conf
|
|
|
d2a170 |
-/etc/yum/repos.d/
|
|
|
d2a170 |
+/etc/yum.repos.d/
|
|
|
d2a170 |
/etc/yum/pluginconf.d/
|
|
|
d2a170 |
/var/cache/yum/
|
|
|
d2a170 |
.fi
|
|
|
d2a170 |
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
|
|
|
d2a170 |
index ca36103..42815b9 100644
|
|
|
d2a170 |
--- a/docs/yum.conf.5
|
|
|
d2a170 |
+++ b/docs/yum.conf.5
|
|
|
d2a170 |
@@ -4,10 +4,10 @@
|
|
|
d2a170 |
\fByum.conf\fR \- Configuration file for \fByum(8)\fR.
|
|
|
d2a170 |
.SH "DESCRIPTION"
|
|
|
d2a170 |
.LP
|
|
|
d2a170 |
-Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
|
|
|
d2a170 |
+Yum uses a configuration file at \fB/etc/yum.conf\fR.
|
|
|
d2a170 |
.LP
|
|
|
d2a170 |
Additional configuration files are also read from the directories set by the
|
|
|
d2a170 |
-\fBreposdir\fR option (default is `/etc/yum/repos.d').
|
|
|
d2a170 |
+\fBreposdir\fR option (default is `/etc/yum.repos.d').
|
|
|
d2a170 |
See the \fBreposdir\fR option below for further details.
|
|
|
d2a170 |
|
|
|
d2a170 |
.SH "PARAMETERS"
|
|
|
d2a170 |
@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1'
|
|
|
d2a170 |
.IP
|
|
|
d2a170 |
\fBreposdir\fR
|
|
|
d2a170 |
A list of directories where yum should look for .repo files which define
|
|
|
d2a170 |
-repositories to use. Default is `/etc/yum/repos.d'. Each
|
|
|
d2a170 |
+repositories to use. Default is `/etc/yum.repos.d'. Each
|
|
|
d2a170 |
file in this directory should contain one or more repository sections as
|
|
|
d2a170 |
documented in \fB[repository] options\fR below. These will be merged with the
|
|
|
d2a170 |
-repositories defined in /etc/yum/yum.conf to form the complete set of
|
|
|
d2a170 |
+repositories defined in /etc/yum.conf to form the complete set of
|
|
|
d2a170 |
repositories that yum will use.
|
|
|
d2a170 |
|
|
|
d2a170 |
.IP
|
|
|
d2a170 |
@@ -745,8 +745,8 @@ for any given command. Defaults to False.
|
|
|
d2a170 |
|
|
|
d2a170 |
.SH "URL INCLUDE SYNTAX"
|
|
|
d2a170 |
.LP
|
|
|
d2a170 |
-The inclusion of external configuration files is supported for /etc/yum/yum.conf
|
|
|
d2a170 |
-and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
|
|
|
d2a170 |
+The inclusion of external configuration files is supported for /etc/yum.conf
|
|
|
d2a170 |
+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
|
|
|
d2a170 |
line of the following format:
|
|
|
d2a170 |
|
|
|
d2a170 |
include=url://to/some/location
|
|
|
d2a170 |
@@ -812,8 +812,8 @@ data in any value.
|
|
|
d2a170 |
|
|
|
d2a170 |
.SH "FILES"
|
|
|
d2a170 |
.nf
|
|
|
d2a170 |
-/etc/yum/yum.conf
|
|
|
d2a170 |
-/etc/yum/repos.d/
|
|
|
d2a170 |
+/etc/yum.conf
|
|
|
d2a170 |
+/etc/yum.repos.d/
|
|
|
d2a170 |
/etc/yum/pluginconf.d/
|
|
|
d2a170 |
/etc/yum/protected.d
|
|
|
d2a170 |
/etc/yum/vars
|