diff -urN olddocs/yum.8 docs/yum.8 --- olddocs/yum.8 2008-03-17 12:09:29.000000000 -0400 +++ docs/yum.8 2008-03-17 12:08:18.000000000 -0400 @@ -339,8 +339,8 @@ .PP .SH "FILES" .nf -/etc/yum/yum.conf -/etc/yum/repos.d/ +/etc/yum.conf +/etc/yum.repos.d/ /etc/yum/pluginconf.d/ /var/cache/yum/ .fi --- olddocs/yum.conf.5.orig 2009-01-21 13:33:04.000000000 -0500 +++ docs/yum.conf.5 2009-01-21 13:34:47.000000000 -0500 @@ -4,10 +4,10 @@ \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'). +\fBreposdir\fR option (default is `/etc/yum.repos.d'). See the \fBreposdir\fR option below for further details. .SH "PARAMETERS" @@ -38,10 +38,10 @@ .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'. 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/yum.conf to form the complete set of +repositories defined in /etc/yum.conf to form the complete set of repositories that yum will use. .IP \fBdebuglevel\fR @@ -511,8 +511,8 @@ .SH "URL INCLUDE SYNTAX" .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 +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: include=url://to/some/location @@ -549,8 +549,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"