merge from 2.2

(This used to be commit c5ee06b7c8fc9f1fec679acc7d7f47f333707456)

7 files changed, 10 insertions, 10 deletions

diff --git a/docs/textdocs/Application_Serving.txt b/docs/textdocs/Application_Serving.txt
index 083dc0c971..6a61a99d7e 100644
--- a/docs/textdocs/Application_Serving.txt
+++ b/docs/textdocs/Application_Serving.txt
@@ -1,6 +1,6 @@
 Contributed:	January 7, 1997
 Updated:	March 24, 1998
-Contributor:	John H Terpstra <samba-bugs@samba.org>
+Contributor:	John H Terpstra <samba@samba.org>
 		Copyright (C) 1997 - John H Terpstra
 Status:		Current
 
diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt
index 1a25f6d428..247998c6c7 100644
--- a/docs/textdocs/BUGS.txt
+++ b/docs/textdocs/BUGS.txt
@@ -4,7 +4,7 @@ Updated:	June 27, 1997
 Subject: This file describes how to report Samba bugs. 
 ============================================================================
 
->> The email address for bug reports is samba-bugs@samba.org <<
+>> The email address for bug reports is samba@samba.org <<
 
 Please take the time to read this file before you submit a bug
 report. Also, please see if it has changed between releases, as we
diff --git a/docs/textdocs/NetBIOS.txt b/docs/textdocs/NetBIOS.txt
index 415aa34beb..ca0dcc84b7 100644
--- a/docs/textdocs/NetBIOS.txt
+++ b/docs/textdocs/NetBIOS.txt
@@ -1,4 +1,4 @@
-Contributor:    lkcl - samba-bugs@arvidsjaur.anu.edu.au
+Contributor:    lkcl - samba@samba.org
                 Copyright 1997  Luke Kenneth Casson Leighton 
 Date:           March 1997
 Status:         Current
diff --git a/docs/textdocs/PROFILES.txt b/docs/textdocs/PROFILES.txt
index 1e8b573695..1b9cf4213e 100644
--- a/docs/textdocs/PROFILES.txt
+++ b/docs/textdocs/PROFILES.txt
@@ -1,7 +1,7 @@
 Contributors:	Bruce Cook <BC3-AU@bigfoot.com>
 		Copyright (C) 1998 Bruce Cook
 
-		John Terpstra <samba-bugs@samba.org>
+		John Terpstra <samba@samba.org>
 		Copyright (C) 1998 John H. Terpstra
 
 		Wolfgang Ratzka <ratzka@hrz.uni-marburg.de>
@@ -118,7 +118,7 @@ machine.
 [lkcl: nt workstations should look in exactly the same places for things on
        samba or other SMB servers as they do on an NT server, as long as that
        SMB server looks like NT.  if anyone finds that something fails, alert
-       us on samba-bugs@samba.org and we'll look into it].
+       us on samba@samba.org and we'll look into it].
 
    When an NT system find a user without a NTuser.DAT, it copies from a
    prototype that it stores especially for this purpose, so while unlike '95
diff --git a/docs/textdocs/Printing.txt b/docs/textdocs/Printing.txt
index 87032c1e47..b47120eaba 100644
--- a/docs/textdocs/Printing.txt
+++ b/docs/textdocs/Printing.txt
@@ -1,4 +1,4 @@
-Contributor:	Unknown <samba-bugs@samba.org>
+Contributor:	Unknown <samba@samba.org>
 Revised by:	Patrick Powell <papowell@lprng.org>
 Date:		August 11, 2000
 Status:		Current
@@ -11,7 +11,7 @@ Samba. This describes how to debug problems with printing from a SMB
 client to a Samba server, not the other way around. For the reverse
 see the examples/printing directory.
 
-Please send enhancements to this file to samba-bugs@samba.org
+Please send enhancements to this file to samba@samba.org
 
 Ok, so you want to print to a Samba server from your PC. The first
 thing you need to understand is that Samba does not actually do any
diff --git a/docs/textdocs/Tracing.txt b/docs/textdocs/Tracing.txt
index d11c394e5c..fd65045abd 100644
--- a/docs/textdocs/Tracing.txt
+++ b/docs/textdocs/Tracing.txt
@@ -1,4 +1,4 @@
-Contributor:	Andrew Tridgell <samba-bugs@samba.org>
+Contributor:	Andrew Tridgell <samba@samba.org>
 Date:		Old
 Status:		Questionable
 
@@ -90,4 +90,4 @@ read-only. Both fail. This means /dev/null has incorrect permissions.
 
 Have fun!
 
-(please send updates/fixes to this file to samba-bugs@samba.org)
+(please send updates/fixes to this file to samba@samba.org)
diff --git a/docs/textdocs/UNIX-SMB.txt b/docs/textdocs/UNIX-SMB.txt
index 65dbc4874d..c3d7643cbc 100644
--- a/docs/textdocs/UNIX-SMB.txt
+++ b/docs/textdocs/UNIX-SMB.txt
@@ -1,4 +1,4 @@
-Contributor:	Andrew Tridgell <samba-bugs@samba.org>
+Contributor:	Andrew Tridgell <samba@samba.org>
 Date:		April 1995
 
 Subject:	Discussion of NetBIOS in a Unix World