merge from 2.2

(This used to be commit c5ee06b7c8fc9f1fec679acc7d7f47f333707456)

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/faq/Samba-meta-FAQ.txt b/docs/faq/Samba-meta-FAQ.txt
index fb4887e097a..01fc8d6ccf1 100644
--- a/docs/faq/Samba-meta-FAQ.txt
+++ b/docs/faq/Samba-meta-FAQ.txt
@@ -466,13 +466,13 @@
   If you make changes to the source code, _p_l_e_a_s_e submit these patches so
   that everyone else gets the benefit of your work. This is one of the
   most important aspects to the maintainence of Samba. Send all patches
-  to samba-bugs@samba.org. Do not send patches to Andrew Tridgell
+  to samba@samba.org. Do not send patches to Andrew Tridgell
   or any other individual, they may be lost if you do.
 
   Patch format ------------
 
   If you are sending a patch to fix a problem then please don't just use
-  standard diff format. As an example, samba-bugs received this patch
+  standard diff format. As an example, samba@samba.org received this patch
   from someone:
 
   382a #endif 381a #if !defined(NEWS61)
@@ -519,7 +519,7 @@
   If you have spotted something very serious and believe that it is
   important to contact the developers quickly send a message to samba-
   urgent@samba.org. This will be processed more quickly than mail
-  to samba-bugs. Please think carefully before using this address. An
+  to samba@samba.org. Please think carefully before using this address. An
   example of its use might be to report a security hole.
 
   Examples of things _n_o_t to send to samba-urgent include problems