Massive rearrangement of the installation section. Hopefully it makes sense now.

1 files changed, 94 insertions, 54 deletions

diff --git a/docs/html/troubleshooting.html b/docs/html/troubleshooting.html
index 61a3624a7..5ea13534b 100644
--- a/docs/html/troubleshooting.html
+++ b/docs/html/troubleshooting.html
@@ -7,15 +7,15 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="The Bugzilla Guide - 2.17.5 
+TITLE="The Bugzilla Guide - 2.17.7 
     Development Release"
 HREF="index.html"><LINK
 REL="UP"
-TITLE="Installation"
-HREF="installation.html"><LINK
+TITLE="Installing Bugzilla"
+HREF="installing-bugzilla.html"><LINK
 REL="PREVIOUS"
-TITLE="Bugzilla Security"
-HREF="security.html"><LINK
+TITLE="OS-Specific Installation Notes"
+HREF="os-specific.html"><LINK
 REL="NEXT"
 TITLE="Administering Bugzilla"
 HREF="administration.html"></HEAD
@@ -38,7 +38,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->The Bugzilla Guide - 2.17.5 
+>The Bugzilla Guide - 2.17.7 
     Development Release</TH
 ></TR
 ><TR
@@ -47,7 +47,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="security.html"
+HREF="os-specific.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -55,7 +55,7 @@ ACCESSKEY="P"
 WIDTH="80%"
 ALIGN="center"
 VALIGN="bottom"
->Chapter 4. Installation</TD
+>Chapter 2. Installing Bugzilla</TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
@@ -77,19 +77,88 @@ CLASS="section"
 ><A
 NAME="troubleshooting"
 ></A
->4.6. Troubleshooting</H1
+>2.5. Troubleshooting</H1
 ><P
 >This section gives solutions to common Bugzilla installation
-    problems.
+    problems. If none of the section headings seems to match your
+    problem, read the general advice.
     </P
 ><DIV
 CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1206"
+NAME="general-advice"
 ></A
->4.6.1. Bundle::Bugzilla makes me upgrade to Perl 5.6.1</H2
+>2.5.1. General Advice</H2
+><P
+>&#13;        If you can't get <TT
+CLASS="filename"
+>checksetup.pl</TT
+> to run to 
+        completion, it normally explains what's wrong and how to fix it.
+        If you can't work it out, or if it's being uncommunicative, post 
+        the errors in the 
+        <A
+HREF="news://news.mozilla.org/netscape.public.mozilla.webtools"
+TARGET="_top"
+>netscape.public.mozilla.webtools</A
+>
+        newsgroup.
+      </P
+><P
+>&#13;        If you have made it all the way through 
+        <A
+HREF="installation.html"
+>Section 2.1</A
+> (Installation) and
+        <A
+HREF="configuration.html"
+>Section 2.2</A
+> (Configuration) but 
+        accessing the Bugzilla URL doesn't work,
+        the first thing to do is to check your webserver error log. For
+        Apache, this is often located at
+        <TT
+CLASS="filename"
+>/etc/logs/httpd/error_log</TT
+>. The error messages
+        you see may be self-explanatory enough to enable you to diagnose and
+        fix the problem. If not, see below for some commonly-encountered 
+        errors. If that doesn't help, post the errors to the newsgroup.
+      </P
+></DIV
+><DIV
+CLASS="section"
+><H2
+CLASS="section"
+><A
+NAME="AEN827"
+></A
+>2.5.2. I installed a Perl module, but 
+      <TT
+CLASS="filename"
+>checksetup.pl</TT
+> claims it's not installed!</H2
+><P
+>&#13;        You have two versions of Perl on your machine. You are installing
+        modules into one, and Bugzilla is using the other. Rerun the CPAN
+        commands (or manual compile) using the full path to Perl from the 
+        top of <TT
+CLASS="filename"
+>checksetup.pl</TT
+>. This will make sure you 
+        are installing the modules in the right place.
+      </P
+></DIV
+><DIV
+CLASS="section"
+><H2
+CLASS="section"
+><A
+NAME="AEN832"
+></A
+>2.5.3. Bundle::Bugzilla makes me upgrade to Perl 5.6.1</H2
 ><P
 >&#13;      Try executing <B
 CLASS="command"
