update ml etiquette

diff --git a/ml-etiquette.html b/ml-etiquette.html
index 6273fa163fe33d12c233d54674f54f80ca80a0c8..d9e2258d2bd8f2d53e4869192c5e2ad015841510 100755 (executable)
--- a/ml-etiquette.html
+++ b/ml-etiquette.html
@@ -39,13 +39,6 @@ editing policy</a>.</li>
       that is working quite well thank you very much but occasionally
       unwanted messages slip through.  Deal with it.</li>
 
-      <li><a name="whiny-frisbie">If</a> you use the Internet,
-      and especially if you post to a public mailing list, you may
-      receive spam or viruses.  You should either use some kind of <a
-      href="http://spamassassin.org/">filtering</a>, or post from a <a
-      href="http://spamgourmet.com/">disposable address</a>.  Do
-      <b>not</b> whine about it on the list.</li>
-
   <li>Never say "Me too." It doesn't help anyone solve the problem.
   Instead, if you ARE having the same problem, give more information.
   Have you seen something that the other writer hasn't mentioned, which
@@ -58,9 +51,17 @@ editing policy</a>.</li>
   <li>Give as much *relevant* information as possible such as Samba release
   number, OS, kernel version, etc...</li>
 
-          <li><a href="docs/">RTFM</a>.
-            <a href="http://google.com/">Google</a>.
-            <a href="http://groups.google.com/groups?q=group%3Amailing.unix.samba*">groups.google.com</a>.</li>
+  <li>Do not send test mails to the mailing lists, this annoys all the other
+  people on the list. Test mail senders risk being blacklisted otherwise.
+
+  <li><a href="docs/">RTFM</a>.
+  <a href="https://www.startpage.com/">Search the net</a> for
+  solutions before asking the mailing list.</li>
+
+  <li>Further generic collaboration guidelines of the Samba Team are 
+  written down in the
+  <a href="https://wiki.samba.org/index.php/How_to_do_Samba:_Nicely">Wiki</a>.
+  </li>
 </ol>
 
 <!--#include virtual="/samba/footer.html" -->