1 files changed, 8 insertions, 8 deletions
diff --git a/docs/faq/Samba-meta-FAQ-2.html b/docs/faq/Samba-meta-FAQ-2.html
index ac760380067..87cf815e0ba 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