2 files changed, 11 insertions, 11 deletions
diff --git a/swat/help/smb.conf.5.html b/swat/help/smb.conf.5.html
index a0c1eb82b3..a206451979 100644
--- a/swat/help/smb.conf.5.html
+++ b/swat/help/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/swat/help/welcome.html b/swat/help/welcome.html
index 33a1577455..0df7991cd7 100644
--- a/swat/help/welcome.html
+++ b/swat/help/welcome.html
@@ -34,6 +34,6 @@ Here are some of the features we want to eventually incorporate.<p>
 <H2>Feedback</H2>
 
 Please join the <A
-HREF="http://samba.anu.edu.au/listproc/">samba</A> mailing
+HREF="http://samba.org/listproc/">samba</A> mailing
 list if you want to discuss issues with this release of SWAT.