diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 01efca50358..854229122b2 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7683
\ No newline at end of file
+7684
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/docs/en/xml/administration.xml b/mozilla/webtools/bugzilla/docs/en/xml/administration.xml
index 52af464c00f..75d291dab8d 100644
--- a/mozilla/webtools/bugzilla/docs/en/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/docs/en/xml/administration.xml
@@ -764,6 +764,68 @@
+
+
+ smtpserver
+
+
+
+ This is the SMTP server address, if the mail_delivery_method
+ parameter is set to SMTP. Use "localhost" if you have a local MTA
+ running, otherwise use a remote SMTP server. Append ":" and the port
+ number, if a non-default port is needed.
+
+
+
+
+
+
+ smtp_username
+
+
+
+ Username to use for SASL authentication to the SMTP server. Leave
+ this parameter empty if your server does not require authentication.
+
+
+
+
+
+
+ smtp_password
+
+
+
+ Password to use for SASL authentication to the SMTP server. This
+ parameter will be ignored if the smtp_username
+ parameter is left empty.
+
+
+
+
+
+
+ smtp_ssl
+
+
+
+ Enable SSL support for connection to the SMTP server.
+
+
+
+
+
+
+ smtp_debug
+
+
+
+ This parameter allows you to enable detailed debugging output.
+ Log messages are printed the web server's error log.
+
+
+
+
whinedays