Merging new docs from 2.16 branch.

1 files changed, 11 insertions, 15 deletions

diff --git a/docs/html/database.html b/docs/html/database.html
index f9e826544..95bce503e 100644
--- a/docs/html/database.html
+++ b/docs/html/database.html
@@ -10,8 +10,8 @@ REL="HOME"
 TITLE="The Bugzilla Guide"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Software Download Links"
-HREF="downloadlinks.html"><LINK
+TITLE="The Bugzilla FAQ"
+HREF="faq.html"><LINK
 REL="NEXT"
 TITLE="Database Schema Chart"
 HREF="dbschema.html"></HEAD
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="downloadlinks.html"
+HREF="faq.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -69,7 +69,7 @@ WIDTH="100%"></DIV
 CLASS="appendix"
 ><H1
 ><A
-NAME="database">Appendix C. The Bugzilla Database</H1
+NAME="database">Appendix B. The Bugzilla Database</H1
 ><DIV
 CLASS="TOC"
 ><DL
@@ -78,20 +78,15 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
->C.1. <A
+>B.1. <A
 HREF="dbschema.html"
 >Database Schema Chart</A
 ></DT
 ><DT
->C.2. <A
+>B.2. <A
 HREF="dbdoc.html"
 >MySQL Bugzilla Database Introduction</A
 ></DT
-><DT
->C.3. <A
-HREF="granttables.html"
->MySQL Permissions &#38; Grant Tables</A
-></DT
 ></DL
 ></DIV
 ><DIV
@@ -115,8 +110,9 @@ ALT="Note"></TD
 ALIGN="LEFT"
 VALIGN="TOP"
 ><P
->&#13;      This document really needs to be updated with more fleshed out information about primary keys, interrelationships, and maybe some nifty tables to document dependencies.  Any takers?
-    </P
+>This document really needs to be updated with more fleshed out
+    information about primary keys, interrelationships, and maybe some nifty
+    tables to document dependencies. Any takers?</P
 ></TD
 ></TR
 ></TABLE
@@ -138,7 +134,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="downloadlinks.html"
+HREF="faq.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -166,7 +162,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Software Download Links</TD
+>The Bugzilla FAQ</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"