Bug 272886: Move the FAQ from the Documentation to wiki.mozilla.org - Patch by FrÃ...

diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index 43547853fd4ed5ae7134b73889ae9e1492eda9da..6e89bcf1e5a3dfc4418d53a6890f6acbedb3a2a5 100644 (file)
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -8,7 +8,6 @@
 <!ENTITY about SYSTEM "about.xml">
 <!ENTITY conventions SYSTEM "conventions.xml">
 <!ENTITY doc-index SYSTEM "index.xml">
-<!ENTITY faq SYSTEM "faq.xml">
 <!ENTITY gfdl SYSTEM "gfdl.xml">
 <!ENTITY glossary SYSTEM "glossary.xml">
 <!ENTITY installation SYSTEM "installation.xml">
@@ -135,9 +134,6 @@
 <!-- Customizing Bugzilla -->
 &customization;
 
-<!-- Appendix: The Frequently Asked Questions -->
-&faq;
-
 <!-- Appendix: Troubleshooting -->
 &troubleshooting;
 

diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index 1da23dfe44caadce6b4370c24a9540870b972bdf..fa7d808f8d09f57860aedd812ca6f7f1da5d2199 100644 (file)
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -12,6 +12,12 @@
     installations there will necessarily have all Bugzilla features enabled,
     and different installations run different versions, so some things may not
     quite work as this document describes.</para>
+
+    <para>
+      Frequently Asked Questions (FAQ) are available and answered on
+      <ulink url="http://wiki.mozilla.org/Bugzilla:FAQ">wiki.mozilla.org</ulink>.
+      They may cover some questions you have which are left unanswered.
+    </para>
   </section>
       
   <section id="myaccount">