1 files changed, 12 insertions, 12 deletions
diff --git a/docs/htmldocs/samba.7.html b/docs/htmldocs/samba.7.html
index 1f6b8a0ae51..f197ccfa32c 100644
--- a/docs/htmldocs/samba.7.html
+++ b/docs/htmldocs/samba.7.html
@@ -4,7 +4,7 @@
 
 <html><head><title>Samba (7)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -39,7 +39,7 @@ described in a separate manual page. It is strongly recommended that
 you read the documentation that comes with Samba and the manual pages
 of those components that you use. If the manual pages aren't clear
 enough then please send a patch or bug report
-to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br><ul> 
 <p><br><li><strong><a href="smbd.8.html"><strong>smbd</strong></a></strong> <br> <br> The <a href="smbd.8.html"><strong>smbd</strong>
 (8)</a> daemon provides the file and print services to SMB
@@ -84,7 +84,7 @@ passwords on Samba and Windows NT(tm) servers.
 file COPYING. You are encouraged to distribute copies of the Samba
 suite, but please obey the terms of this license.
 <p><br>The latest version of the Samba suite can be obtained via anonymous
-ftp from samba.anu.edu.au in the directory pub/samba/. It is
+ftp from samba.org in the directory pub/samba/. It is
 also available on several mirror sites worldwide.
 <p><br>You may also find useful information about Samba on the newsgroup
 comp.protocols.smb and the Samba mailing list. Details on how to join
@@ -92,7 +92,7 @@ the mailing list are given in the README file that comes with Samba.
 <p><br>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
-<a href="http://samba.anu.edu.au/samba/">http://samba.anu.edu.au/samba/</a>.
+<a href="http://samba.org/samba/">http://samba.org/samba/</a>.
 <p><br><a name="VERSION"></a>
 <h2>VERSION</h2>
     
@@ -101,12 +101,12 @@ of the Samba mailing list, at
 <h2>CONTRIBUTIONS</h2>
     
 <p><br>If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at <a href="mailto:samba@samba.anu.edu.au"><em>samba@samba.anu.edu.au</em></a>. See the
+join the Samba mailing list at <a href="mailto:samba@samba.org"><em>samba@samba.org</em></a>. See the
 Web page at
-<a href="http://samba.anu.edu.au/listproc">http://samba.anu.edu.au/listproc</a>
+<a href="http://samba.org/listproc">http://samba.org/listproc</a>
 for details on how to do this.
 <p><br>If you have patches to submit or bugs to report then you may mail them
-directly to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Note, however, that due to
+directly to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Note, however, that due to
 the enormous popularity of this package the Samba Team may take some
 time to respond to mail. We prefer patches in <em>diff -u</em> format.
 <p><br><a name="CREDITS"></a>
@@ -114,20 +114,20 @@ time to respond to mail. We prefer patches in <em>diff -u</em> format.
     
 <p><br>Contributors to the project are now too numerous to mention here but
 all deserve the thanks of all Samba users. To see a full list, look at
-<a href="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</a>
+<a href="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</a>
 for the pre-CVS changes and at
-<a href="ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log">ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log</a>
+<a href="ftp://samba.org/pub/samba/alpha/cvs.log">ftp://samba.org/pub/samba/alpha/cvs.log</a>
 for the contributors to Samba post-CVS. CVS is the Open Source source
 code control system used by the Samba Team to develop Samba. The
 project would have been unmanageable without it.
 <p><br>In addition, several commercial organizations now help fund the Samba
 Team with money and equipment. For details see the Samba Web pages at
-<a href="http://samba.anu.edu.au/samba/samba-thanks.html">http://samba.anu.edu.au/samba/samba-thanks.html</a>.
+<a href="http://samba.org/samba/samba-thanks.html">http://samba.org/samba/samba-thanks.html</a>.
 <p><br><a name="AUTHOR"></a>
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -135,6 +135,6 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 </body>
 </html>