global change from samba.anu.edu.au to samba.org

(This used to be commit 42d2509c9fab5c774fd33b9d4b5bd1ee125479c3)

15 files changed, 191 insertions, 191 deletions

diff --git a/docs/faq/Samba-Server-FAQ-2.html b/docs/faq/Samba-Server-FAQ-2.html
index 731391a998..9b96159f8f 100644
--- a/docs/faq/Samba-Server-FAQ-2.html
+++ b/docs/faq/Samba-Server-FAQ-2.html
@@ -197,7 +197,7 @@ such as <F>....</F></P>
 <A NAME="no_browse"></A> 
 
 See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt">BROWSING.txt</A>
+<A HREF="ftp://samba.org/pub/samba/BROWSING.txt">BROWSING.txt</A>
 for more information on browsing.  Browsing.txt can also be found
 in the docs directory of the Samba source.</P>
 <P>If your GUI client does not permit you to select non-browsable
diff --git a/docs/faq/Samba-Server-FAQ.html b/docs/faq/Samba-Server-FAQ.html
index eadc3e26ed..3ad44cfe7e 100644
--- a/docs/faq/Samba-Server-FAQ.html
+++ b/docs/faq/Samba-Server-FAQ.html
@@ -39,7 +39,7 @@ Table of Contents
 <HR>
 <H1> Samba Server FAQ</H1>
 
-<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.3, 7 Oct '97
+<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.3, 7 Oct '97
 <P><HR><EM> This is the <EM>Server</EM> Frequently Asked Questions (FAQ)
 document for Samba, the free and very popular SMB and CIFS server
 product. A general 
diff --git a/docs/faq/Samba-Server-FAQ.sgml b/docs/faq/Samba-Server-FAQ.sgml
index 020d532281..6a53fc0680 100644
--- a/docs/faq/Samba-Server-FAQ.sgml
+++ b/docs/faq/Samba-Server-FAQ.sgml
@@ -11,7 +11,7 @@
 
 <title> Samba Server FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.3, 7 Oct '97
 
@@ -256,7 +256,7 @@ Samba compiled with libdes - enabling encrypted passwords
 <sect1>Managing Samba Log files<p><label id="LogFiles">
 
 <sect1>I can't see the Samba server in any browse lists!<p><label id="no_browse">
- See <url url="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt" name="BROWSING.txt">
+ See <url url="ftp://samba.org/pub/samba/BROWSING.txt" name="BROWSING.txt">
  for more information on browsing.  Browsing.txt can also be found
  in the docs directory of the Samba source.
 
diff --git a/docs/faq/Samba-meta-FAQ-1.html b/docs/faq/Samba-meta-FAQ-1.html
index 80610fb59e..7258a32f1e 100644
--- a/docs/faq/Samba-meta-FAQ-1.html
+++ b/docs/faq/Samba-meta-FAQ-1.html
@@ -119,7 +119,7 @@ all covered either in this document or in those it refers to.</P>
 <UL>
 <LI> Meta-FAQ. This is the mother of all documents, and is the one you
 are reading now. The latest version is always at 
-<A HREF="http://samba.anu.edu.au/[.....]">http://samba.anu.edu.au/[.....]</A> but there is probably a much
+<A HREF="http://samba.org/[.....]">http://samba.org/[.....]</A> but there is probably a much
 nearer 
 <A HREF="../MIRRORS">mirror site</A> which you should use
 instead.
diff --git a/docs/faq/Samba-meta-FAQ-2.html b/docs/faq/Samba-meta-FAQ-2.html
index ac76038006..87cf815e0b 100644
--- a/docs/faq/Samba-meta-FAQ-2.html
+++ b/docs/faq/Samba-meta-FAQ-2.html
@@ -63,7 +63,7 @@ and this FAQ were originally written by Karl Auer.</P>
 </P>
 <P>At time of writing, the current version was 1.9.17. If you want to be
 sure check the bottom of the change-log file. 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</A></P>
+<A HREF="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</A></P>
 <P>For more information see 
 <A HREF="#version_nums">What do the version numbers mean?</A></P>
 
@@ -73,7 +73,7 @@ sure check the bottom of the change-log file.
 <P>
 <A NAME="WhereFrom"></A> 
 </P>
-<P>The Samba suite is available via anonymous ftp from samba.anu.edu.au and
+<P>The Samba suite is available via anonymous ftp from samba.org and
 many 
 <A HREF="../MIRRORS">mirror</A> sites. You will get much
 faster performance if you use a mirror site. The latest and greatest
@@ -166,7 +166,7 @@ See below for subscription information.
 discussion about Samba. 
 </LI>
 <LI>The WWW site 'SAMBA Web Pages' at 
-<A HREF="http://samba.anu.edu.au/samba/">http://samba.anu.edu.au/samba/</A> includes:
+<A HREF="http://samba.org/samba/">http://samba.org/samba/</A> includes:
 
 <UL>
 <LI>Links to man pages and documentation, including this FAQ</LI>
@@ -187,7 +187,7 @@ discussion about Samba.
 <A NAME="mailinglist"></A> 
 </P>
 <P>Send email to 
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank,
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank,
 and include the following two lines in the body of the message:</P>
 <P>
 <BLOCKQUOTE><CODE>
@@ -205,7 +205,7 @@ single message containing all the messages that have been received by
 the list since the last time and sends a copy of this message to all
 subscribers. There are thousands of people on this list.</P>
 <P>If you stop being interested in Samba, please send another email to
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank, and
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank, and
 include the following two lines in the body of the message:</P>
 <P>
 <BLOCKQUOTE><CODE>
