From bd73dd5de63f9d43d423c33f48725c8d52d02f6b Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 3 Dec 2014 23:11:25 +0000
Subject: [PATCH] Improvements from dylan.

git-svn-id: svn://10.0.0.236/trunk@265760 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev             |  2 +-
 mozilla/webtools/bugzilla/.gitrev             |  2 +-
 .../docs/en/rst/installing/windows.rst        | 65 +++++++++++++++----
 3 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 62072a7bc28..1e1de6412be 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9285
\ No newline at end of file
+9286
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 76a519405ea..045b5857501 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-8463a3c10b4d56476c61740b7088d36d3f0b55b6
\ No newline at end of file
+0a026e728b0525e489a3ac5c10d594d6aef64c60
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/docs/en/rst/installing/windows.rst b/mozilla/webtools/bugzilla/docs/en/rst/installing/windows.rst
index 30c0b25a2d6..e70483daf8c 100644
--- a/mozilla/webtools/bugzilla/docs/en/rst/installing/windows.rst
+++ b/mozilla/webtools/bugzilla/docs/en/rst/installing/windows.rst
@@ -26,12 +26,6 @@ recommended to install Perl into a directory containing a space, such as
 Once the install has completed, log out and log in again to pick up the
 changes to the ``PATH`` environment variable.
 
-.. note:: These instructions are for 32-bit versions of Windows. If you are
-   using a 64-bit version of Windows, you will need to install 32-bit
-   Perl in order to install the 32-bit modules as described below.
-
-.. todo:: Is this still true?
-
 .. _windows-install-bzfiles:
 
 Bugzilla
@@ -72,24 +66,67 @@ Install the following modules with:
 
 :command:`ppm install <modulename>`
 
-* AppConfig
+* CGI.pm
+* Digest-SHA
 * TimeDate
+* DateTime
+* DateTime-TimeZone
 * DBI
-* DBD-mysql
 * Template-Toolkit
-* MailTools
+* Email-Sender
+* Email-MIME
+* URI
+* List-MoreUtils
+* Math-Random-ISAAC
+* File-Slurp
+* JSON-XS
+* Win32
+* Win32-API
+
+The following modules enable various optional Bugzilla features; try and
+install them, but don't worry too much to begin with if you can't get them
+installed:
+
 * GD
 * Chart
+* Template-GD
+* GDTextUtil
 * GDGraph
+* MIME-tools
+* libwww-perl
+* XML-Twig
 * PatchReader
-* Net-LDAP-Express (required only if you want to do LDAP authentication)
+* perl-ldap
+* Authen-SASL
+* Net-SMTP-SSL
+* RadiusPerl
+* SOAP-Lite
+* XMLRPC-Lite
+* JSON-RPC
+* Test-Taint
+* HTML-Parser
+* HTML-Scrubber
+* Encode
+* Encode-Detect
+* Email-Reply
+* HTML-FormatText-WithLinks
+* TheSchwartz
+* Daemon-Generic
+* mod_perl
+* Apache-SizeLimit
+* File-MimeInfo
+* IO-stringy
+* Cache-Memcached
+* Text-Markdown
+* File-Copy-Recursive
+* GraphViz
 
-.. todo:: Is this list current and complete?
+.. warning:: These lists have been extracted from Bugzilla's source code and
+             have not been tested. Please let us know if you find errors in it
+             of any sort.
 
 .. note:: The :file:`install-module.pl` script doesn't work with ActivePerl
-   on Windows. 
-
-.. todo:: Is this still true?
+   on Windows.
 
 .. _windows-config-webserver: