[yum-cvs] yum/docs yum.conf.5,1.23,1.24

[Seth Vidal]

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

Modified Files:
	yum.conf.5 
Log Message:

updated docs for proxy options that are now implemented


Index: yum.conf.5
===================================================================
RCS file: /home/groups/yum/cvs/yum/docs/yum.conf.5,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- yum.conf.5	1 Feb 2005 04:54:09 -0000	1.23
+++ yum.conf.5	19 Feb 2005 22:27:00 -0000	1.24
@@ -179,14 +179,14 @@
 ." .IP \fBsyslog_facility \fR
 ." XXX not implemented yet
 
-." .IP \fBproxy \fR
-." XXX not implemented yet
+.IP \fBproxy \fR
+url to the proxy server that yum should use.
 
-." .IP \fBproxy_username \fR
-." XXX not implemented yet
+.IP \fBproxy_username \fR
+username to use for proxy
 
-." .IP \fBproxy_password \fR
-." XXX not implemented yet
+.IP \fBproxy_password \fR
+password for this proxy
 
 .SH "[repository] OPTIONS"
 .LP 
@@ -285,10 +285,18 @@
 Overrides the \fBbandwidth\fR option from the [main] section for this
 repository.
 
-." XXX 
-." proxy, proxy_username and proxy_password are all available here but not
-." implemented yet.
-
+.IP \fBproxy \fR
+url to the proxy server for this repository. Set to '_none_' to disable the 
+global proxy setting for this repository. If this is unset it 
+inherits it from the global setting
+
+.IP \fBproxy_username \fR
+username to use for proxy.
+If this is unset it inherits it from the global setting
+
+.IP \fBproxy_password \fR
+password for this proxy.
+If this is unset it inherits it from the global setting
 
 .SH "URL INCLUDE SYNTAX"
 .LP