@@ -232,7 +232,7 @@ carried out the first three steps given here!</P>
 <OL>
 <LI> See if there are any likely looking entries in this FAQ!
 If you have just installed Samba, have you run through the checklist in
-<A HREF="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
+<A HREF="ftp://samba.org/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba
 distribution.
 </LI>
@@ -269,7 +269,7 @@ that an explanation can be incorporated into the next version.</P>
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
 patches to 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>. Do not send patches to Andrew Tridgell or any
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.</P>
 <P>Patch format
 ------------</P>
@@ -321,7 +321,7 @@ huge files.
 
 <P>If you have spotted something very serious and believe that it is
 important to contact the developers quickly send a message to
-samba-urgent@samba.anu.edu.au. This will be processed more quickly than
+samba-urgent@samba.org. This will be processed more quickly than
 mail to samba-bugs. Please think carefully before using this address. An
 example of its use might be to report a security hole.</P>
 <P>Examples of things <EM>not</EM> to send to samba-urgent include problems
diff --git a/docs/faq/Samba-meta-FAQ-3.html b/docs/faq/Samba-meta-FAQ-3.html
index 63adff35f9..8ebb38a334 100644
--- a/docs/faq/Samba-meta-FAQ-3.html
+++ b/docs/faq/Samba-meta-FAQ-3.html
@@ -54,7 +54,7 @@ protocol specification is in the public domain and ongoing discussions
 concerning the spec take place on a public mailing list according to the
 rules of the Internet Engineering Task Force. For more information and
 pointers see 
-<A HREF="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</A></P>
+<A HREF="http://samba.org/cifs/">http://samba.org/cifs/</A></P>
 <P>The following is taken from 
 <A HREF="http://www.microsoft.com/intdev/cifs/">http://www.microsoft.com/intdev/cifs/</A></P>
 <P>
diff --git a/docs/faq/Samba-meta-FAQ.html b/docs/faq/Samba-meta-FAQ.html
index 5a70808867..38f094bf33 100644
--- a/docs/faq/Samba-meta-FAQ.html
+++ b/docs/faq/Samba-meta-FAQ.html
@@ -37,7 +37,7 @@ Table of Contents
 <HR>
 <H1> Samba meta FAQ</H1>
 
-<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.3, 7 Oct '97
+<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.3, 7 Oct '97
 <P><HR><EM> This is the meta-Frequently Asked Questions (FAQ) document
 for Samba, the free and very popular SMB and CIFS server product. It
 contains overview information for the Samba suite of programs, a
diff --git a/docs/faq/Samba-meta-FAQ.sgml b/docs/faq/Samba-meta-FAQ.sgml
index 75038f19f5..79b587a49f 100644
--- a/docs/faq/Samba-meta-FAQ.sgml
+++ b/docs/faq/Samba-meta-FAQ.sgml
@@ -11,7 +11,7 @@
 
 <title> Samba meta FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.3, 7 Oct '97
 
@@ -113,7 +113,7 @@ all covered either in this document or in those it refers to.
 
 <item> Meta-FAQ. This is the mother of all documents, and is the one you
 are reading now. The latest version is always at <url
-url="http://samba.anu.edu.au/[.....]"> but there is probably a much
+url="http://samba.org/[.....]"> but there is probably a much
 nearer <url url="../MIRRORS" name="mirror site"> which you should use
 instead.
 
@@ -189,13 +189,13 @@ and this FAQ were originally written by Karl Auer.
 <sect1> What is the current version of Samba?<p><label id="current_version">
 
 At time of writing, the current version was 1.9.17. If you want to be
-sure check the bottom of the change-log file. <url url="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">
+sure check the bottom of the change-log file. <url url="ftp://samba.org/pub/samba/alpha/change-log">
 
 For more information see <ref id="version_nums" name="What do the version numbers mean?">
 
 <sect1> Where can I get it? <p><label id="WhereFrom">
 
-The Samba suite is available via anonymous ftp from samba.anu.edu.au and
+The Samba suite is available via anonymous ftp from samba.org and
 many <url url="../MIRRORS" name="mirror"> sites. You will get much
 faster performance if you use a mirror site. The latest and greatest
 versions of the suite are in the directory:
@@ -288,7 +288,7 @@ See below for subscription information.
 discussion about Samba. 
 
 <item>The WWW site 'SAMBA Web Pages' at <url
-url="http://samba.anu.edu.au/samba/"> includes:
+url="http://samba.org/samba/"> includes:
 
   <itemize>
     <item>Links to man pages and documentation, including this FAQ
@@ -302,8 +302,8 @@ url="http://samba.anu.edu.au/samba/"> includes:
 
 <sect1>How do I subscribe to the Samba Mailing Lists?<p><label id="mailinglist">
 
-Send email to <htmlurl url="mailto:listproc@samba.anu.edu.au"
-name="listproc@samba.anu.edu.au">. Make sure the subject line is blank,
+Send email to <htmlurl url="mailto:listproc@samba.org"
+name="listproc@samba.org">. Make sure the subject line is blank,
 and include the following two lines in the body of the message:
 
 <tscreen><verb>
@@ -321,7 +321,7 @@ the list since the last time and sends a copy of this message to all
 subscribers. There are thousands of people on this list.
 
 If you stop being interested in Samba, please send another email to
-<htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is blank, and
+<htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 
 <tscreen><verb>
@@ -342,7 +342,7 @@ carried out the first three steps given here!
 
 <enum> <item> See if there are any likely looking entries in this FAQ!
 If you have just installed Samba, have you run through the checklist in
