From c4ef7ac3aea8d5610e394fca350bd077f9d39d39 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <lpsolit%gmail.com>
Date: Sun, 17 Feb 2008 14:41:54 +0000
Subject: [PATCH] Doc for bug 135812: Add a 'mailfrom' parameter to unify
 bugmail originating address - Patch by Sam Folk-Williams
 <sam.folkwilliams@gmail.com> r=LpSolit

---
 webtools/bugzilla/docs/xml/administration.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/webtools/bugzilla/docs/xml/administration.xml b/webtools/bugzilla/docs/xml/administration.xml
index f4808e9e55d..4d6f5f0ad27 100644
--- a/webtools/bugzilla/docs/xml/administration.xml
+++ b/webtools/bugzilla/docs/xml/administration.xml
@@ -797,6 +797,20 @@
             </listitem>
           </varlistentry>
 
+          <varlistentry>
+            <term>
+              mailfrom
+            </term>
+            <listitem>
+              <para>
+                This is the email address that will appear in the "From" field
+                of all emails sent by this Bugzilla installation. Some email
+                servers require mail to be from a valid email address, therefore
+                it is recommended to choose a valid email address here.
+              </para>
+            </listitem>
+          </varlistentry>
+
           <varlistentry>
             <term>
               sendmailnow