merge from 2.2

(This used to be commit c5ee06b7c8fc9f1fec679acc7d7f47f333707456)

10 files changed, 25 insertions, 25 deletions

diff --git a/docs/faq/Samba-Server-FAQ-2.html b/docs/faq/Samba-Server-FAQ-2.html
index 76baba41b1..37a3983399 100644
--- a/docs/faq/Samba-Server-FAQ-2.html
+++ b/docs/faq/Samba-Server-FAQ-2.html
@@ -300,7 +300,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<A HREF="mailto:samba-bugs@anu.edu.au">samba-bugs@anu.edu.au</A> !</P>
+<A HREF="mailto:samba@samba.org">samba@samba.org</A> !</P>
 <P>Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.</P>
 <P>For many clients (including Windows for Workgroups and Lan Manager),
@@ -348,7 +348,7 @@ as a strictly temporary solution.</P>
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
 Tridgell know via email at 
-<A HREF="mailto:samba-bugs@anu.edu.au">samba-bugs@anu.edu.au</A>.</P>
+<A HREF="mailto:sambas@samba.org">samba@samba.org</A>.</P>
 
 
 <H2><A NAME="ss2.15">2.15 My "server string" doesn't seem to be recognised</A></H2>
diff --git a/docs/faq/Samba-Server-FAQ.sgml b/docs/faq/Samba-Server-FAQ.sgml
index 6a53fc0680..da6b50f99e 100644
--- a/docs/faq/Samba-Server-FAQ.sgml
+++ b/docs/faq/Samba-Server-FAQ.sgml
@@ -337,7 +337,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<htmlurl url="mailto:samba-bugs@anu.edu.au" name="samba-bugs@anu.edu.au"> !
+<htmlurl url="mailto:samba@samba.org" name="samba@samba.org"> !
 
 Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.
@@ -383,7 +383,7 @@ as a strictly temporary solution.
 In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know via email at <htmlurl url="mailto:samba-bugs@anu.edu.au" name="samba-bugs@anu.edu.au">.
+Tridgell know via email at <htmlurl url="mailto:samba@samba.org" name="samba@samba.org">.
 
 <sect1>My "server string" doesn't seem to be recognised<p><label id="bad_server_string">
 OR My client reports the default setting, eg. "Samba 1.9.15p4", instead
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>
diff --git a/docs/faq/Samba-meta-FAQ.sgml b/docs/faq/Samba-meta-FAQ.sgml
index 79b587a49f..377d81663d 100644
--- a/docs/faq/Samba-meta-FAQ.sgml
+++ b/docs/faq/Samba-meta-FAQ.sgml
@@ -378,14 +378,14 @@ that an explanation can be incorporated into the next version.
 If you make changes to the source code, <em>please</em> 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 <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba@samba.org" name="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 from
+standard diff format. As an example, samba@samba.org received this patch from
 someone:
 
 382a
@@ -441,7 +441,7 @@ Some extras :
 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.
 
 Examples of things <em>not</em> to send to samba-urgent include problems
diff --git a/docs/faq/Samba-meta-FAQ.txt b/docs/faq/Samba-meta-FAQ.txt
index fb4887e097..01fc8d6ccf 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
diff --git a/docs/faq/sambafaq-1.html b/docs/faq/sambafaq-1.html
index d91ea24f2e..dde0784099 100644
--- a/docs/faq/sambafaq-1.html
+++ b/docs/faq/sambafaq-1.html
@@ -353,7 +353,7 @@ I can incorporate it in 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>
 
 
diff --git a/docs/faq/sambafaq-2.html b/docs/faq/sambafaq-2.html
index d78f5d627c..8978bc331c 100644
--- a/docs/faq/sambafaq-2.html
+++ b/docs/faq/sambafaq-2.html
@@ -118,7 +118,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A> !</P>
+<A HREF="mailto:samba@samba.org">samba@samba.org</A> !</P>
 <P>Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.</P>
 <P>For many clients (including Windows for Workgroups and Lan Manager),