-<url url="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt"
+<url url="ftp://samba.org/pub/samba/DIAGNOSIS.txt"
 name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba
 distribution.
@@ -378,7 +378,7 @@ that an explanation can be incorporated into the next version.
 If you make changes to the source code, <em>please</em> submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.
 
 Patch format
@@ -440,7 +440,7 @@ Some extras :
 
 If you have spotted something very serious and believe that it is
 important to contact the developers quickly send a message to
-samba-urgent@samba.anu.edu.au. This will be processed more quickly than
+samba-urgent@samba.org. This will be processed more quickly than
 mail to samba-bugs. Please think carefully before using this address. An
 example of its use might be to report a security hole.
 
@@ -526,7 +526,7 @@ Internet standard and is a very long way from becoming one, BUT the
 protocol specification is in the public domain and ongoing discussions
 concerning the spec take place on a public mailing list according to the
 rules of the Internet Engineering Task Force. For more information and
-pointers see <url url="http://samba.anu.edu.au/cifs/">
+pointers see <url url="http://samba.org/cifs/">
 
 The following is taken from <url url="http://www.microsoft.com/intdev/cifs/">
 
diff --git a/docs/faq/Samba-meta-FAQ.txt b/docs/faq/Samba-meta-FAQ.txt
index 65d9a57ff6..fb4887e097 100644
--- a/docs/faq/Samba-meta-FAQ.txt
+++ b/docs/faq/Samba-meta-FAQ.txt
@@ -1,5 +1,5 @@
   Samba meta FAQ
-  Dan Shearer & Paul Blackman, ictinus@samba.anu.edu.au
+  Dan Shearer & Paul Blackman, ictinus@samba.org
   v 0.3, 7 Oct '97
 
   This is the meta-Frequently Asked Questions (FAQ) document for Samba,
@@ -182,7 +182,7 @@
 
   +o  Meta-FAQ. This is the mother of all documents, and is the one you
      are reading now. The latest version is always at
-     <http://samba.anu.edu.au/[.....]> but there is probably a much
+     <http://samba.org/[.....]> but there is probably a much
      nearer mirror site <../MIRRORS> which you should use instead.
 
   +o  <Samba-Server-FAQ.html> is the best starting point for information
@@ -261,14 +261,14 @@
 
   At time of writing, the current version was 1.9.17. If you want to be
   sure check the bottom of the change-log file.
-  <ftp://samba.anu.edu.au/pub/samba/alpha/change-log>
+  <ftp://samba.org/pub/samba/alpha/change-log>
   For more information see ``What do the version numbers mean?''
 
 
   22..33..  WWhheerree ccaann II ggeett iitt??
 
 
-  The Samba suite is available via anonymous ftp from samba.anu.edu.au
+  The Samba suite is available via anonymous ftp from samba.org
   and many mirror <../MIRRORS> sites. You will get much faster
   performance if you use a mirror site. The latest and greatest versions
   of the suite are in the directory:
@@ -362,7 +362,7 @@
   +o  The newsgroup comp.protocols.smb, which has a great deal of
      discussion about Samba.
 
-  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.anu.edu.au/samba/>
+  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.org/samba/>
      includes:
 
 
@@ -381,7 +381,7 @@
   22..66..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
 
-  Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+  Send email to listproc@samba.org. Make sure the subject line is
   blank, and include the following two lines in the body of the message:
 
 
@@ -402,7 +402,7 @@
   subscribers. There are thousands of people on this list.
 
   If you stop being interested in Samba, please send another email to
-  listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+  listproc@samba.org. Make sure the subject line is blank, and
   include the following two lines in the body of the message:
 
 
@@ -429,7 +429,7 @@
 
   1. See if there are any likely looking entries in this FAQ!  If you
      have just installed Samba, have you run through the checklist in
-     DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt>? It
+     DIAGNOSIS.txt <ftp://samba.org/pub/samba/DIAGNOSIS.txt>? It
      can save you a lot of time and effort.  DIAGNOSIS.txt can also be
      found in the docs directory of the Samba distribution.
 
@@ -466,7 +466,7 @@
   If you make changes to the source code, _p_l_e_a_s_e submit these patches so
   that everyone else gets the benefit of your work. This is one of the
   most important aspects to the maintainence of Samba. Send all patches
-  to samba-bugs@samba.anu.edu.au. Do not send patches to Andrew Tridgell
+  to samba-bugs@samba.org. Do not send patches to Andrew Tridgell
   or any other individual, they may be lost if you do.
 
   Patch format ------------
@@ -518,7 +518,7 @@
 
   If you have spotted something very serious and believe that it is
   important to contact the developers quickly send a message to samba-
-  urgent@samba.anu.edu.au. This will be processed more quickly than mail
+  urgent@samba.org. This will be processed more quickly than mail
   to samba-bugs. Please think carefully before using this address. An
   example of its use might be to report a security hole.
 
@@ -614,7 +614,7 @@
   protocol specification is in the public domain and ongoing discussions
   concerning the spec take place on a public mailing list according to
   the rules of the Internet Engineering Task Force. For more information
-  and pointers see  <http://samba.anu.edu.au/cifs/>
+  and pointers see  <http://samba.org/cifs/>
 
   The following is taken from  <http://www.microsoft.com/intdev/cifs/>
 
diff --git a/docs/faq/sambafaq-1.html b/docs/faq/sambafaq-1.html
index c010e50e01..d91ea24f2e 100644
--- a/docs/faq/sambafaq-1.html
+++ b/docs/faq/sambafaq-1.html
@@ -61,7 +61,7 @@ and this FAQ were originally written by Karl Auer.</P>
 
 At time of writing, the current version was 1.9.17. If you want to be
 sure check the bottom of the change-log file. 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</A></P>
