summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2008-04-04 13:48:17 +0200
committerlpsolit%gmail.com <>2008-04-04 13:48:17 +0200
commit5fa6960f3d6a100b9dd7d58d104cde2162bca95a (patch)
tree495d8f1e29d076ccc97bad8d1fe951505b58e578 /docs
parentd38e97ff9c587930f79fe31da33a38e5b97596ec (diff)
downloadbugzilla-5fa6960f3d6a100b9dd7d58d104cde2162bca95a.tar.gz
bugzilla-5fa6960f3d6a100b9dd7d58d104cde2162bca95a.tar.xz
Bug 272886: Move the FAQ from the Documentation to wiki.mozilla.org - Patch by Frédéric Buclin <LpSolit@gmail.com> r=colin
Diffstat (limited to 'docs')
-rw-r--r--docs/en/xml/Bugzilla-Guide.xml4
-rw-r--r--docs/en/xml/using.xml12
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 43547853f..6e89bcf1e 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/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/en/xml/using.xml b/docs/en/xml/using.xml
index ad59385bb..fa7d808f8 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/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">
@@ -243,7 +249,7 @@
<listitem>
<para>
<emphasis>Priority:</emphasis>
- The bug assignee uses this field to prioritise his or her bugs.
+ The bug assignee uses this field to prioritize his or her bugs.
It's a good idea not to change this on other people's bugs.</para>
</listitem>
@@ -1064,7 +1070,7 @@
<section id="userpreferences">
<title>User Preferences</title>
- <para>Once you have logged in, you can customise various aspects of
+ <para>Once you have logged in, you can customize various aspects of
Bugzilla via the "Edit prefs" link in the page footer.
The preferences are split into three tabs:</para>
@@ -1426,7 +1432,7 @@
</section>
- <section>
+ <section id="charts-new-series">
<title>Creating New Data Sets</title>
<para>