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-2.html b/docs/faq/Samba-meta-FAQ-2.html
index 87cf815e0b..1e36332d42 100644
--- a/docs/faq/Samba-meta-FAQ-2.html
+++ b/docs/faq/Samba-meta-FAQ-2.html
@@ -269,12 +269,12 @@ that an explanation can be incorporated into the next version.</P>
 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 
-<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>. Do not send patches to Andrew Tridgell or any
+<A HREF="mailto:samba@samba.org">samba@samba.org</A>. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.</P>
 <P>Patch format
 ------------</P>
 <P>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 from
+standard diff format. As an example, samba@samba.org received this patch from
 someone:</P>
 <P>382a
 #endif
@@ -322,7 +322,7 @@ huge files.
 <P>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
+mail to samba@samba.org. Please think carefully before using this address. An
 example of its use might be to report a security hole.</P>
 <P>Examples of things <EM>not</EM> to send to samba-urgent include problems
 getting Samba to work at all and bugs that cannot potentially cause damage.</P>