17 files changed, 71 insertions, 71 deletions
diff --git a/docs/yodldocs/DOMAIN_MEMBER.yo b/docs/yodldocs/DOMAIN_MEMBER.yo
index 9b9c37ac1c..2b05c0e814 100644
--- a/docs/yodldocs/DOMAIN_MEMBER.yo
+++ b/docs/yodldocs/DOMAIN_MEMBER.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 
 article(Joining an NT Domain with Samba 2.0)(Jeremy Allison, Samba Team)(11th November 1998)
 
diff --git a/docs/yodldocs/lmhosts.5.yo b/docs/yodldocs/lmhosts.5.yo
index ceb217ddb2..a48dedaca8 100644
--- a/docs/yodldocs/lmhosts.5.yo
+++ b/docs/yodldocs/lmhosts.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 
 manpage(lmhosts htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -78,7 +78,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -87,7 +87,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/make_smbcodepage.1.yo b/docs/yodldocs/make_smbcodepage.1.yo
index 73483689d2..8ef39e5493 100644
--- a/docs/yodldocs/make_smbcodepage.1.yo
+++ b/docs/yodldocs/make_smbcodepage.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(make_smbcodepage htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -69,7 +69,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 email(samba-bugs@samba.anu.edu.au). All codepage files in the
+them to email(samba-bugs@samba.org). All codepage files in the
 Samba em(source/codepages) directory are compiled and installed when a
 em('make install') command is issued there.
 
@@ -139,7 +139,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -148,7 +148,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmbd.8.yo b/docs/yodldocs/nmbd.8.yo
index c0949d2677..bf9a5f8b78 100644
--- a/docs/yodldocs/nmbd.8.yo
+++ b/docs/yodldocs/nmbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(nmbd)(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -215,13 +215,13 @@ url(bf(testparm (1)))(testparm.1.html), url(bf(testprns
 (1)))(testprns.1.html), and the Internet RFC's bf(rfc1001.txt),
 bf(rfc1002.txt). In addition the CIFS (formerly SMB) specification is
 available as a link from the Web page :
-url(http://samba.anu.edu.au/cifs/)(http://samba.anu.edu.au/cifs/).
+url(http://samba.org/cifs/)(http://samba.org/cifs/).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -230,7 +230,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmblookup.1.yo b/docs/yodldocs/nmblookup.1.yo
index 98de643fd0..6293fd01e5 100644
--- a/docs/yodldocs/nmblookup.1.yo
+++ b/docs/yodldocs/nmblookup.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(nmblookup htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -123,9 +123,9 @@ tt(nmblookup -U server -R 'name')
 
 For example, running :
 
-tt(nmblookup -U samba.anu.edu.au -R IRIX#1B')
+tt(nmblookup -U samba.org -R IRIX#1B')
 
-would query the WINS server samba.anu.edu.au for the domain master
+would query the WINS server samba.org for the domain master
 browser (1B name type) for the IRIX workgroup.
 
 label(VERSION)
@@ -143,7 +143,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -152,7 +152,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/samba.7.yo b/docs/yodldocs/samba.7.yo
index 3951d13fa8..dc238bd0fc 100644
--- a/docs/yodldocs/samba.7.yo
+++ b/docs/yodldocs/samba.7.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 manpage(Samba htmlcommand((7)))(7)(23 Oct 1998)(Samba)()
 
 label(NAME)
@@ -25,7 +25,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 email(samba-bugs@samba.anu.edu.au).
+to email(samba-bugs@samba.org).
 
 startdit() 
 
@@ -83,7 +83,7 @@ file COPYING. You are encouraged to distribute copies of the Samba
 suite, but please obey the terms of this license.
 
 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.
 
 You may also find useful information about Samba on the newsgroup
@@ -93,7 +93,7 @@ the mailing list are given in the README file that comes with Samba.
 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
-url(http://samba.anu.edu.au/samba/)(http://samba.anu.edu.au/samba/).
+url(http://samba.org/samba/)(http://samba.org/samba/).
 
 label(VERSION)
 manpagesection(VERSION)
@@ -104,13 +104,13 @@ label(CONTRIBUTIONS)
 manpagesection(CONTRIBUTIONS)
 
 If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at email(samba@samba.anu.edu.au). See the
+join the Samba mailing list at email(samba@samba.org). See the
 Web page at
-url(http://samba.anu.edu.au/listproc)(http://samba.anu.edu.au/listproc)
+url(http://samba.org/listproc)(http://samba.org/listproc)
 for details on how to do this.
 
 If you have patches to submit or bugs to report then you may mail them
-directly to email(samba-bugs@samba.anu.edu.au). Note, however, that due to
+directly to email(samba-bugs@samba.org). 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) format.
 
@@ -119,22 +119,22 @@ manpagesection(CREDITS)
 
 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
-url(ftp://samba.anu.edu.au/pub/samba/alpha/change-log)(ftp://samba.anu.edu.au/pub/samba/alpha/change-log)
+url(ftp://samba.org/pub/samba/alpha/change-log)(ftp://samba.org/pub/samba/alpha/change-log)
 for the pre-CVS changes and at
-url(ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log)(ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log)
+url(ftp://samba.org/pub/samba/alpha/cvs.log)(ftp://samba.org/pub/samba/alpha/cvs.log)
 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.
 
 In addition, several commercial organizations now help fund the Samba
 Team with money and equipment. For details see the Samba Web pages at
-url(http://samba.anu.edu.au/samba/samba-thanks.html)(http://samba.anu.edu.au/samba/samba-thanks.html).
+url(http://samba.org/samba/samba-thanks.html)(http://samba.org/samba/samba-thanks.html).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -143,4 +143,4 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo
index 809e9d17a6..12ae4242e0 100644
--- a/docs/yodldocs/smb.conf.5.yo
+++ b/docs/yodldocs/smb.conf.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smb.conf htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -361,7 +361,7 @@ it() bf(%a) = the architecture of the remote
 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 email(samba-bugs@samba.anu.edu.au)
+then sending a level 3 log to email(samba-bugs@samba.org)
 should allow it to be fixed.
 
 label(percentI)
@@ -1776,7 +1776,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 bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainadminusers) 
 dit(bf(domain admin users (G)))
@@ -1786,7 +1786,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 bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domain controller)
 dit(bf(domain controller (G)))
@@ -1803,7 +1803,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 bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainguestgroup)
 dit(bf(domain guest group (G)))
@@ -1813,7 +1813,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 bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainguestusers)
 dit(bf(domain guest users (G)))
@@ -1823,7 +1823,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 bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainlogons)
 dit(bf(domain logons (G)))
@@ -5017,7 +5017,7 @@ You may find that on some systems Samba will say "Unknown socket
 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
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
@@ -6114,7 +6114,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -6123,7 +6123,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index e332f82556..327e47c7a2 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbclient htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -728,7 +728,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -737,7 +737,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbd.8.yo b/docs/yodldocs/smbd.8.yo
index eded744ad2..acd2639a26 100644
--- a/docs/yodldocs/smbd.8.yo
+++ b/docs/yodldocs/smbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -427,13 +427,13 @@ url(bf(smb.conf (5)))(smb.conf.5.html), url(bf(smbclient
 url(bf(testprns (1)))(testprns.1.html), and the Internet RFC's
 bf(rfc1001.txt), bf(rfc1002.txt). In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
-url(http://samba.anu.edu.au/cifs/)(http://samba.anu.edu.au/cifs/).
+url(http://samba.org/cifs/)(http://samba.org/cifs/).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -442,7 +442,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) 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/yodldocs/smbpasswd.5.yo b/docs/yodldocs/smbpasswd.5.yo
index 2dc8458013..8918b24835 100644
--- a/docs/yodldocs/smbpasswd.5.yo
+++ b/docs/yodldocs/smbpasswd.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbpasswd htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -197,7 +197,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -206,7 +206,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/)) 
 and updated for the Samba2.0 release by Jeremy
-Allison, email(samba-bugs@samba.anu.edu.au).
+Allison, email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbpasswd.8.yo b/docs/yodldocs/smbpasswd.8.yo
index b32a65a129..9e7c401fcf 100644
--- a/docs/yodldocs/smbpasswd.8.yo
+++ b/docs/yodldocs/smbpasswd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbpasswd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -207,7 +207,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
-email(samba-ntdom@samba.anu.edu.au).
+email(samba-ntdom@samba.org).
 
 This option is only available when running bf(smbpasswd) as root.
 
@@ -296,7 +296,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -305,7 +305,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbrun.1.yo b/docs/yodldocs/smbrun.1.yo
index d8e05c6e09..97865e9826 100644
--- a/docs/yodldocs/smbrun.1.yo
+++ b/docs/yodldocs/smbrun.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbrun htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -65,7 +65,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -74,7 +74,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbstatus.1.yo b/docs/yodldocs/smbstatus.1.yo
index 0312cdb251..9429811c7d 100644
--- a/docs/yodldocs/smbstatus.1.yo
+++ b/docs/yodldocs/smbstatus.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbstatus htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -65,7 +65,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -74,7 +74,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbtar.1.yo b/docs/yodldocs/smbtar.1.yo
index d35cea6939..217d8d1926 100644
--- a/docs/yodldocs/smbtar.1.yo
+++ b/docs/yodldocs/smbtar.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbtar htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -119,7 +119,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -131,7 +131,7 @@ etc. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison,
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
  
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/swat.8.yo b/docs/yodldocs/swat.8.yo
index 81719f5ccd..5059e3f47c 100644
--- a/docs/yodldocs/swat.8.yo
+++ b/docs/yodldocs/swat.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(swat htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -146,7 +146,7 @@ label(AUTHOR)
 manpageauthor()
 
 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.
 
@@ -155,7 +155,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testparm.1.yo b/docs/yodldocs/testparm.1.yo
index 1c463a5ee4..2c8e414bcd 100644
--- a/docs/yodldocs/testparm.1.yo
+++ b/docs/yodldocs/testparm.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(testparm htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -88,7 +88,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -97,7 +97,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testprns.1.yo b/docs/yodldocs/testprns.1.yo
index 8ec0410426..a29cd0dd85 100644
--- a/docs/yodldocs/testprns.1.yo
+++ b/docs/yodldocs/testprns.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(testprns htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -82,7 +82,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -91,7 +91,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,