Removed references to samba.canberra, replacing with samba.anu

Added mirror sites.

6 files changed, 32 insertions, 31 deletions

diff --git a/README b/README
index 15dd87e87e4..10d9d931e55 100644
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ printers) from unix, Netware and other operating systems
 - a tar extension to the client for backing up PCs
 
 For a much better overview have a look at the web site at
-http://samba.canberra.edu.au/pub/samba, and browse the user survey.
+http://samba.anu.edu.au/samba, and browse the user survey.
 
 Related packages include:
 
@@ -140,14 +140,14 @@ WEB SITE
 
 A Samba WWW site has been setup with lots of useful info. Connect to:
 
-http://samba.canberra.edu.au/pub/samba/
+http://samba.anu.edu.au/samba/
 
 As well as general information and documentation, this also has searchable 
 archives of the mailing list and a user survey that shows who else is using
 this package. Have you registered with the survey yet? :-)
 
 It is maintained by Paul Blackman (thanks Paul!). You can contact him
-at ictinus@lake.canberra.edu.au.
+at ictinus@samba.anu.edu.au.
 
 
 
diff --git a/docs/announce b/docs/announce
index adcde8966f8..a03ddcd0e6a 100644
--- a/docs/announce
+++ b/docs/announce
@@ -127,7 +127,7 @@ There is also often quite a bit of discussion about Samba on the
 newsgroup comp.protocols.smb.
 
 A WWW site with lots of Samba info can be found at 
-http://samba.canberra.edu.au/pub/samba/
+http://samba.anu.edu.au/samba/
 
 The Samba Team (Contact: samba-bugs@samba.anu.edu.au)
 June 1996
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 7e98c850d41..7260cbad396 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -65,7 +65,7 @@ the mailing list are given in the README file that comes with Samba.
 
 If you have access to a WWW viewer (such as Netscape or Mosaic) then
 you will also find lots of useful information, including back issues
-of the Samba mailing list, at http://samba.canberra.edu.au/pub/samba/
+of the Samba mailing list, at http://samba.anu.edu.au/samba/
 .SH AUTHOR
 
 The main author of the Samba suite is Andrew Tridgell. He may be
diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt
index 0bd12e8af0a..5fc069371b3 100644
--- a/docs/textdocs/BUGS.txt
+++ b/docs/textdocs/BUGS.txt
@@ -25,7 +25,7 @@ that list that may be able to help you.
 
 You may also like to look though the recent mailing list archives,
 which are conveniently accessible on the Samba web pages
-at http://samba.canberra.edu.au/pub/samba/ 
+at http://samba.anu.edu.au/samba/ 
 
 
 GENERAL INFO
diff --git a/docs/textdocs/MIRRORS.txt b/docs/textdocs/MIRRORS.txt
index 01bc277a20b..2ce18b6d5b0 100755
--- a/docs/textdocs/MIRRORS.txt
+++ b/docs/textdocs/MIRRORS.txt
@@ -1,23 +1,34 @@
 The main Samba ftp site is samba.anu.edu.au in pub/samba/. Contact
 samba-bugs@samba.anu.edu.au for help with this site.
 
+The 'Source Only' sites may also contain binary packages as we are now 
+including them on samba.anu.edu.au/pub/samba/Binary_Packages
+
 Mirror sites include:
 
-Source Only
-===========
---- Australia ---
+--- Austria ---  
+	ftp://gd.tuwien.ac.at/pub/infosys/servers/samba/sources/
+--- Australia ---  
 	ftp://samba.anu.edu.au/pub/samba/
-	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 	ftp://choc.satech.net.au/pub/samba/
 --- USA Educational ---  
+	ftp://sunsite.unc.edu/pub/packages/samba/sources/
 	ftp://ftp.micro.caltech.edu/pub/samba/
 	ftp://ftp.cs.ucr.edu/pub/software/samba/
-	ftp://sunsite.unc.edu/pub/Linux/system/Network/samba/
 --- Czech Republic ---  
 	ftp://sunsite.mff.cuni.cz/Net/Protocols/Samba/
+--- Denmark ---  
+	ftp://sunsite.auc.dk/pub/unix/networking/samba/
+--- Finland ---
+	ftp://nic.funet.fi/pub/mirrors/samba.anu.edu.au/
 --- Germany ---  
 	ftp://ftp.uni-trier.de/pub/unix/network/samba/
-	ftp://ftp.gwdg.de/pub/server/samba/
+        ftp://ftp.gwdg.de/pub/server/samba/
+--- Greece ---
+	ftp://ftp.ntua.gr/pub/net/samba/
+--- Italy ---
+	ftp://volftp.tin.it/mirror/samba/pub/samba/
+	http://www.inferentia.it/archives/samba/ (no binaries)
 --- Japan ---  
 	ftp://ring.asahi-net.or.jp/archives/net/samba/
 	ftp://ring.aist.go.jp/archives/net/samba/
@@ -28,26 +39,17 @@ Source Only
 	ftp://ftp.gbnet.net/pub/samba/
 	ftp://ftp.ntrl.net/pub/mirror/samba/
 	ftp://despair.capecod.net/pub/Samba/
---- Portugal ---  
+--- Poland ---
+	ftp://giswitch.sggw.waw.pl/pub/unix/samba/
+--- Potugal ---
 	ftp://ftp.ua.pt/pub/misc/samba/
+--- Romania ---
+	ftp://ftp.romus.ro/pub/Linux/Network/samba/
 --- Russian Federation ---  
 	ftp://ftp.uic.nsu.ru/pub/vendors/samba/
 --- United Kingdom ---  
-	ftp://ftp.demon.co.uk/pub/mirrors/samba/
-	ftp://src.doc.ic.ac.uk/packages/samba/
-
-Sources & Binaries
-==================
---- Austria ---  
-	ftp://gd.tuwien.ac.at/pub/infosys/servers/samba/
---- Denmark ---  
-	ftp://sunsite.auc.dk/pub/unix/networking/samba/
---- USA Educational ---  
-	ftp://sunsite.unc.edu/pub/packages/samba/
---- Italy ---  
-	http://www.inferentia.it/archives/samba/
---- United Kingdom ---  
 	ftp://sunsite.doc.ic.ac.uk/packages/samba/
+	ftp://ftp.demon.co.uk/pub/mirrors/samba/
 
 SCO binaries available from:
 	http://www.math.u-szeged.hu/hardsoft/hsdetail.htm
@@ -75,7 +77,6 @@ There are several others. Give archie a try.
 
 Http sites include:
 ===================
-http://samba.canberra.edu.au/pub/samba
-http://www.choc.satech.net.au/pub/samba/
-
+http://samba.anu.edu.au/samba
 
+Japanese - http://samba.bento.ad.jp/
diff --git a/docs/textdocs/UNIX_INSTALL.txt b/docs/textdocs/UNIX_INSTALL.txt
index c189482ca41..9a5eb04faaf 100644
--- a/docs/textdocs/UNIX_INSTALL.txt
+++ b/docs/textdocs/UNIX_INSTALL.txt
@@ -15,7 +15,7 @@ try something like:
 
 Unfortunately, having said this, the man pages are sadly out of date and
 really need more effort to maintain them. Other sources of information 
-are pointed to by the Samba web site, http://samba.canberra.edu.au/pub/samba.
+are pointed to by the Samba web site, http://samba.anu.edu.au/samba/.
 
 STEP 1. Building the binaries