[yum-cvs] yum/docs yum.8,1.39,1.40 yum.conf.5,1.43,1.44

[James Bowes]

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

Modified Files:
	yum.8 yum.conf.5 
Log Message:
Store all config files under /etc/yum, with no fallback.

Index: yum.8
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.8,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- yum.8	21 Jun 2006 17:07:44 -0000	1.39
+++ yum.8	27 Jan 2007 03:04:49 -0000	1.40
@@ -293,9 +293,9 @@
 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.conf must be set to `1'.
+2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
 .LP
-3. A configuration file for the plugin must exist in 
+3. A configuration file for the plugin must exist in
 /etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
 file must set to `1'. The minimal content for such a configuration file is:
 .IP
@@ -308,8 +308,8 @@
 
 .PP
 .SH "FILES"
-.nf 
-/etc/yum.conf
+.nf
+/etc/yum/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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- yum.conf.5	17 Nov 2006 07:13:42 -0000	1.43
+++ yum.conf.5	27 Jan 2007 03:04:49 -0000	1.44
@@ -3,11 +3,11 @@
 .LP 
 \fByum.conf\fR \- Configuration file for \fByum(8)\fR.
 .SH "DESCRIPTION"
-.LP 
-Yum uses a configuration file at \fB/etc/yum.conf\fR. 
+.LP
+Yum uses a configuration file at \fB/etc/yum/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'). 
+\fBreposdir\fR option (default is `/etc/yum/repos.d').
 See the \fBreposdir\fR option below for further details.
 
 .SH "PARAMETERS"
@@ -34,11 +34,11 @@
 
 .IP \fBreposdir\fR
 A list of directories where yum should look for .repo files which define
-repositories to use. Default is `/etc/yum.repos.d, /etc/yum/repos.d'. Each
+repositories to use. Default is /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.conf to form the complete set of repositories
-that yum will use.
+repositories defined in /etc/yum/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'.
@@ -366,9 +366,9 @@
 If this is unset it inherits it from the global setting
 
 .SH "URL INCLUDE SYNTAX"
-.LP 
-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
+.LP
+The inclusion of external configuration files is supported for /etc/yum/yum.conf
+and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
 line of the following format:
 
 include=url://to/some/location
@@ -404,9 +404,9 @@
 
 
 .SH "FILES"
-.nf 
-/etc/yum.conf
-/etc/yum.repos.d/
+.nf
+/etc/yum/yum.conf
+/etc/yum/repos.d/
 /etc/yum/pluginconf.d/
 
 .SH "SEE ALSO"