+<A HREF="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</A></P>
 <P>For more information see 
 <A HREF="#version_nums">What do the version numbers mean?</A></P>
 
@@ -72,7 +72,7 @@ sure check the bottom of the change-log file.
 <A NAME="where"></A> 
 
 The Samba suite is available via anonymous ftp from
-samba.anu.edu.au. The latest and greatest versions of the suite are in
+samba.org. The latest and greatest versions of the suite are in
 the directory:</P>
 <P>/pub/samba/</P>
 <P>Development (read "alpha") versions, which are NOT necessarily stable
@@ -206,78 +206,78 @@ There are a number of places to look for more information on Samba, including:
 </UL>
 </LI>
 <LI>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/">ftp://samba.anu.edu.au/pub/samba/docs/</A>
+<A HREF="ftp://samba.org/pub/samba/docs/">ftp://samba.org/pub/samba/docs/</A>
 <UL>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt">Application_Serving.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Application_Serving.txt">Application_Serving.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt">BROWSING.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/BROWSING.txt">BROWSING.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt">BUGS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/BUGS.txt">BUGS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt">DIAGNOSIS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt">DIAGNOSIS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt">DNIX.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DNIX.txt">DNIX.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt">DOMAIN.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DOMAIN.txt">DOMAIN.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt">CONTROL.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt">CONTROL.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt">Faxing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Faxing.txt">Faxing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt">GOTCHAS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/GOTCHAS.txt">GOTCHAS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt">HINTS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/HINTS.txt">HINTS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar">INSTALL.sambatar</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/INSTALL.sambatar">INSTALL.sambatar</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt">INSTALL.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/INSTALL.txt">INSTALL.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS">MIRRORS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/MIRRORS">MIRRORS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt">NetBIOS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/NetBIOS.txt">NetBIOS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt">OS2.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/OS2.txt">OS2.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS">PROJECTS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/PROJECTS">PROJECTS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt">Passwords.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Passwords.txt">Passwords.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt">Printing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Printing.txt">Printing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS">README.DCEDFS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.DCEDFS">README.DCEDFS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.OS2">README.OS2</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.OS2">README.OS2</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.jis">README.jis</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.jis">README.jis</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar">README.sambatar</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.sambatar">README.sambatar</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt">SCO.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/SCO.txt">SCO.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes">SMBTAR.notes</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/SMBTAR.notes">SMBTAR.notes</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt">Speed.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Speed.txt">Speed.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Support.txt">Support.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Support.txt">Support.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/THANKS">THANKS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/THANKS">THANKS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt">Tracing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Tracing.txt">Tracing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt">SMB.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/UNIX-SMB.txt">SMB.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt">Warp.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Warp.txt">Warp.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt">WinNT.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/WinNT.txt">WinNT.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/history">history</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/history">history</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt">level.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/security_level.txt">level.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm">slip.htm</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/wfw_slip.htm">slip.htm</A></LI>
 </UL>
 </LI>
 </UL>
@@ -290,7 +290,7 @@ There are a number of places to look for more information on Samba, including:
 <A NAME="mailinglist"></A> 
 
 Send email to 
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is
 blank, and include the following two lines in the body of the message:
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -307,7 +307,7 @@ regurgitates a single message containing all the messages that have
 been received by the list since the last time and sends a copy of this
 message to all subscribers.</P>
 <P>If you stop being interested in Samba, please send another email to
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank, and
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -330,7 +330,7 @@ you subscribed.</P>
 carried out the first three steps given here!</P>
 <P>Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-<A HREF="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
+<A HREF="ftp://samba.org/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba distribution.</P>
 <P>Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
 topics that relate to what you are trying to do.</P>
@@ -353,7 +353,7 @@ I can incorporate it in the next version.</P>
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
 patches to 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>. Do not send patches to Andrew Tridgell or any
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.</P>
 
 
diff --git a/docs/faq/sambafaq-2.html b/docs/faq/sambafaq-2.html
index b92a1e2fcd..dfababb66a 100644
--- a/docs/faq/sambafaq-2.html
+++ b/docs/faq/sambafaq-2.html
@@ -19,7 +19,7 @@
 <A NAME="no_browse"></A> 
 
 See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt">BROWSING.txt</A>
+<A HREF="ftp://samba.org/pub/samba/BROWSING.txt">BROWSING.txt</A>
 for more information on browsing.  Browsing.txt can also be found
 in the docs directory of the Samba source.</P>
 <P>If your GUI client does not permit you to select non-browsable
@@ -121,7 +121,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A> !</P>
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A> !</P>
 <P>Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.</P>
 <P>For many clients (including Windows for Workgroups and Lan Manager),
@@ -171,7 +171,7 @@ as a strictly temporary solution.</P>
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
 Tridgell know via email at 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>.</P>
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>.</P>
 
 
 <H2><A NAME="ss2.9">2.9 My "server string" doesn't seem to be recognised</A></H2>
diff --git a/docs/faq/sambafaq-3.html b/docs/faq/sambafaq-3.html
index 1b5dcf4d9a..995738bb53 100644
--- a/docs/faq/sambafaq-3.html
+++ b/docs/faq/sambafaq-3.html
@@ -76,7 +76,7 @@ To syncronize your PC's clock with your Samba server:
 <UL>
 <LI> Copy timesync.pif to your windows directory</LI>
 <LI> timesync.pif can be found at:
