Seth Vidal 3ac6088
diff -urN olddocs/yum.8 docs/yum.8
Seth Vidal 3ac6088
--- olddocs/yum.8	2008-03-17 12:09:29.000000000 -0400
Seth Vidal 3ac6088
+++ docs/yum.8	2008-03-17 12:08:18.000000000 -0400
Seth Vidal 3ac6088
@@ -339,8 +339,8 @@
4d7eb0e
 .PP
4d7eb0e
 .SH "FILES"
4d7eb0e
 .nf
4d7eb0e
-/etc/yum/yum.conf
Seth Vidal 3ac6088
-/etc/yum/repos.d/
4d7eb0e
+/etc/yum.conf
Seth Vidal 3ac6088
+/etc/yum.repos.d/
4d7eb0e
 /etc/yum/pluginconf.d/
4d7eb0e
 /var/cache/yum/
Seth Vidal 3ac6088
 .fi 
Seth Vidal aa2246f
Seth Vidal aa2246f
--- olddocs/yum.conf.5.orig	2009-01-21 13:33:04.000000000 -0500
Seth Vidal aa2246f
+++ docs/yum.conf.5	2009-01-21 13:34:47.000000000 -0500
Seth Vidal aa2246f
@@ -4,10 +4,10 @@
Seth Vidal aa2246f
 \fByum.conf\fR \- Configuration file for \fByum(8)\fR.
Seth Vidal aa2246f
 .SH "DESCRIPTION"
Seth Vidal aa2246f
 .LP
Seth Vidal aa2246f
-Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
Seth Vidal aa2246f
+Yum uses a configuration file at \fB/etc/yum.conf\fR.
Seth Vidal aa2246f
 .LP
Seth Vidal aa2246f
 Additional configuration files are also read from the directories set by the
Seth Vidal aa2246f
-\fBreposdir\fR option (default is `/etc/yum/repos.d').
Seth Vidal aa2246f
+\fBreposdir\fR option (default is `/etc/yum.repos.d').
Seth Vidal aa2246f
 See the \fBreposdir\fR option below for further details.
Seth Vidal aa2246f
 
Seth Vidal aa2246f
 .SH "PARAMETERS"
Seth Vidal aa2246f
@@ -38,10 +38,10 @@
Seth Vidal aa2246f
 
Seth Vidal aa2246f
 .IP \fBreposdir\fR
Seth Vidal aa2246f
 A list of directories where yum should look for .repo files which define
Seth Vidal aa2246f
-repositories to use. Default is `/etc/yum/repos.d'. Each
Seth Vidal aa2246f
+repositories to use. Default is `/etc/yum.repos.d'. Each
Seth Vidal aa2246f
 file in this directory should contain one or more repository sections as
Seth Vidal aa2246f
 documented in \fB[repository] options\fR below. These will be merged with the
Seth Vidal aa2246f
-repositories defined in /etc/yum/yum.conf to form the complete set of
Seth Vidal aa2246f
+repositories defined in /etc/yum.conf to form the complete set of
Seth Vidal aa2246f
 repositories that yum will use.
Seth Vidal aa2246f
 
Seth Vidal aa2246f
 .IP \fBdebuglevel\fR
Seth Vidal aa2246f
@@ -511,8 +511,8 @@
Seth Vidal aa2246f
 
Seth Vidal aa2246f
 .SH "URL INCLUDE SYNTAX"
Seth Vidal aa2246f
 .LP
Seth Vidal aa2246f
-The inclusion of external configuration files is supported for /etc/yum/yum.conf
Seth Vidal aa2246f
-and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
Seth Vidal aa2246f
+The inclusion of external configuration files is supported for /etc/yum.conf
Seth Vidal aa2246f
+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
Seth Vidal aa2246f
 line of the following format:
Seth Vidal aa2246f
 
Seth Vidal aa2246f
 include=url://to/some/location
Seth Vidal aa2246f
@@ -549,8 +549,8 @@
4d7eb0e
 
4d7eb0e
 .SH "FILES"
4d7eb0e
 .nf
4d7eb0e
-/etc/yum/yum.conf
Seth Vidal 3ac6088
-/etc/yum/repos.d/
4d7eb0e
+/etc/yum.conf
Seth Vidal 3ac6088
+/etc/yum.repos.d/
4d7eb0e
 /etc/yum/pluginconf.d/
4d7eb0e
 
Seth Vidal 3ac6088
 .SH "SEE ALSO"