From c82b668f34f686ebc767057b9dc2dbdf64bb2b85 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 18 Sep 2011 23:46:18 +0000
Subject: [PATCH] Documentation for bug 337776: SQLite Support for Bugzilla
 r=glob

git-svn-id: svn://10.0.0.236/trunk@262896 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev             |  2 +-
 .../bugzilla/docs/en/xml/installation.xml     | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index eaeecd65495..c03d66113f3 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7962
\ No newline at end of file
+7963
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
index 61912f3a5f5..8a837823ce1 100644
--- a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
+++ b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
@@ -655,8 +655,8 @@
       <para>
         This section deals with configuring your database server for use
         with Bugzilla. Currently, MySQL (<xref linkend="mysql"/>),
-        PostgreSQL (<xref linkend="postgresql"/>) and Oracle (<xref linkend="oracle"/>)
-        are available.
+        PostgreSQL (<xref linkend="postgresql"/>), Oracle (<xref linkend="oracle"/>)
+        and SQLite (<xref linkend="sqlite"/>) are available.
       </para>
 
       <section id="database-schema">
@@ -939,7 +939,26 @@ max_allowed_packet=4M
           </para>
         </section>
       </section>
-    </section>  
+
+      <section id="sqlite">
+        <title>SQLite</title>
+
+        <caution>
+          <para>
+            Due to SQLite's <ulink url="http://sqlite.org/faq.html#q5">concurrency
+            limitations</ulink> we recommend SQLite only for small and development
+            Bugzilla installations.
+          </para>
+        </caution>
+
+        <para>
+          No special configuration is required to run Bugzilla on SQLite.
+          The database will be stored in <filename>data/db/$db_name</filename>,
+          where <literal>$db_name</literal> is the database name defined
+          in <filename>localconfig</filename>.
+        </para>
+      </section>
+    </section>
 
     <section>
       <title>checksetup.pl</title>