-<A HREF="http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif">http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif</A></LI>
+<A HREF="http://samba.org/samba/binaries/miscellaneous/timesync.pif">http://samba.org/samba/binaries/miscellaneous/timesync.pif</A></LI>
 <LI> Add timesync.pif to your 'Start Up' group/folder</LI>
 <LI> Open the properties dialog box for the program/icon</LI>
 <LI> Make sure the 'Run Minimized' option is set in program 'Properties'</LI>
@@ -88,7 +88,7 @@ Each time you start your computer (or login for Win95) your PC will
 synchronize its clock with your Samba server.</P>
 <P>Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
 - see: 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt">BROWSING.txt</A> *** for more information.</P>
+<A HREF="ftp://samba.org/pub/samba/docs/BROWSING.txt">BROWSING.txt</A> *** for more information.</P>
 <P>Then add 
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -122,7 +122,7 @@ over this connection. This is unfortunate, but not fatal.</P>
 (the default) then things will definately break as described
 above. The share level SMB security model has no provision for
 multiple user IDs on the one SMB connection. See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt">security_level.txt</A> in
+<A HREF="ftp://samba.org/pub/samba/docs/security_level.txt">security_level.txt</A> in
 the docs for more info on share/user/server level security.</P>
 <P>If you run in user or server level security then you have a chance,
 but only if you have a recent version of Samba (at least 1.9.15p6). In
@@ -292,7 +292,7 @@ in that dialog box.</P>
 
 this is effectively what older versions of Samba did, so if that
 worked for you then give it a go. If this does work then let us know via 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>,
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>,
 and we'll make it the default. Currently the default is a 0 length
 string.</P>
 
@@ -307,7 +307,7 @@ passing clear text passwords over the network.  To enable access to
 Samba shares from NT 4.0 SP3, you must do <B>ONE</B> of two things:
 <OL>
 <LI> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A>.</LI>
+<A HREF="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A>.</LI>
 <LI> Follow Microsoft's directions for setting your NT box to allow plain text passwords. see 
 <A HREF="http://www.microsoft.com/kb/articles/q166/7/30.htm">Knowledge Base Article Q166730</A></LI>
 </OL>
diff --git a/docs/faq/sambafaq.html b/docs/faq/sambafaq.html
index 9c45d524dd..2c703885cd 100644
--- a/docs/faq/sambafaq.html
+++ b/docs/faq/sambafaq.html
@@ -45,7 +45,7 @@ Table of Contents
 <HR>
 <H1> Samba FAQ</H1>
 
-<H2>Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.8, June '97
+<H2>Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.8, June '97
 <P><HR><EM> This is the Frequently Asked Questions (FAQ) document for
 Samba, the free and very popular SMB server product. An SMB server
 allows file and printer connections from clients such as Windows,
diff --git a/docs/faq/sambafaq.sgml b/docs/faq/sambafaq.sgml
index d306881b56..4faf10a6a5 100644
--- a/docs/faq/sambafaq.sgml
+++ b/docs/faq/sambafaq.sgml
@@ -17,7 +17,7 @@
 
 <title> Samba FAQ
 
-<author>Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.8, June '97
 
@@ -74,14 +74,14 @@ and this FAQ were originally written by Karl Auer.
 
 <sect1> What is the current version of Samba? <p><label id="current_version">
 At time of writing, the current version was 1.9.17. If you want to be
-sure check the bottom of the change-log file. <url url="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">
+sure check the bottom of the change-log file. <url url="ftp://samba.org/pub/samba/alpha/change-log">
 
 For more information see <ref id="version_nums" name="What do the
 version numbers mean?">
 
 <sect1> Where can I get it? <p> <label id="where">
 The Samba suite is available via anonymous ftp from
-samba.anu.edu.au. The latest and greatest versions of the suite are in
+samba.org. The latest and greatest versions of the suite are in
 the directory:
 
 /pub/samba/
@@ -200,48 +200,48 @@ There are a number of places to look for more information on Samba, including:
     <item>A searchable hypertext archive of the Samba mailing list.
     <item>Links to Samba source code, binaries, and mirrors of both.
   </itemize>
