[yum-cvs] yum/docs yum.8, 1.39.2.2, 1.39.2.3 yum.conf.5, 1.42.2.2, 1.42.2.3

[James Bowes]

Update of /home/groups/yum/cvs/yum/docs
In directory login1.linux.duke.edu:/tmp/cvs-serv4778/docs

Modified Files:
      Tag: yum-3_0_X
	yum.8 yum.conf.5 
Log Message:
Go back to using the old config file locations, but support the new ones as well

Index: yum.8
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.8,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- yum.8	27 Jan 2007 14:59:41 -0000	1.39.2.2
+++ yum.8	31 Jan 2007 01:53:50 -0000	1.39.2.3
@@ -293,7 +293,7 @@
 1. The plugin module file must be installed in the plugin path as just
 described.
 .LP
-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
+2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
 .LP
 3. A configuration file for the plugin must exist in
 /etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
@@ -309,7 +309,7 @@
 .PP
 .SH "FILES"
 .nf
-/etc/yum/yum.conf
+/etc/yum.conf
 /etc/yum/repos.d/
 /etc/yum/pluginconf.d/
 /var/cache/yum/

Index: yum.conf.5
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.conf.5,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -u -r1.42.2.2 -r1.42.2.3
--- yum.conf.5	27 Jan 2007 03:05:37 -0000	1.42.2.2
+++ yum.conf.5	31 Jan 2007 01:53:50 -0000	1.42.2.3
@@ -4,7 +4,7 @@
 \fByum.conf\fR \- Configuration file for \fByum(8)\fR.
 .SH "DESCRIPTION"
 .LP
-Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
+Yum uses a configuration file at \fB/etc/yum.conf\fR.
 .LP
 Additional configuration files are also read from the directories set by the
 \fBreposdir\fR option (default is `/etc/yum.repos.d' and `/etc/yum/repos.d').
@@ -37,8 +37,8 @@
 repositories to use. Default is `/etc/yum.repos.d, /etc/yum/repos.d'. Each
 file in this directory should contain one or more repository sections as
 documented in \fB[repository] options\fR below. These will be merged with the
-repositories defined in /etc/yum/yum.conf to form the complete set of
-repositories that yum will use.
+repositories defined in /etc/yum.conf to form the complete set of repositories
+that yum will use.
 
 .IP \fBdebuglevel\fR
 Debug message output level. Practical range is 0\-10. Default is `2'.
@@ -367,7 +367,7 @@
 
 .SH "URL INCLUDE SYNTAX"
 .LP
-The inclusion of external configuration files is supported for /etc/yum/yum.conf
+The inclusion of external configuration files is supported for /etc/yum.conf
 and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
 line of the following format:
 
@@ -405,8 +405,8 @@
 
 .SH "FILES"
 .nf
-/etc/yum/yum.conf
-/etc/yum/repos.d/
+/etc/yum.conf
+/etc/yum.repos.d/
 /etc/yum/pluginconf.d/
 
 .SH "SEE ALSO"