7 files changed, 65 insertions, 96 deletions

diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 8eff936bc3af..688b07cc2c56 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,4 +1,4 @@
-# $Id: README,v 1.12 1998/04/20 11:26:27 jb Exp $
+# $Id: README,v 1.14 1999/02/11 17:56:11 jdp Exp $
 
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
@@ -33,59 +33,9 @@ To maintain a copy of the FreeBSD bug database, use the file:
 
     gnats-supfile               FreeBSD bug database
 
-The supfiles contained in this directory all obtain their updates
-from cvsup.FreeBSD.org.  Please choose one of the servers listed
-below for your updates.
+IMPORTANT: Before you use any of the supfiles in this directory,
+you will need to edit in an appropriate "host" setting.  See:
 
-  Argentina:
-    cvsup.ar.FreeBSD.org
+    http://www.freebsd.org/handbook/mirrors.html
 
-  Australia:
-    cvsup.au.FreeBSD.org
-
-  Brazil:
-    cvsup.br.FreeBSD.org
-
-  Canada:
-    cvsup.ca.FreeBSD.org
-
-  Estonia:
-    cvsup.ee.FreeBSD.org
-
-  Germany:
-    cvsup.de.FreeBSD.org
-
-  Japan:
-    cvsup.jp.FreeBSD.org
-
-  Netherlands:
-    cvsup.nl.FreeBSD.org
-
-  Norway:
-    cvsup.no.FreeBSD.org
-
-  Russia:
-    cvsup.ru.FreeBSD.org
-
-  South Africa:
-    cvsup.za.FreeBSD.org
-
-  Taiwan:
-    cvsup.tw.FreeBSD.org
-
-  Ukraine:
-    cvsup2.ua.FreeBSD.org
-
-  United Kingdom:
-    cvsup.uk.FreeBSD.org
-
-  USA:
-    cvsup.FreeBSD.org		(Washington state)
-    cvsup2.FreeBSD.org		(California)
-    cvsup3.FreeBSD.org		(Massachusetts)
-
-  International Crypto Repository:
-    cvsup.internat.FreeBSD.org
-
-  Special CTM-synchronized CVSup site:
-    ctm.FreeBSD.org
+for an up-to-date list of public CVSup mirror sites.
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 759e172a7239..e14310f5a98f 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,4 +1,4 @@
-# $Id: cvs-supfile,v 1.16 1998/03/06 13:35:24 jkh Exp $
+# $Id: cvs-supfile,v 1.18 1999/02/11 18:14:03 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # CVS development tree of the FreeBSD system.
@@ -20,12 +20,13 @@
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# host=cvsup.FreeBSD.org
+# host=CHANGE_THIS.FreeBSD.org
 #		This specifies the server host which will supply the
-#		file updates.  Please change this to one of the mirror
-#		sites if possible.  (See the "README" file.)  You can
-#		override this setting on the command line with cvsup's
-#		"-h host" option.
+#		file updates.  You must change it to one of the CVSup
+#		mirror sites listed in the FreeBSD Handbook at
+#		http://www.freebsd.org/handbook/mirrors.html.
+#		You can	override this setting on the command line
+#		with cvsup's "-h host" option.
 #
 # base=/usr
 #		This specifies the root where CVSup will store information
@@ -45,7 +46,10 @@
 #		must exist in order to run CVSup.
 
 # Defaults that apply to all the collections
-*default host=cvsup.FreeBSD.org
+#
+# IMPORTANT: Change the next line to use one of the CVSup mirror sites
+# listed at http://www.freebsd.org/handbook/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/home/ncvs
 *default release=cvs
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 5a3ac35a2302..8d41e91b58e7 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: gnats-supfile,v 1.2 1999/02/11 18:14:03 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD GNATS bug report database.
@@ -20,12 +20,13 @@
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# host=cvsup.FreeBSD.org
+# host=CHANGE_THIS.FreeBSD.org
 #		This specifies the server host which will supply the
-#		file updates.  Please change this to one of the mirror
-#		sites if possible.  (See the "README" file.)  You can
-#		override this setting on the command line with cvsup's
-#		"-h host" option.
+#		file updates.  You must change it to one of the CVSup
+#		mirror sites listed in the FreeBSD Handbook at
+#		http://www.freebsd.org/handbook/mirrors.html.
+#		You can	override this setting on the command line
+#		with cvsup's "-h host" option.
 #
 # base=/usr
 #		This specifies the root where CVSup will store information
@@ -44,7 +45,10 @@
 #		The prefix directory must exist in order to run CVSup.
 
 # Defaults that apply to all the collections
-*default host=cvsup.FreeBSD.org
+#
+# IMPORTANT: Change the next line to use one of the CVSup mirror sites
+# listed at http://www.freebsd.org/handbook/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
 *default release=current 
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index dea0221a38d2..5071e9a89759 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,4 +1,4 @@
-# $Id: ports-supfile,v 1.13 1998/03/06 13:36:05 jkh Exp $
+# $Id: ports-supfile,v 1.15 1999/02/11 18:14:03 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current ports collection.
@@ -20,12 +20,13 @@
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# host=cvsup.FreeBSD.org
+# host=CHANGE_THIS.FreeBSD.org
 #		This specifies the server host which will supply the