-<item>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at <url url="ftp://samba.anu.edu.au/pub/samba/docs/">
+<item>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at <url url="ftp://samba.org/pub/samba/docs/">
   <itemize>
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt" name="Application_Serving.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt" name="BROWSING.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt" name="BUGS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt" name="DIAGNOSIS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt" name="DNIX.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt" name="DOMAIN.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt" name="CONTROL.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt" name="Faxing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt" name="GOTCHAS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt" name="HINTS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar" name="INSTALL.sambatar">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt" name="INSTALL.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS" name="MIRRORS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt" name="NetBIOS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt" name="OS2.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS" name="PROJECTS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt" name="Passwords.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt" name="Printing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS" name="README.DCEDFS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.OS2" name="README.OS2">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.jis" name="README.jis">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar" name="README.sambatar">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt" name="SCO.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes" name="SMBTAR.notes">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt" name="Speed.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Support.txt" name="Support.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/THANKS" name="THANKS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt" name="Tracing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt" name="SMB.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt" name="Warp.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt" name="WinNT.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/history" name="history">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt" name="level.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm" name="slip.htm">
+    <item><url url="ftp://samba.org/pub/samba/docs/Application_Serving.txt" name="Application_Serving.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/BROWSING.txt" name="BROWSING.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/BUGS.txt" name="BUGS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt" name="DIAGNOSIS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DNIX.txt" name="DNIX.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DOMAIN.txt" name="DOMAIN.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt" name="CONTROL.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Faxing.txt" name="Faxing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/GOTCHAS.txt" name="GOTCHAS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/HINTS.txt" name="HINTS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/INSTALL.sambatar" name="INSTALL.sambatar">
+    <item><url url="ftp://samba.org/pub/samba/docs/INSTALL.txt" name="INSTALL.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/MIRRORS" name="MIRRORS">
+    <item><url url="ftp://samba.org/pub/samba/docs/NetBIOS.txt" name="NetBIOS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/OS2.txt" name="OS2.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/PROJECTS" name="PROJECTS">
+    <item><url url="ftp://samba.org/pub/samba/docs/Passwords.txt" name="Passwords.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Printing.txt" name="Printing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.DCEDFS" name="README.DCEDFS">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.OS2" name="README.OS2">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.jis" name="README.jis">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.sambatar" name="README.sambatar">
+    <item><url url="ftp://samba.org/pub/samba/docs/SCO.txt" name="SCO.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/SMBTAR.notes" name="SMBTAR.notes">
+    <item><url url="ftp://samba.org/pub/samba/docs/Speed.txt" name="Speed.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Support.txt" name="Support.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/THANKS" name="THANKS">
+    <item><url url="ftp://samba.org/pub/samba/docs/Tracing.txt" name="Tracing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/UNIX-SMB.txt" name="SMB.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Warp.txt" name="Warp.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/WinNT.txt" name="WinNT.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/history" name="history">
+    <item><url url="ftp://samba.org/pub/samba/docs/security_level.txt" name="level.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/wfw_slip.htm" name="slip.htm">
   </itemize>
 </itemize>
 
 <sect1>How do I subscribe to the Samba Mailing Lists?<p><label id="mailinglist">
-Send email to <htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is
+Send email to <htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is
 blank, and include the following two lines in the body of the message:
 <tscreen><verb>
 subscribe samba Firstname Lastname
@@ -257,7 +257,7 @@ been received by the list since the last time and sends a copy of this
 message to all subscribers.
 
 If you stop being interested in Samba, please send another email to
-<htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is blank, and
+<htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 <tscreen><verb>
 unsubscribe samba
@@ -273,7 +273,7 @@ carried out the first three steps given here!
 
 Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-<url url="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt" name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
+<url url="ftp://samba.org/pub/samba/DIAGNOSIS.txt" name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba distribution.
 
 Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
@@ -300,7 +300,7 @@ I can incorporate it in the next version.
 If you make changes to the source code, _please_ submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.
 
 <sect1> Pizza supply details <p> <label id="pizza">
@@ -332,7 +332,7 @@ hungry sniffer dogs but it will have been a noble gesture.
 <sect>Compiling and installing Samba on a Unix host<p><label id="unix_install">
 
 <sect1>I can't see the Samba server in any browse lists!<p><label id="no_browse">
- See <url url="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt" name="BROWSING.txt">
+ See <url url="ftp://samba.org/pub/samba/BROWSING.txt" name="BROWSING.txt">
  for more information on browsing.  Browsing.txt can also be found
  in the docs directory of the Samba source.
 
@@ -412,7 +412,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au"> !
+<htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org"> !
 
 Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.
@@ -459,7 +459,7 @@ as a strictly temporary solution.
 In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know via email at <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">.
+Tridgell know via email at <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">.
 
 <sect1>My "server string" doesn't seem to be recognised<p><label id="bad_server_string">
 OR My client reports the default setting, eg. "Samba 1.9.15p4", instead
@@ -565,7 +565,7 @@ To syncronize your PC's clock with your Samba server:
 <item> Copy timesync.pif to your windows directory
  <item> timesync.pif can be found at:
     <url 
-url="http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif">
+url="http://samba.org/samba/binaries/miscellaneous/timesync.pif">
 <item> Add timesync.pif to your 'Start Up' group/folder
 <item> Open the properties dialog box for the program/icon
 <item> Make sure the 'Run Minimized' option is set in program 'Properties'
@@ -576,7 +576,7 @@ Each time you start your computer (or login for Win95) your PC will
 synchronize its clock with your Samba server.
 
 Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
- - see: <url url="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt" name="BROWSING.txt"> *** for more information.
+ - see: <url url="ftp://samba.org/pub/samba/docs/BROWSING.txt" name="BROWSING.txt"> *** for more information.
 <p>Then add 
 <tscreen><verb>
 NET TIME \\%L /SET /YES
@@ -606,7 +606,7 @@ over this connection. This is unfortunate, but not fatal.
 It means that if you run your Samba server in share level security
 (the default) then things will definately break as described
 above. The share level SMB security model has no provision for
-multiple user IDs on the one SMB connection. See <url url="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt" name="security_level.txt"> in
+multiple user IDs on the one SMB connection. See <url url="ftp://samba.org/pub/samba/docs/security_level.txt" name="security_level.txt"> in
 the docs for more info on share/user/server level security.
 
 If you run in user or server level security then you have a chance,
@@ -755,7 +755,7 @@ You could also try setting the driver to NULL like this:
      printer driver = NULL
 </verb></tscreen>
 this is effectively what older versions of Samba did, so if that
-worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">,
+worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">,
 and we'll make it the default. Currently the default is a 0 length
 string.
 
@@ -764,7 +764,7 @@ As of SP3, Microsoft has decided that they will no longer default to
 passing clear text passwords over the network.  To enable access to 
 Samba shares from NT 4.0 SP3, you must do <bf>ONE</bf> of two things:
 <enum>
