diff --git a/mozilla/webtools/bugzilla/docs/xml/administration.xml b/mozilla/webtools/bugzilla/docs/xml/administration.xml
index 93570212958..cf7d707c4e8 100644
--- a/mozilla/webtools/bugzilla/docs/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/administration.xml
@@ -291,6 +291,22 @@
+
+
+ sendmailnow
+
+
+
+ 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).
+
+
+
+
diff --git a/mozilla/webtools/bugzilla/docs/xml/installation.xml b/mozilla/webtools/bugzilla/docs/xml/installation.xml
index 9012e164618..dcaa76f32d5 100644
--- a/mozilla/webtools/bugzilla/docs/xml/installation.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/installation.xml
@@ -1,5 +1,5 @@
-
+
Installing Bugzilla
@@ -1638,67 +1638,91 @@ C:\perl> ppm install <module name>
<productname>Mac OS X</productname>
- Apple did not include the GD library with Mac OS X. Bugzilla
- needs this for bug graphs.
+ Making Bugzilla work on Mac OS X requires the following
+ adjustments.
- You can install it using a program called
- Fink, which is similar in nature to the CPAN installer, but installs
- common GNU utilities. Fink is available from
- .
+
+ Sendmail
- Follow the instructions for setting up Fink. Once it's installed,
- you'll want to use it to install the gd2 package.
-
+ In Mac OS X 10.3 and later,
+ Postfix
+ is used as the built-in email server. Postfix provides an executable
+ that mimics sendmail enough to fool Bugzilla, as long as Bugzilla can
+ find it.
- It will prompt you for a number of dependencies, type 'y' and hit
- enter to install all of the dependencies and then watch it work. You will
- then be able to use CPAN to
- install the GD Perl module.
-
+ As of version 2.20, Bugzilla will be able to find the fake
+ sendmail executable without any assistance. However, you will have
+ to turn on the sendmailnow parameter before you do anything that would
+ result in email being sent. For more information, see the description
+ of the sendmailnow parameter in .
-
- To prevent creating conflicts with the software that Apple
- installs by default, Fink creates its own directory tree at
- /sw where it installs most of
- the software that it installs. This means your libraries and headers
- will be at /sw/lib and
- /sw/include instead of
- /usr/lib and
- /usr/include. When the
- Perl module config script asks where your libgd
- is, be sure to tell it
- /sw/lib.
+
+
+
+ Libraries & Perl Modules on Mac OS X
+
+ Apple did not include the GD library with Mac OS X. Bugzilla
+ needs this for bug graphs.
+
+ You can install it using a program called
+ Fink, which is similar in nature to the CPAN installer, but installs
+ common GNU utilities. Fink is available from
+ .
+
+ Follow the instructions for setting up Fink. Once it's installed,
+ you'll want to use it to install the gd2 package.
-
- Also available via Fink is expat. After using
- fink to install the expat package you will be able to install
- XML::Parser using CPAN. There is one caveat. Unlike recent versions of
- the GD module, XML::Parser doesn't prompt for the location of the
- required libraries. When using CPAN, you will need to use the following
- command sequence:
-
+ It will prompt you for a number of dependencies, type 'y' and hit
+ enter to install all of the dependencies and then watch it work. You will
+ then be able to use CPAN to
+ install the GD Perl module.
+
-
+
+ To prevent creating conflicts with the software that Apple
+ installs by default, Fink creates its own directory tree at
+ /sw where it installs most of
+ the software that it installs. This means your libraries and headers
+ will be at /sw/lib and
+ /sw/include instead of
+ /usr/lib and
+ /usr/include. When the
+ Perl module config script asks where your libgd
+ is, be sure to tell it
+ /sw/lib.
+
+
+
+ Also available via Fink is expat. After using
+ fink to install the expat package you will be able to install
+ XML::Parser using CPAN. There is one caveat. Unlike recent versions of
+ the GD module, XML::Parser doesn't prompt for the location of the
+ required libraries. When using CPAN, you will need to use the following
+ command sequence:
+
+
+
# perl -MCPAN -e'look XML::Parser'
# perl Makefile.PL EXPATLIBPATH=/sw/lib EXPATINCPATH=/sw/include
# make; make test; make install
# exit
-
-
-
- The look command will download the module and spawn a
- new shell with the extracted files as the current working directory.
- The exit command will return you to your original shell.
-
-
-
- You should watch the output from these make commands,
- especially make test
as errors may prevent XML::Parser
- from functioning correctly with Bugzilla.
-
-
-
+
+
+
+ The look command will download the module and spawn a
+ new shell with the extracted files as the current working directory.
+ The exit command will return you to your original shell.
+
+
+
+ You should watch the output from these make commands,
+ especially make test
as errors may prevent
+ XML::Parser from functioning correctly with Bugzilla.
+
+
+
+