17 files changed, 71 insertions, 71 deletions
diff --git a/docs/htmldocs/DOMAIN_MEMBER.html b/docs/htmldocs/DOMAIN_MEMBER.html
index 98855a3e65..6d9741f2f2 100644
--- a/docs/htmldocs/DOMAIN_MEMBER.html
+++ b/docs/htmldocs/DOMAIN_MEMBER.html
@@ -5,7 +5,7 @@
 
 <html><head><title>Joining an NT Domain with Samba 2.0</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
diff --git a/docs/htmldocs/lmhosts.5.html b/docs/htmldocs/lmhosts.5.html
index d3ffedaff6..ece68eb511 100644
--- a/docs/htmldocs/lmhosts.5.html
+++ b/docs/htmldocs/lmhosts.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>lmhosts (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -78,7 +78,7 @@ as the <a href="smb.conf.html"><strong>smb.conf</strong></a> file.
 <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
@@ -86,7 +86,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/make_smbcodepage.1.html b/docs/htmldocs/make_smbcodepage.1.html
index 10615deb86..3fa9a1c535 100644
--- a/docs/htmldocs/make_smbcodepage.1.html
+++ b/docs/htmldocs/make_smbcodepage.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>make_smbcodepage (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -74,7 +74,7 @@ provided in the Samba distribution for codepages 437 (USA), 737
 866 (Cyrillic), 932 (Kanji SJIS), 936 (Simplified Chinese), 949
 (Hangul) and 950 (Traditional Chinese). Users are encouraged to write
 text codepage definition files for their own code pages and donate
-them to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. All codepage files in the
+them to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. All codepage files in the
 Samba <em>source/codepages</em> directory are compiled and installed when a
 <em>'make install'</em> command is issued there.
 <p><br>The client codepage used by the <a href="smbd.8.html"><strong>smbd</strong></a> server is
@@ -128,7 +128,7 @@ by all.  The program should NOT be setuid or setgid!
 <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
@@ -136,7 +136,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index dc8f5b0de3..3139e90ad1 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>nmbd</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -190,12 +190,12 @@ level.
 (1)</strong></a>, and the Internet RFC's <strong>rfc1001.txt</strong>,
 <strong>rfc1002.txt</strong>. In addition the CIFS (formerly SMB) specification is
 available as a link from the Web page :
-<a href="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</a>.
+<a href="http://samba.org/cifs/">http://samba.org/cifs/</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
@@ -203,7 +203,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index 217ddd7965..5ff58e5b40 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>nmblookup (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -115,8 +115,8 @@ which will return all registered names within a broadcast area.
 <strong>nmblookup</strong> must be called like this:
 <p><br><code>nmblookup -U server -R 'name'</code>
 <p><br>For example, running :
-<p><br><code>nmblookup -U samba.anu.edu.au -R IRIX#1B'</code>
-<p><br>would query the WINS server samba.anu.edu.au for the domain master
+<p><br><code>nmblookup -U samba.org -R IRIX#1B'</code>
+<p><br>would query the WINS server samba.org for the domain master
 browser (1B name type) for the IRIX workgroup.
 <p><br><a name="VERSION"></a>
 <h2>VERSION</h2>
@@ -131,7 +131,7 @@ browser (1B name type) for the IRIX workgroup.
 <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
@@ -139,7 +139,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/samba.7.html b/docs/htmldocs/samba.7.html
index 1f6b8a0ae5..f197ccfa32 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>
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index a0c1eb82b3..a206451979 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smb.conf (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -311,7 +311,7 @@ negotiation. It can be one of CORE, COREPLUS, LANMAN1, LANMAN2 or NT1.
 machine. Only some are recognized, and those may not be 100%
 reliable. It currently recognizes Samba, WfWg, WinNT and
 Win95. Anything else will be known as "UNKNOWN". If it gets it wrong
-then sending a level 3 log to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>
+then sending a level 3 log to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>
 should allow it to be fixed.
 <p><br><a name="percentI"></a>
 <li > <strong>%I</strong> = The IP address of the client machine.
@@ -1238,7 +1238,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainadminusers"></a> 
 <li><strong><strong>domain admin users (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1246,7 +1246,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domaincontroller"></a>
 <li><strong><strong>domain controller (G)</strong></strong>
 <p><br>This is a <strong>DEPRECATED</strong> parameter. It is currently not used within
@@ -1259,7 +1259,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainguestgroup"></a>
 <li><strong><strong>domain guest group (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1267,7 +1267,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainguestusers"></a>
 <li><strong><strong>domain guest users (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1275,7 +1275,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainlogons"></a>
 <li><strong><strong>domain logons (G)</strong></strong>
 <p><br>If set to true, the Samba server will serve Windows 95/98 Domain
@@ -3614,7 +3614,7 @@ appropriate documentation for your operating system first (perhaps
 option" when you supply an option. This means you either incorrectly 
 typed it or you need to add an include file to includes.h for your OS. 
 If the latter is the case please send the patch to
-<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>.
 <p><br>Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
 <p><br>This is the list of socket options currently settable using this
@@ -4440,7 +4440,7 @@ permissions on spool directories are correct.
 <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
@@ -4448,7 +4448,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 533066c500..71a3b786bf 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbclient (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -567,7 +567,7 @@ level used by the client. If you have problems, set the debug level to
 <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
@@ -575,7 +575,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index a6e0f32e12..78d8c3587a 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbd (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -363,12 +363,12 @@ performance.
 <a href="testprns.1.html"><strong>testprns (1)</strong></a>, and the Internet RFC's
 <strong>rfc1001.txt</strong>, <strong>rfc1002.txt</strong>. In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
-<a href="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</a>.
+<a href="http://samba.org/cifs/">http://samba.org/cifs/</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
@@ -376,7 +376,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full list of contributors
 and details on how to submit bug reports, comments etc.
 </body>
diff --git a/docs/htmldocs/smbpasswd.5.html b/docs/htmldocs/smbpasswd.5.html
index 6c4081fc4d..9ff258afad 100644
--- a/docs/htmldocs/smbpasswd.5.html
+++ b/docs/htmldocs/smbpasswd.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbpasswd (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -179,7 +179,7 @@ algorithm.
 <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
@@ -187,7 +187,7 @@ 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>.
+Allison, <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index 6bfd8cdb44..2b2f466064 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbpasswd (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -186,7 +186,7 @@ being used as an NT Primary Domain Controller. PDC support is not a
 supported feature in Samba2.0 but will become supported in a later
 release. If you wish to know more about using Samba as an NT PDC then
 please subscribe to the mailing list
-<a href="mailto:samba-ntdom@samba.anu.edu.au"><em>samba-ntdom@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-ntdom@samba.org"><em>samba-ntdom@samba.org</em></a>.
 <p><br>This option is only available when running <strong>smbpasswd</strong> as root.
 <p><br><a name="minusj"></a>
 <li><strong><strong>-j DOMAIN</strong></strong> This option is used to add a Samba server into a
@@ -260,7 +260,7 @@ in the docs directory for details on how to do this.
 <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
@@ -268,7 +268,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbrun.1.html b/docs/htmldocs/smbrun.1.html
index 9db9b7e783..ccfdd6ff2a 100644
--- a/docs/htmldocs/smbrun.1.html
+++ b/docs/htmldocs/smbrun.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbrun (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -70,7 +70,7 @@ commands to issue suitable diagnostics to aid trouble-shooting.
 <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
@@ -78,7 +78,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbstatus.1.html b/docs/htmldocs/smbstatus.1.html
index cc48f29d88..9fc53f416b 100644
--- a/docs/htmldocs/smbstatus.1.html
+++ b/docs/htmldocs/smbstatus.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbstatus (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -67,7 +67,7 @@ only.
 <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
@@ -75,7 +75,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/smbtar.1.html b/docs/htmldocs/smbtar.1.html
index 610ead88df..ef416f2e6c 100644
--- a/docs/htmldocs/smbtar.1.html
+++ b/docs/htmldocs/smbtar.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbtar (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -111,7 +111,7 @@ the <a href="smbclient.1.html"><strong>smbclient</strong></a> command.
 <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>Ricky Poulten <a href="mailto:poultenr@logica.co.uk"><em>poultenr@logica.co.uk</em></a> wrote the tar extension and
@@ -122,7 +122,7 @@ etc. The man page 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/swat.8.html b/docs/htmldocs/swat.8.html
index 31afec1a89..0d43dd494b 100644
--- a/docs/htmldocs/swat.8.html
+++ b/docs/htmldocs/swat.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>swat (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -132,7 +132,7 @@ or don't use <strong>swat</strong>!
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell (samba-bugs@samba.org). 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
@@ -140,7 +140,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 6d2c2c92c5..00db231626 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>testparm (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -89,7 +89,7 @@ dumps all known service details to stdout.
 <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
@@ -97,7 +97,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.
diff --git a/docs/htmldocs/testprns.1.html b/docs/htmldocs/testprns.1.html
index 62d71a29f2..8afbbb7cd4 100644
--- a/docs/htmldocs/testprns.1.html
+++ b/docs/htmldocs/testprns.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>testprns (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -82,7 +82,7 @@ log should be checked carefully for errors and warnings.
 <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
@@ -90,7 +90,7 @@ 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>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full
 list of contributors and details on how to submit bug reports,
 comments etc.