-<item> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in <url url="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">.
+<item> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in <url url="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">.
 <item> Follow Microsoft's directions for setting your NT box to allow plain text passwords. see <url url="http://www.microsoft.com/kb/articles/q166/7/30.htm" name="Knowledge Base Article Q166730">
 </enum>
 
diff --git a/docs/faq/sambafaq.txt b/docs/faq/sambafaq.txt
index 7108846ae6..f16916b29e 100644
--- a/docs/faq/sambafaq.txt
+++ b/docs/faq/sambafaq.txt
@@ -1,5 +1,5 @@
   Samba FAQ
-  Paul Blackman, ictinus@samba.anu.edu.au
+  Paul Blackman, ictinus@samba.org
   v 0.8, June '97
 
   This is the Frequently Asked Questions (FAQ) document for Samba, the
@@ -160,7 +160,7 @@
 
   At time of writing, the current version was 1.9.17. If you want to be
   sure check the bottom of the change-log file.
-  <ftp://samba.anu.edu.au/pub/samba/alpha/change-log>
+  <ftp://samba.org/pub/samba/alpha/change-log>
 
   For more information see ``What do the version numbers mean?''
 
@@ -168,7 +168,7 @@
   11..33..  WWhheerree ccaann II ggeett iitt??
 
 
-  The Samba suite is available via anonymous ftp from samba.anu.edu.au.
+  The Samba suite is available via anonymous ftp from samba.org.
   The latest and greatest versions of the suite are in the directory:
 
   /pub/samba/
@@ -344,89 +344,89 @@
 
   +o  The long list of topic documentation.  These files can be found in
      the 'docs' directory of the Samba source, or at
-     <ftp://samba.anu.edu.au/pub/samba/docs/>
+     <ftp://samba.org/pub/samba/docs/>
 
   +o  Application_Serving.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt>
+     <ftp://samba.org/pub/samba/docs/Application_Serving.txt>
 
-  +o  BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt>
+  +o  BROWSING.txt <ftp://samba.org/pub/samba/docs/BROWSING.txt>
 
-  +o  BUGS.txt <ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt>
+  +o  BUGS.txt <ftp://samba.org/pub/samba/docs/BUGS.txt>
 
-  +o  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt>
+  +o  DIAGNOSIS.txt <ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt>
 
-  +o  DNIX.txt <ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt>
+  +o  DNIX.txt <ftp://samba.org/pub/samba/docs/DNIX.txt>
 
-  +o  DOMAIN.txt <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt>
+  +o  DOMAIN.txt <ftp://samba.org/pub/samba/docs/DOMAIN.txt>
 
   +o  CONTROL.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt>
+     <ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt>
 
   +o  ENCRYPTION.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt>
+     <ftp://samba.org/pub/samba/docs/ENCRYPTION.txt>
 
-  +o  Faxing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt>
+  +o  Faxing.txt <ftp://samba.org/pub/samba/docs/Faxing.txt>
 
-  +o  GOTCHAS.txt <ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt>
+  +o  GOTCHAS.txt <ftp://samba.org/pub/samba/docs/GOTCHAS.txt>
 
-  +o  HINTS.txt <ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt>
+  +o  HINTS.txt <ftp://samba.org/pub/samba/docs/HINTS.txt>
 
   +o  INSTALL.sambatar
-     <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar>
+     <ftp://samba.org/pub/samba/docs/INSTALL.sambatar>
 
-  +o  INSTALL.txt <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt>
+  +o  INSTALL.txt <ftp://samba.org/pub/samba/docs/INSTALL.txt>
 
-  +o  MIRRORS <ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS>
+  +o  MIRRORS <ftp://samba.org/pub/samba/docs/MIRRORS>
 
-  +o  NetBIOS.txt <ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt>
+  +o  NetBIOS.txt <ftp://samba.org/pub/samba/docs/NetBIOS.txt>
 
-  +o  OS2.txt <ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt>
+  +o  OS2.txt <ftp://samba.org/pub/samba/docs/OS2.txt>
 
-  +o  PROJECTS <ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS>
+  +o  PROJECTS <ftp://samba.org/pub/samba/docs/PROJECTS>
 
-  +o  Passwords.txt <ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt>
+  +o  Passwords.txt <ftp://samba.org/pub/samba/docs/Passwords.txt>
 
-  +o  Printing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt>
+  +o  Printing.txt <ftp://samba.org/pub/samba/docs/Printing.txt>
 
-  +o  README.DCEDFS <ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS>
+  +o  README.DCEDFS <ftp://samba.org/pub/samba/docs/README.DCEDFS>
 
-  +o  README.OS2 <ftp://samba.anu.edu.au/pub/samba/docs/README.OS2>
+  +o  README.OS2 <ftp://samba.org/pub/samba/docs/README.OS2>
 
-  +o  README.jis <ftp://samba.anu.edu.au/pub/samba/docs/README.jis>
+  +o  README.jis <ftp://samba.org/pub/samba/docs/README.jis>
 
   +o  README.sambatar
-     <ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar>
+     <ftp://samba.org/pub/samba/docs/README.sambatar>
 
-  +o  SCO.txt <ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt>
+  +o  SCO.txt <ftp://samba.org/pub/samba/docs/SCO.txt>
 
-  +o  SMBTAR.notes <ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes>
+  +o  SMBTAR.notes <ftp://samba.org/pub/samba/docs/SMBTAR.notes>
 
-  +o  Speed.txt <ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt>
+  +o  Speed.txt <ftp://samba.org/pub/samba/docs/Speed.txt>
 
-  +o  Support.txt <ftp://samba.anu.edu.au/pub/samba/docs/Support.txt>
+  +o  Support.txt <ftp://samba.org/pub/samba/docs/Support.txt>
 