@@ -112,9 +181,9 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1211"
+NAME="AEN837"
 ></A
->4.6.2. DBD::Sponge::db prepare failed</H2
+>2.5.4. DBD::Sponge::db prepare failed</H2
 ><P
 >&#13;        The following error message may appear due to a bug in DBD::mysql
         (over which the Bugzilla team have no control):
@@ -200,7 +269,7 @@ CLASS="section"
 ><A
 NAME="paranoid-security"
 ></A
->4.6.3. cannot chdir(/var/spool/mqueue)</H2
+>2.5.5. cannot chdir(/var/spool/mqueue)</H2
 ><P
 >If you are installing Bugzilla on SuSE Linux, or some other
       distributions with 
@@ -258,28 +327,15 @@ CLASS="section"
 ><A
 NAME="trouble-filetemp"
 ></A
->4.6.4. Your vendor has not defined Fcntl macro O_NOINHERIT</H2
+>2.5.6. Your vendor has not defined Fcntl macro O_NOINHERIT</H2
 ><P
 >This is caused by a bug in the version of
       <SPAN
 CLASS="productname"
 >File::Temp</SPAN
 > that is distributed with perl
-      5.6.0. Many minor variations of this error have been reported. Examples
-      can be found in <A
-HREF="troubleshooting.html#trouble-filetemp-errors"
->Figure 4-2</A
->.
+      5.6.0. Many minor variations of this error have been reported:
       </P
-><DIV
-CLASS="figure"
-><A
-NAME="trouble-filetemp-errors"
-></A
-><P
-><B
->Figure 4-2. Other File::Temp error messages</B
-></P
 ><TABLE
 BORDER="0"
 BGCOLOR="#E0E0E0"
@@ -290,42 +346,28 @@ WIDTH="100%"
 COLOR="#000000"
 ><PRE
 CLASS="programlisting"
->&#13;Your vendor has not defined Fcntl macro O_NOINHERIT, used 
+>Your vendor has not defined Fcntl macro O_NOINHERIT, used 
 at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 208.
 
 Your vendor has not defined Fcntl macro O_EXLOCK, used 
 at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 210.
 
 Your vendor has not defined Fcntl macro O_TEMPORARY, used 
-at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 233.
-        </PRE
+at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 233.</PRE
 ></FONT
 ></TD
 ></TR
 ></TABLE
-></DIV
 ><P
 >Numerous people have reported that upgrading to version 5.6.1
       or higher solved the problem for them. A less involved fix is to apply
-      the patch in <A
-HREF="troubleshooting.html#trouble-filetemp-patch"
->Figure 4-3</A
->. The patch is also
+      the following patch, which is also
       available as a <A
 HREF="../xml/filetemp.patch"
 TARGET="_top"
 >patch file</A
 >.
       </P
-><DIV
-CLASS="figure"
-><A
-NAME="trouble-filetemp-patch"
-></A
-><P
-><B
->Figure 4-3. Patch for File::Temp in Perl 5.6.0</B
-></P
 ><TABLE
 BORDER="0"
 BGCOLOR="#E0E0E0"
@@ -336,7 +378,7 @@ WIDTH="100%"
 COLOR="#000000"
 ><PRE
 CLASS="programlisting"
->&#13;--- File/Temp.pm.orig   Thu Feb  6 16:26:00 2003
+>--- File/Temp.pm.orig   Thu Feb  6 16:26:00 2003
 +++ File/Temp.pm        Thu Feb  6 16:26:23 2003
 @@ -205,6 +205,7 @@
      # eg CGI::Carp
@@ -353,15 +395,13 @@ CLASS="programlisting"
 +    local *CORE::GLOBAL::die = sub {};
      $bit = &#38;$func();
      1;
-   };
-        </PRE
+   };</PRE
 ></FONT
 ></TD
 ></TR
 ></TABLE
 ></DIV
 ></DIV
-></DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><HR
@@ -378,7 +418,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="security.html"
+HREF="os-specific.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -406,13 +446,13 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Bugzilla Security</TD
+>OS-Specific Installation Notes</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="installation.html"
+HREF="installing-bugzilla.html"
 ACCESSKEY="U"
 >Up</A
 ></TD