diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 07e4233b766d5d29b7ff35de467796fbf288ccb1..d24c238d0d94578405a9eea60813d67c49e090d4 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -31,44 +31,39 @@
For a devel release, simple bump bz-ver and bz-date
-->
-<!ENTITY bz-ver "2.22rc1">
-<!ENTITY bz-nextver "2.24">
-<!ENTITY bz-date "2006-02-20">
-<!ENTITY current-year "2006">
+<!ENTITY bz-ver "2.19.1">
+<!ENTITY bz-nextver "2.20">
+<!ENTITY bz-date "2004-10-24">
+<!ENTITY current-year "2004">
<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
<!ENTITY bz "http://www.bugzilla.org/">
<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&component=Documentation'>Bugzilla Documentation</ulink>">
<!ENTITY mysql "http://www.mysql.com/">
+<!ENTITY newest-perl-ver "5.8.3">
<!-- For minimum versions -->
-<!ENTITY min-mysql-ver "4.0.14">
-<!ENTITY min-pg-ver "7.3.x">
-<!ENTITY min-perl-ver "5.6.1">
+<!ENTITY min-mysql-ver "3.23.41">
+<!ENTITY min-perl-ver "5.6.0">
<!ENTITY min-perl-ver-win "5.8.1">
<!ENTITY min-template-ver "2.08">
<!ENTITY min-file-temp-ver "any">
<!ENTITY min-appconfig-ver "1.52">
<!ENTITY min-text-wrap-ver "2001.0131">
-<!ENTITY min-file-spec-ver "0.84">
+<!ENTITY min-file-spec-ver "0.82">
<!ENTITY min-data-dumper-ver "any">
-<!ENTITY min-dbd-mysql-ver "2.9003">
-<!ENTITY min-dbd-pg-ver "1.31">
-<!ENTITY min-dbi-ver "1.38">
+<!ENTITY min-dbd-mysql-ver "2.1010">
+<!ENTITY min-dbi-ver "1.36">
<!ENTITY min-date-format-ver "2.21">
<!ENTITY min-cgi-ver "2.93">
-<!ENTITY min-mail-mailer-ver "1.67">
-<!ENTITY min-mime-base64-ver "3.01">
-<!ENTITY min-mime-parser-ver "5.406">
-<!ENTITY min-storable-ver "any">
<!-- Optional modules -->
<!ENTITY min-gd-ver "1.20">
<!ENTITY min-gd-graph-ver "any">
<!ENTITY min-gd-text-align-ver "any">
<!ENTITY min-chart-base-ver "1.0">
<!ENTITY min-xml-parser-ver "any">
+<!ENTITY min-mime-parser-ver "any">
<!ENTITY min-patchreader-ver "0.9.4">
-<!ENTITY min-image-magick-ver "any">
]>
diff --git a/docs/en/xml/about.xml b/docs/en/xml/about.xml
index 6e502ee75235be316e04587bb4642c44c2bd716d..281b4633a5cb8d7c0e17ca918cb99d7802e91097 100644
--- a/docs/en/xml/about.xml
+++ b/docs/en/xml/about.xml
@@ -1,6 +1,6 @@
<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY conventions SYSTEM "conventions.xml"> ] > -->
-<!-- $Id: about.xml,v 1.21 2008/04/04 06:48:13 mozilla%colinogilvie.co.uk Exp $ -->
+<!-- $Id: about.xml,v 1.19 2008/04/04 06:48:11 jake%bugzilla.org Exp $ -->
<chapter id="about">
<title>About This Guide</title>
diff --git a/docs/en/xml/troubleshooting.xml b/docs/en/xml/troubleshooting.xml
index c4ed53b00bf5d44f24bd2d8088cd949f8195eb44..3500f5251fea7e7ef644ba28470d28d53b6e9f26 100644
--- a/docs/en/xml/troubleshooting.xml
+++ b/docs/en/xml/troubleshooting.xml
@@ -1,5 +1,5 @@
<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: troubleshooting.xml,v 1.8 2008/04/04 06:48:20 mozilla%colinogilvie.co.uk Exp $ -->
+<!-- $Id: troubleshooting.xml,v 1.4 2008/04/04 06:48:16 jake%bugzilla.org Exp $ -->
<appendix id="troubleshooting">
<title>Troubleshooting</title>
@@ -29,19 +29,6 @@
fix the problem. If not, see below for some commonly-encountered
errors. If that doesn't help, post the errors to the newsgroup.
</para>
-
- <para>
- Bugzilla can also log all user-based errors (and many code-based errors)
- that occur, without polluting the web server error log. To enable
- Bugzilla error logging, create a file that Bugzilla can write to, named
- <filename>errorlog</filename>, in the Bugzilla <filename>data</filename>
- directory. Errors will be logged as they occur, and will include the type
- of the error, the IP address and username (if available) of the user who
- triggered the error, and the values of all environment variables; if a
- form was being submitted, the data in the form will also be included.
- To disable error logging, delete or rename the
- <filename>errorlog</filename> file.
- </para>
</section>
<section id="trbl-testserver">
@@ -318,31 +305,6 @@ at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 233.</programlisting>
</section>
- <section id="trbl-passwd-encryption">
- <title>
- checksetup.pl reports "Client does not support authentication protocol
- requested by server..."
- </title>
-
- <para>
- This error is occurring because you are using the new password
- encryption that comes with MySQL 4.1, while your
- <filename>DBD::mysql</filename> module was compiled against an
- older version of MySQL. If you recompile <filename>DBD::mysql</filename>
- against the current MySQL libraries (or just obtain a newer version
- of this module) then the error may go away.
- </para>
-
- <para>
- If that does not fix the problem, or if you cannot recompile the
- existing module (e.g. you're running Windows) and/or don't want to
- replace it (e.g. you want to keep using a packaged version), then a
- workaround is available from the MySQL docs:
- <ulink url="http://dev.mysql.com/doc/mysql/en/Old_client.html"/>
- </para>
-
- </section>
-
</appendix>
<!-- Keep this comment at the end of the file