-  +o  THANKS <ftp://samba.anu.edu.au/pub/samba/docs/THANKS>
+  +o  THANKS <ftp://samba.org/pub/samba/docs/THANKS>
 
-  +o  Tracing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt>
+  +o  Tracing.txt <ftp://samba.org/pub/samba/docs/Tracing.txt>
 
-  +o  SMB.txt <ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt>
+  +o  SMB.txt <ftp://samba.org/pub/samba/docs/UNIX-SMB.txt>
 
-  +o  Warp.txt <ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt>
+  +o  Warp.txt <ftp://samba.org/pub/samba/docs/Warp.txt>
 
-  +o  WinNT.txt <ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt>
+  +o  WinNT.txt <ftp://samba.org/pub/samba/docs/WinNT.txt>
 
-  +o  history <ftp://samba.anu.edu.au/pub/samba/docs/history>
+  +o  history <ftp://samba.org/pub/samba/docs/history>
 
   +o  level.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt>
+     <ftp://samba.org/pub/samba/docs/security_level.txt>
 
-  +o  slip.htm <ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm>
+  +o  slip.htm <ftp://samba.org/pub/samba/docs/wfw_slip.htm>
 
 
   11..77..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
 
-  Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+  Send email to listproc@samba.org. Make sure the subject line is
   blank, and include the following two lines in the body of the message:
 
 
@@ -446,7 +446,7 @@
   message to all subscribers.
 
   If you stop being interested in Samba, please send another email to
-  listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+  listproc@samba.org. Make sure the subject line is blank, and
   include the following two lines in the body of the message:
 
 
@@ -470,7 +470,7 @@
 
   Firstly, see if there are any likely looking entries in this FAQ! If
   you have just installed Samba, have you run through the checklist in
-  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt>? It can
+  DIAGNOSIS.txt <ftp://samba.org/pub/samba/DIAGNOSIS.txt>? It can
   save you a lot of time and effort.  DIAGNOSIS.txt can also be found in
   the docs directory of the Samba distribution.
 
@@ -497,7 +497,7 @@
   If you make changes to the source code, _please_ submit these patches
   so that everyone else gets the benefit of your work. This is one of
   the most important aspects to the maintainence of Samba. Send all
-  patches to samba-bugs@samba.anu.edu.au. Do not send patches to Andrew
+  patches to samba-bugs@samba.org. Do not send patches to Andrew
   Tridgell or any other individual, they may be lost if you do.
 
 
@@ -538,7 +538,7 @@
   22..11..  II ccaann''tt sseeee tthhee SSaammbbaa sseerrvveerr iinn aannyy bbrroowwssee lliissttss!!
 
 
-  See BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/BROWSING.txt> for
+  See BROWSING.txt <ftp://samba.org/pub/samba/BROWSING.txt> for
   more information on browsing.  Browsing.txt can also be found in the
   docs directory of the Samba source.
 
@@ -646,7 +646,7 @@
   machines (such as users of smbclient under Unix). Having said that,
   several developers are working hard on building it in to the next
   major version of Samba. If you can contribute, send a message to
-  samba-bugs@samba.anu.edu.au !
+  samba-bugs@samba.org !
 
   Seeing this message should not affect your ability to mount redirected
   disks and printers, which is really what all this is about.
@@ -703,7 +703,7 @@
   In earlier Samba versions there were some difficulties with the very
   latest Microsoft products, particularly Excel 5 and Word for Windows
   6. These should have all been solved. If not then please let Andrew
-  Tridgell know via email at samba-bugs@samba.anu.edu.au.
+  Tridgell know via email at samba-bugs@samba.org.
 
 
   22..99..  MMyy ""sseerrvveerr ssttrriinngg"" ddooeessnn''tt sseeeemm ttoo bbee rreeccooggnniisseedd
@@ -827,7 +827,7 @@
   +o  Copy timesync.pif to your windows directory
 
   +o  timesync.pif can be found at:
-     <http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif>
+     <http://samba.org/samba/binaries/miscellaneous/timesync.pif>
 
   +o  Add timesync.pif to your 'Start Up' group/folder
 
@@ -845,7 +845,7 @@
 
   Alternativley, if you clients support Domain Logons, you can setup
   Domain Logons with Samba - see: BROWSING.txt
-  <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt> *** for more
+  <ftp://samba.org/pub/samba/docs/BROWSING.txt> *** for more
   information.
 
   Then add
@@ -883,7 +883,7 @@
   (the default) then things will definately break as described above.
   The share level SMB security model has no provision for multiple user
   IDs on the one SMB connection. See security_level.txt
-  <ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt> in the docs
+  <ftp://samba.org/pub/samba/docs/security_level.txt> in the docs
   for more info on share/user/server level security.
 
   If you run in user or server level security then you have a chance,
@@ -1050,7 +1050,7 @@
 
   this is effectively what older versions of Samba did, so if that
   worked for you then give it a go. If this does work then let us know
-  via samba-bugs@samba.anu.edu.au, and we'll make it the default. Cur-
+  via samba-bugs@samba.org, and we'll make it the default. Cur-
   rently the default is a 0 length string.
 
 
@@ -1064,7 +1064,7 @@
 
   1. Set the Samba configuration option 'security = user' and implement
      all of the stuff detailed in ENCRYPTION.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt>.
+     <ftp://samba.org/pub/samba/docs/ENCRYPTION.txt>.
 
   2. Follow Microsoft's directions for setting your NT box to allow
      plain text passwords. see Knowledge Base Article Q166730