-#		file updates.  Please change this to one of the mirror
-#		sites if possible.  (See the "README" file.)  You can
-#		override this setting on the command line with cvsup's
-#		"-h host" option.
+#		file updates.  You must change it to one of the CVSup
+#		mirror sites listed in the FreeBSD Handbook at
+#		http://www.freebsd.org/handbook/mirrors.html.
+#		You can	override this setting on the command line
+#		with cvsup's "-h host" option.
 #
 # base=/usr
 #		This specifies the root where CVSup will store information
@@ -44,7 +45,10 @@
 #		The prefix directory must exist in order to run CVSup.
 
 # Defaults that apply to all the collections
-*default host=cvsup.FreeBSD.org
+#
+# IMPORTANT: Change the next line to use one of the CVSup mirror sites
+# listed at http://www.freebsd.org/handbook/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
 *default release=cvs tag=.
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
index cf19f94979a7..e510232db0b7 100644
--- a/share/examples/cvsup/secure-stable-supfile
+++ b/share/examples/cvsup/secure-stable-supfile
@@ -1,4 +1,4 @@
-# $Id: secure-stable-supfile,v 1.9 1997/10/02 00:01:33 jkh Exp $
+# $Id: secure-stable-supfile,v 1.10 1999/02/11 18:04:17 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source tree of the FreeBSD-stable international secure distribution.
@@ -41,7 +41,7 @@
 *default host=cvsup.internat.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
-# The following line is for 3.0-stable.  If you want 2.2-stable, change
+# The following line is for 3-stable.  If you want 2.2-stable, change
 # "RELENG_3" to "RELENG_2_2".
 *default release=cvs tag=RELENG_3
 *default delete use-rel-suffix
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 46a445f20cbb..58de73daa573 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,4 +1,4 @@
-# $Id: stable-supfile,v 1.12 1997/10/02 00:01:35 jkh Exp $
+# $Id: stable-supfile,v 1.14 1999/02/11 18:14:03 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
@@ -20,12 +20,13 @@
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# host=cvsup.FreeBSD.org
+# host=CHANGE_THIS.FreeBSD.org
 #		This specifies the server host which will supply the
-#		file updates.  Please change this to one of the mirror
-#		sites if possible.  (See the "README" file.)  You can
-#		override this setting on the command line with cvsup's
-#		"-h host" option.
+#		file updates.  You must change it to one of the CVSup
+#		mirror sites listed in the FreeBSD Handbook at
+#		http://www.freebsd.org/handbook/mirrors.html.
+#		You can	override this setting on the command line
+#		with cvsup's "-h host" option.
 #
 # base=/usr
 #		This specifies the root where CVSup will store information
@@ -53,17 +54,19 @@
 #   ports-all tag=.
 #
 # If you leave out the "tag=." portion, CVSup will delete all of
-# the files in your ports tree.  That is because "RELENG_2_1_0" and
-# "RELENG_2_2" are not valid tags for the ports portion of the CVS
-# repository.
+# the files in your ports tree.  That is because the ports collections
+# do not use the same tags as the main part of the FreeBSD source tree.
 #
 ###############################################################################
 
 # Defaults that apply to all the collections
-*default host=cvsup.FreeBSD.org
+#
+# IMPORTANT: Change the next line to use one of the CVSup mirror sites
+# listed at http://www.freebsd.org/handbook/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
-# The following line is for 3.0-stable.  If you want 2.2-stable, change
+# The following line is for 3-stable.  If you want 2.2-stable, change
 # "RELENG_3" to "RELENG_2_2".
 *default release=cvs tag=RELENG_3
 *default delete use-rel-suffix
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 19283a2fec7c..a857c251e23b 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,4 +1,4 @@
-# $Id: standard-supfile,v 1.11 1997/09/24 03:54:44 jdp Exp $
+# $Id: standard-supfile,v 1.13 1999/02/11 18:14:03 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
@@ -20,12 +20,13 @@
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# host=cvsup.FreeBSD.org
+# host=CHANGE_THIS.FreeBSD.org
 #		This specifies the server host which will supply the
-#		file updates.  Please change this to one of the mirror
-#		sites if possible.  (See the "README" file.)  You can
-#		override this setting on the command line with cvsup's
-#		"-h host" option.
+#		file updates.  You must change it to one of the CVSup
+#		mirror sites listed in the FreeBSD Handbook at
+#		http://www.freebsd.org/handbook/mirrors.html.
+#		You can	override this setting on the command line
+#		with cvsup's "-h host" option.
 #
 # base=/usr
 #		This specifies the root where CVSup will store information
@@ -44,7 +45,10 @@
 #		The prefix directory must exist in order to run CVSup.
 
 # Defaults that apply to all the collections
-*default host=cvsup.FreeBSD.org
+#
+# IMPORTANT: Change the next line to use one of the CVSup mirror sites
+# listed at http://www.freebsd.org/handbook/mirrors.html.
+*default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
 *default release=cvs tag=.