From 37a311f76c827e5cf00a7004738274ea21eb81a7 Mon Sep 17 00:00:00 2001
From: "mozilla%colinogilvie.co.uk" <>
Date: Fri, 30 Dec 2005 23:34:39 +0000
Subject: [PATCH] =?utf8?q?Bug=20302979:=20Bring=20mail=20sending=20docs=20?=
 =?utf8?q?up=20to=20date=20Patch=20by:=20Ville=20Skytt=C3=83=C2=A4ville.sk?=
 =?utf8?q?ytta@iki.fi>=20and=20victory=20<bmo@rsz.jp>;=20r=3Dcolin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 docs/xml/faq.xml      | 2 ++
 docs/xml/glossary.xml | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/xml/faq.xml b/docs/xml/faq.xml
index e2cfa980a8..816508839a 100644
--- a/docs/xml/faq.xml
+++ b/docs/xml/faq.xml
@@ -896,6 +896,8 @@ password=mypassword
         <answer>
           <para>
             To disable email, set the
+            <option>mail_delivery_method</option> parameter to
+            <literal>none</literal> (2.20 and later), or
             <programlisting>$enableSendMail</programlisting> parameter to '0'
             in either <filename>BugMail.pm</filename> (2.18 and later) or 
             <filename>processmail</filename> (up to 2.16.x).
diff --git a/docs/xml/glossary.xml b/docs/xml/glossary.xml
index 08ad45524d..79fb2baebd 100644
--- a/docs/xml/glossary.xml
+++ b/docs/xml/glossary.xml
@@ -269,10 +269,11 @@
 
       <glossdef>
         <para>A Message Transport Agent is used to control the flow of email
-        on a system. Many unix based systems use
-        <ulink url="http://www.sendmail.org">sendmail</ulink> which is what
-        Bugzilla expects to find by default at <filename>/usr/sbin/sendmail</filename>.
-        Many other MTA's will work, but they all require that the
+        on a system. The <ulink url="http://search.cpan.org/dist/MailTools/Mail/Mailer.pm">Mail::Mailer</ulink>
+        Perl module, which Bugzilla uses to send email, can be configured to
+        use many different underlying implementations for actually sending the
+        mail using the <option>mail_delivery_method</option> parameter.
+        Implementations other than <literal>sendmail</literal> require that the
         <option>sendmailnow</option> param be set to <literal>on</literal>.
         </para>
       </glossdef>
-- 
2.47.2