Bug 1107549 - split extension docs into User and Admin docs. r=dkl, a=glob.

4 files changed, 23 insertions, 4 deletions

diff --git a/docs/en/rst/administering/extensions.rst b/docs/en/rst/administering/extensions.rst
index 0d5a216af..2c54b8463 100644
--- a/docs/en/rst/administering/extensions.rst
+++ b/docs/en/rst/administering/extensions.rst
@@ -1,4 +1,4 @@
-.. _installed-extensions:
+.. _installed-extensions-admin:
 
 Installed Extensions
 ====================
@@ -15,4 +15,4 @@ last time you compiled the documentation):
    :maxdepth: 1
    :glob:
    
-   ../extensions/*
+   ../extensions/*/index-admin
diff --git a/docs/en/rst/api/index.rst b/docs/en/rst/api/index.rst
index 55c997a68..45055eba1 100644
--- a/docs/en/rst/api/index.rst
+++ b/docs/en/rst/api/index.rst
@@ -9,5 +9,5 @@ This Bugzilla installation has the following WebService APIs available
 .. toctree::
    :glob:
 
-   core/v*/index*
-   extensions/*/v*/index*
+   core/v*/index
+   ../extensions/*/api/v*/index
diff --git a/docs/en/rst/using/extensions.rst b/docs/en/rst/using/extensions.rst
new file mode 100644
index 000000000..28bae5be5
--- /dev/null
+++ b/docs/en/rst/using/extensions.rst
@@ -0,0 +1,18 @@
+.. _installed-extensions-user:
+
+Installed Extensions
+====================
+
+Bugzilla can be enhanced using extensions (see :ref:`extensions`). If an
+extension comes with documentation in the appropriate format, and you build
+your own copy of the Bugzilla documentation using :file:`makedocs.pl`, then
+the documentation for your installed extensions will show up here.
+
+Your Bugzilla installation has the following extensions available (as of the
+last time you compiled the documentation):
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   ../extensions/*/index-user
diff --git a/docs/en/rst/using/index.rst b/docs/en/rst/using/index.rst
index f336b3729..73aa707c3 100644
--- a/docs/en/rst/using/index.rst
+++ b/docs/en/rst/using/index.rst
@@ -15,4 +15,5 @@ User Guide
    reports-and-charts
    tips
    preferences
+   extensions