Add support for generic PORTAGE_RSYNC_{EXTRA_,}OPTS, deprecate existing RSYNC_ variables, rename RSYNC_RETRIES to PORTAGE_RSYNC_RETRIES

svn path=/main/trunk/; revision=2955

1 files changed, 9 insertions, 10 deletions

diff --git a/cnf/make.conf b/cnf/make.conf
index 863fb957e..4c8b56012 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -207,18 +207,17 @@ CHOST="i686-pc-linux-gnu"
 #   Australia:     "rsync://rsync.au.gentoo.org/gentoo-portage"
 #SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 #
-# RSYNC_RETRIES sets the number of times portage will attempt to retrieve
+# PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve
 #     a current portage tree before it exits with an error. This allows
 #     for a more successful retrieval without user intervention most times.
-#RSYNC_RETRIES="3"
-#
-# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out
-#     on a connection. Most users will benefit from this setting as it will
-#     reduce the amount of 'dead air' they experience when they run across
-#     the occasional, unreachable mirror. Dialup users might want to set this
-#     value up around the 300 second mark.
-#RSYNC_TIMEOUT=180
-
+#PORTAGE_RSYNC_RETRIES="3"
+#
+# PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync
+#     command used by `emerge --sync`. This will not change the default options
+#     which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know 
+#     exactly what you're doing).
+#PORTAGE_RSYNC_EXTRA_OPTS=""
+#
 # Advanced Features
 # =================
 #