Recompile the docs from the XML source in anticipation of the 2.17.4 release.

1 files changed, 98 insertions, 27 deletions

diff --git a/docs/html/faq.html b/docs/html/faq.html
index 606519724..a45b7b7e3 100644
--- a/docs/html/faq.html
+++ b/docs/html/faq.html
@@ -138,12 +138,24 @@ HREF="faq.html#faq-general-mysql"
 ><DT
 >A.1.9. <A
 HREF="faq.html#faq-general-bonsaitools"
->&#13;	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
-	    "/usr/bin/perl" or something else?
+>&#13;	    What is <TT
+CLASS="filename"
+>/usr/bonsaitools/bin/perl</TT
+>?
 	  </A
 ></DT
 ><DT
 >A.1.10. <A
+HREF="faq.html#faq-general-perlpath"
+>&#13;            My perl is not located at <TT
+CLASS="filename"
+>/usr/bin/perl</TT
+>, is
+            there an easy way to change it everywhere it needs to be changed?
+          </A
+></DT
+><DT
+>A.1.11. <A
 HREF="faq.html#faq-general-cookie"
 >&#13;	    Is there an easy way to change the Bugzilla cookie name?
 	  </A
@@ -925,8 +937,10 @@ NAME="faq-general-bonsaitools"
 ><B
 >A.1.9. </B
 >
-	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
-	    "/usr/bin/perl" or something else?
+	    What is <TT
+CLASS="filename"
+>/usr/bonsaitools/bin/perl</TT
+>?
 	  </P
 ></DIV
 ><DIV
@@ -935,16 +949,72 @@ CLASS="answer"
 ><B
 > </B
 >
-	     Mozilla.org uses /usr/bonsaitools/bin/perl, because originally
-       Terry wanted a place to put a version of Perl and other tools 
-       that was strictly under his control. 
-    </P
+            Bugzilla used to have the path to perl on the shebang line set to
+            <TT
+CLASS="filename"
+>/usr/bonsaitools/bin/perl</TT
+> because when
+            Terry first started writing the code for mozilla.org he needed a
+            version of Perl and other tools that were completely under his
+            control.  This location was abandoned for the 2.18 release in favor
+            of the more sensible <TT
+CLASS="filename"
+>/usr/bin/perl</TT
+>.  If you
+            installed an older verion of Bugzilla and created the symlink we
+            suggested, you can remove it now (provided that you don't have
+            anything else, such as Bonsai, using it and you don't intend to
+            reinstall an older version of Bugzilla).
+          </P
+></DIV
+></DIV
+><DIV
+CLASS="qandaentry"
+><DIV
+CLASS="question"
 ><P
->&#13;		  We always recommend that, if possible, you keep the path
-		  as /usr/bonsaitools/bin/perl, and simply add symlink.  
-      This will make upgrading
-		  your Bugzilla much easier in the future.
-		</P
+><A
+NAME="faq-general-perlpath"
+></A
+><B
+>A.1.10. </B
+>
+            My perl is not located at <TT
+CLASS="filename"
+>/usr/bin/perl</TT
+>, is
+            there an easy way to change it everywhere it needs to be changed?
+          </P
+></DIV
+><DIV
+CLASS="answer"
+><P
+><B
+> </B
+>
+            Yes, the following bit of perl magic will change all the shebang
+            lines.  Be sure to change <TT
+CLASS="filename"
+>/usr/local/bin/perl</TT
+>
+            to your path to the perl binary.
+          </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><FONT
+COLOR="#000000"
+><PRE
+CLASS="programlisting"
+>&#13;perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
+          </PRE
+></FONT
+></TD
+></TR
+></TABLE
 ></DIV
 ></DIV
 ><DIV
@@ -956,7 +1026,7 @@ CLASS="question"
 NAME="faq-general-cookie"
 ></A
 ><B
->A.1.10. </B
+>A.1.11. </B
 >
 	    Is there an easy way to change the Bugzilla cookie name?
 	  </P
@@ -1370,12 +1440,12 @@ CLASS="computeroutput"
 CLASS="filename"
 >importxml.pl</TT
 > which is intended to be
-            used for importing the data generated by <TT
+            used for importing the data generated by the XML ctype of
+            <TT
 CLASS="filename"
->xml.cgi</TT
->
-            in association with bug moving. Any other use is left as an
-            exercise for the user.
+>show_bug.cgi</TT
+> in association with bug moving.
+            Any other use is left as an exercise for the user.
           </P
 ><P
 >&#13;            There are also scripts included in the <TT
@@ -1411,9 +1481,9 @@ CLASS="answer"
 >
             Yes.  For more information including available translated templates,
             see <A
-HREF="http://www.bugzilla.org/download.html"
+HREF="http://www.bugzilla.org/download.html#localizations"
 TARGET="_top"
->http://www.bugzilla.org/download.html</A
+>http://www.bugzilla.org/download.html#localizations</A
 >.
             The admin interfaces are still not included in these translated
             templates and is therefore still English only.  Also, there may be
@@ -1833,13 +1903,14 @@ CLASS="answer"
 > </B
 >
 	    Try Klaas Freitag's excellent patch for "whineatassigned" functionality.
-	    You can find it at<A
-HREF=" http://bugzilla.mozilla.org/show_bug.cgi?id=6679"
+	    You can find it at <A
+HREF="http://bugzilla.mozilla.org/show_bug.cgi?id=6679"
 TARGET="_top"
->&#13;	      http://bugzilla.mozilla.org/show_bug.cgi?id=6679</A
+>http://bugzilla.mozilla.org/show_bug.cgi?id=6679</A
 >. This
 	    patch is against an older version of Bugzilla, so you must apply
 	    the diffs manually.
+            
 	  </P
 ></DIV
 ></DIV
@@ -1867,7 +1938,7 @@ CLASS="answer"
 	    You can call bug_email.pl directly from your aliases file, with
 	    an entry like this:
 	    <A
-NAME="AEN1894"
+NAME="AEN1886"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2311,7 +2382,7 @@ CLASS="answer"
 ><P
 >&#13;	    Microsoft has some advice on this matter, as well:
 	    <A
-NAME="AEN1977"
+NAME="AEN1969"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2670,7 +2741,7 @@ TARGET="_top"
 	    This list includes bugs for the 2.18 release that have already
 	    been fixed and checked into CVS.  Please consult the
 	    <A
-HREF="http://www.mozilla.org/projects/bugzilla/"
+HREF="http://www.bugzilla.org/"
 TARGET="_top"
 >&#13;	      Bugzilla Project Page</A
 > for details on how to