From fdbf1ce78ef54b10efbd53c888da43f1ea734fb7 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Fri, 4 Apr 2008 11:47:44 +0000
Subject: Documentation patch for bug 213262: add instructions on how to get
 sendmail to work with Bugzilla on Mac OS X; patch by A. Karl Kornel
 <karl@kornel.name>, r=colin.ogilvie, r=justdave.

---
 docs/en/xml/administration.xml | 55 +++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 20 deletions(-)

(limited to 'docs/en/xml/administration.xml')

diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index 104403013..cf7d707c4 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -80,6 +80,22 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          maildeliverymethod
+        </term>
+        <listitem>
+          <para>
+            This is used to specify how email is sent, or if it is sent at 
+            all.  There are several options included for different MTAs, 
+            along with two additional options that disable email sending.  
+            "testfile" does not send mail, but instead saves it in 
+            <filename>data/mailer.testfile</filename> for later review.  
+            "none" disables email sending entirely.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>
           shadowdb
@@ -152,25 +168,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>
-          passwordmail
-        </term>
-        <listitem>
-          <para>
-            Every time a user creates an account, the text of this parameter
-            (with substitutions) is sent to the new user along with their
-            password message.
-          </para>
-
-          <para>
-            Add any text you wish to the "passwordmail" parameter box. For
-            instance, many people choose to use this box to give a quick 
-            training blurb about how to use Bugzilla at your site.
-          </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term>
           movebugs
@@ -294,6 +291,22 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          sendmailnow
+        </term>
+        <listitem>
+          <para>
+            When Bugzilla is using Sendmail older than 8.12, turning this option
+            off will improve performance by not waiting for Sendmail to actually
+            send mail.  If Sendmail 8.12 or later is being used, there is 
+            nothing to gain by turning this off.  If another MTA is being used, 
+            such as Postfix, then this option *must* be turned on (even if you 
+            are using the fake sendmail executable that Postfix provides).
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </section>
 
@@ -1295,7 +1308,9 @@
              resulted in a user acquiring permanent membership in a group.
              To remove a user from a group the user was in due to a regular
              expression in version 2.16 or earlier, the user must be explicitly
-             removed from the group.</para>
+             removed from the group. This can easily be done by pressing
+             buttons named 'Remove Memberships' or 'Remove Memberships
+             included in regular expression' under the table.</para>
            </note>
            <warning>
              <para>If specifying a domain in the regexp, make sure you end
-- 
cgit v1.2.3-24-g4f1b