@@ -168,7 +168,7 @@ as a strictly temporary solution.</P>
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
 Tridgell know via email at 
-<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>.</P>
+<A HREF="mailto:samba@samba.org">samba@samba.org</A>.</P>
 
 
 <H2><A NAME="ss2.9">2.9 My "server string" doesn't seem to be recognised</A></H2>
diff --git a/docs/faq/sambafaq-3.html b/docs/faq/sambafaq-3.html
index 995738bb53..d7e0c7abd2 100644
--- a/docs/faq/sambafaq-3.html
+++ b/docs/faq/sambafaq-3.html
@@ -292,7 +292,7 @@ in that dialog box.</P>
 
 this is effectively what older versions of Samba did, so if that
 worked for you then give it a go. If this does work then let us know via 
-<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>,
+<A HREF="mailto:samba@samba.org">samba@samba.org</A>,
 and we'll make it the default. Currently the default is a 0 length
 string.</P>
 
diff --git a/docs/faq/sambafaq.sgml b/docs/faq/sambafaq.sgml
index 4faf10a6a5..333ac55f67 100644
--- a/docs/faq/sambafaq.sgml
+++ b/docs/faq/sambafaq.sgml
@@ -300,7 +300,7 @@ I can incorporate it in the next version.
 If you make changes to the source code, _please_ 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 <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-patches@samba.org" name="samba-patches@samba.org">. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.
 
 <sect1> Pizza supply details <p> <label id="pizza">
@@ -412,7 +412,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org"> !
+<htmlurl url="mailto:samba@samba.org" name="samba@samba.org"> !
 
 Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.
@@ -459,7 +459,7 @@ as a strictly temporary solution.
 In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know via email at <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">.
+Tridgell know via email at <htmlurl url="mailto:samba@samba.org" name="samba@samba.org">.
 
 <sect1>My "server string" doesn't seem to be recognised<p><label id="bad_server_string">
 OR My client reports the default setting, eg. "Samba 1.9.15p4", instead
@@ -755,7 +755,7 @@ You could also try setting the driver to NULL like this:
      printer driver = NULL
 </verb></tscreen>
 this is effectively what older versions of Samba did, so if that
-worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">,
+worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba@samba.org" name="samba@samba.org">,
 and we'll make it the default. Currently the default is a 0 length
 string.
 
diff --git a/docs/faq/sambafaq.txt b/docs/faq/sambafaq.txt
index f16916b29e..e629e8ad87 100644
--- a/docs/faq/sambafaq.txt
+++ b/docs/faq/sambafaq.txt
@@ -497,7 +497,7 @@
   If you make changes to the source code, _please_ 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
+  patches to samba@samba.org. Do not send patches to Andrew
   Tridgell or any other individual, they may be lost if you do.
 
 
@@ -646,7 +646,7 @@
   machines (such as users of smbclient under Unix). Having said that,
   several developers are working hard on building it in to the next
   major version of Samba. If you can contribute, send a message to
-  samba-bugs@samba.org !
+  samba@samba.org !
 
   Seeing this message should not affect your ability to mount redirected
   disks and printers, which is really what all this is about.
@@ -703,7 +703,7 @@
   In earlier Samba versions there were some difficulties with the very
   latest Microsoft products, particularly Excel 5 and Word for Windows
   6. These should have all been solved. If not then please let Andrew
-  Tridgell know via email at samba-bugs@samba.org.
+  Tridgell know via email at samba@samba.org.
 
 
   22..99..  MMyy ""sseerrvveerr ssttrriinngg"" ddooeessnn''tt sseeeemm ttoo bbee rreeccooggnniisseedd
@@ -1050,7 +1050,7 @@
 
   this is effectively what older versions of Samba did, so if that
   worked for you then give it a go. If this does work then let us know
-  via samba-bugs@samba.org, and we'll make it the default. Cur-
+  via samba@samba.org, and we'll make it the default. Cur-
   rently the default is a 0 length string.