[yum-cvs] yum/docs yum-arch.8, 1.10, 1.11 yum.8, 1.29, 1.30 yum.conf.5, 1.31, 1.32

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/docs
In directory login:/tmp/cvs-serv10372

Modified Files:
	yum-arch.8 yum.8 yum.conf.5 
Log Message:

- misc updates to the man pages
- merge terje rosten's patch for the new nevra package specification


Index: yum-arch.8
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum-arch.8,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yum-arch.8	13 Oct 2004 05:55:27 -0000	1.10
+++ yum-arch.8	23 Jun 2005 05:09:01 -0000	1.11
@@ -44,7 +44,7 @@
 .PP 
 .SH "AUTHORS"
 .nf 
-Seth Vidal <skvidal at phy.duke.edu>
+Please see the AUTHORS file included with this program
 .fi 
 
 .PP 

Index: yum.8
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.8,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- yum.8	8 May 2005 03:05:37 -0000	1.29
+++ yum.8	23 Jun 2005 05:09:01 -0000	1.30
@@ -253,9 +253,11 @@
 .br
 \fBname-ver-rel.arch\fP
 .br
+\fBname-epoch:ver-rel.arch\fP
+.br
 \fBepoch:name-ver-rel.arch\fP
 .IP
-For example: \fByum remove kernel-2.4.1-10.i686\fP.
+For example: \fByum remove kernel-2.4.1-10.i686\fP
 
 .PP 
 .SH "PLUGINS"
@@ -299,7 +301,7 @@
 .PP 
 .SH "AUTHORS"
 .nf 
-Seth Vidal <skvidal at phy.duke.edu>
+See the Authors file included with this program.
 .fi 
 
 .PP 

Index: yum.conf.5
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.conf.5,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- yum.conf.5	23 Jun 2005 05:01:17 -0000	1.31
+++ yum.conf.5	23 Jun 2005 05:09:01 -0000	1.32
@@ -133,7 +133,7 @@
 
 .IP \fBrecent\fR
 Number of days back to look for `recent' packages added to a repository.
-Used by the \fBlist recent\fR and \fBgenerate-rss\fR commands. Default is `7'.
+Used by the \fBlist recent\fR command. Default is `7'.
 
 .IP \fBretries\fR
 Set the number of times any attempt to retrieve a file should retry before 
@@ -144,6 +144,11 @@
 servers that support it. This can improve transfer speeds by using one
 connection when downloading multiple files from a repository. Default is `1'.
 
+.IP \fBtimeout \fR
+Number of seconds to wait for a connection before timing out. Defaults to
+30 seconds. This may be too short of a time for extremely overloaded
+sites.
+
 .IP \fBhttp_caching\fR
 Determines how upstream HTTP caches are instructed to handle any HTTP downloads
 that Yum does. This option can take the following values:
@@ -296,6 +301,9 @@
 used with this repository. See the global option in the [main] section above
 for more information.
 
+.IP \fBtimeout\fR
+Overrides the \fBtimeout\fR option from the [main] section for this repository.
+
 .IP \fBhttp_caching\fR
 Overrides the \fBhttp_caching\fR option from the [main] section for this repository.