Misc. updates to the FAQ.

2 files changed, 22 insertions, 20 deletions

diff --git a/docs/sgml/faq.sgml b/docs/sgml/faq.sgml
index d0f78b75a..ef5f23123 100644
--- a/docs/sgml/faq.sgml
+++ b/docs/sgml/faq.sgml
@@ -471,9 +471,9 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
           <para>
             Currently the only script included with Bugzilla that can import
             data is <filename>importxml.pl</filename> which is intended to be
-            used for importing the data generated by <filename>xml.cgi</filename>
-            in association with bug moving. Any other use is left as an
-            exercise for the user.
+            used for importing the data generated by the XML ctype of
+            <filename>show_bug.cgi</filename> in association with bug moving.
+            Any other use is left as an exercise for the user.
           </para>
           <para>
             There are also scripts included in the <filename>contrib/</filename>
@@ -495,7 +495,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  <para>
             Yes.  For more information including available translated templates,
             see <ulink
-            url="http://www.bugzilla.org/download.html">http://www.bugzilla.org/download.html</ulink>.
+            url="http://www.bugzilla.org/download.html#localizations"/>.
             The admin interfaces are still not included in these translated
             templates and is therefore still English only.  Also, there may be
             issues with the charset not being declared.  See <ulink
@@ -742,10 +742,11 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    Try Klaas Freitag's excellent patch for "whineatassigned" functionality.
-	    You can find it at<ulink url=" http://bugzilla.mozilla.org/show_bug.cgi?id=6679">
-	      http://bugzilla.mozilla.org/show_bug.cgi?id=6679</ulink>. This
+	    You can find it at <ulink
+            url="http://bugzilla.mozilla.org/show_bug.cgi?id=6679"/>. This
 	    patch is against an older version of Bugzilla, so you must apply
 	    the diffs manually.
+            <!-- TODO: Mention Joel's "Fine Whine" patch" -->
 	  </para>
 	</answer>
       </qandaentry>
@@ -1205,11 +1206,11 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    enhancement for Bugzilla.
 	  </para>
 	  <para>
-	    You can view bugs marked for 2.18 release
-	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Bugzilla&amp;target_milestone=Bugzilla+2.18">here</ulink>.
-	    This list includes bugs for the 2.18 release that have already
+	    You can view bugs marked for &bz-nextver; release
+	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Bugzilla&amp;target_milestone=Bugzilla+&bz-nextver;">here</ulink>.
+	    This list includes bugs for the &bz-nextver; release that have already
 	    been fixed and checked into CVS.  Please consult the
-	    <ulink url="http://www.mozilla.org/projects/bugzilla/">
+	    <ulink url="http://www.bugzilla.org/">
 	      Bugzilla Project Page</ulink> for details on how to
 	    check current sources out of CVS so you can have these
 	    bug fixes early!
diff --git a/docs/xml/faq.xml b/docs/xml/faq.xml
index d0f78b75a..ef5f23123 100644
--- a/docs/xml/faq.xml
+++ b/docs/xml/faq.xml
@@ -471,9 +471,9 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
           <para>
             Currently the only script included with Bugzilla that can import
             data is <filename>importxml.pl</filename> which is intended to be
-            used for importing the data generated by <filename>xml.cgi</filename>
-            in association with bug moving. Any other use is left as an
-            exercise for the user.
+            used for importing the data generated by the XML ctype of
+            <filename>show_bug.cgi</filename> in association with bug moving.
+            Any other use is left as an exercise for the user.
           </para>
           <para>
             There are also scripts included in the <filename>contrib/</filename>
@@ -495,7 +495,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  <para>
             Yes.  For more information including available translated templates,
             see <ulink
-            url="http://www.bugzilla.org/download.html">http://www.bugzilla.org/download.html</ulink>.
+            url="http://www.bugzilla.org/download.html#localizations"/>.
             The admin interfaces are still not included in these translated
             templates and is therefore still English only.  Also, there may be
             issues with the charset not being declared.  See <ulink
@@ -742,10 +742,11 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    Try Klaas Freitag's excellent patch for "whineatassigned" functionality.
-	    You can find it at<ulink url=" http://bugzilla.mozilla.org/show_bug.cgi?id=6679">
-	      http://bugzilla.mozilla.org/show_bug.cgi?id=6679</ulink>. This
+	    You can find it at <ulink
+            url="http://bugzilla.mozilla.org/show_bug.cgi?id=6679"/>. This
 	    patch is against an older version of Bugzilla, so you must apply
 	    the diffs manually.
+            <!-- TODO: Mention Joel's "Fine Whine" patch" -->
 	  </para>
 	</answer>
       </qandaentry>
@@ -1205,11 +1206,11 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    enhancement for Bugzilla.
 	  </para>
 	  <para>
-	    You can view bugs marked for 2.18 release
-	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Bugzilla&amp;target_milestone=Bugzilla+2.18">here</ulink>.
-	    This list includes bugs for the 2.18 release that have already
+	    You can view bugs marked for &bz-nextver; release
+	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Bugzilla&amp;target_milestone=Bugzilla+&bz-nextver;">here</ulink>.
+	    This list includes bugs for the &bz-nextver; release that have already
 	    been fixed and checked into CVS.  Please consult the
-	    <ulink url="http://www.mozilla.org/projects/bugzilla/">
+	    <ulink url="http://www.bugzilla.org/">
 	      Bugzilla Project Page</ulink> for details on how to
 	    check current sources out of CVS so you can have these
 	    bug fixes early!