From 3e1df2acf5aed26adf85028956063353375384ca Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@php.net>
Date: Fri, 9 Sep 2005 04:10:15 +0000
Subject: [PATCH] tweak. livedocs won't let me view the those two function
 pages, so I hope they are ok.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@195556 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../functions/PDO-sqliteCreateAggregate.xml   |  3 ++-
 .../functions/PDO-sqliteCreateFunction.xml    |  3 ++-
 reference/pdo_sqlite/reference.xml            | 26 ++++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml b/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
index 422d39ae73..0713dca42b 100644
--- a/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
+++ b/reference/pdo_sqlite/functions/PDO-sqliteCreateAggregate.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.PDO-sqliteCreateAggregate">
    <refnamediv>
     <refname>PDO::sqliteCreateAggregate</refname>
@@ -174,6 +174,7 @@ var_dump($db->query('SELECT max_len(a) from strings')->fetchAll());
       <member><function>PDO::sqliteCreateFunction</function></member>
    </simplelist>
   </para>
+ </refsect1>
 
   </refentry>
 
diff --git a/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml b/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
index a37cf0d27a..635ba18a40 100644
--- a/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
+++ b/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.PDO-sqliteCreateFunction">
    <refnamediv>
     <refname>PDO::sqliteCreateFunction</refname>
@@ -142,6 +142,7 @@ $rows = $db->query("SELECT php('md5', filename) from files")->fetchAll();
       <member><function>PDO::sqliteCreateAggregate</function></member>
    </simplelist>
   </para>
+ </refsect1>
 
   </refentry>
 
diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml
index 8388acd2e4..5108148084 100644
--- a/reference/pdo_sqlite/reference.xml
+++ b/reference/pdo_sqlite/reference.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- Purpose: database.vendors -->
 <!-- Membership: bundled, pecl -->
 
@@ -13,7 +13,13 @@
     <para>
      &warn.experimental;
      PDO_SQLITE is a driver that implements the PHP Data Objects (PDO) interface
-     to enable access to SQLite 2 and SQLite 3 databases.
+     to enable access to SQLite 3 databases.
+    </para>
+    <para>
+     In PHP 5.1, the <link linkend="ref.sqlite">SQLite</link> extension also
+     provides a driver for SQLite 2 databases; while it is not technically a
+     part of the PDO_SQLITE driver, it behaves very similarly, so it is
+     documented alongside it.
     </para>
    </section>
   </partintro>
@@ -55,12 +61,18 @@
        <term>DSN prefix (SQLite 2)</term>
        <listitem>
         <para>
-         While the default and recommended SQLite version in PDO_SQLITE is
-         version 3, the driver also supports accessing and creating SQLite 2
-         databases. This enables you to access databases you may have created
+         The <link linkend="ref.sqlite">SQLite</link> extension in
+         PHP 5.1 provides a PDO driver that supports accessing and creating SQLite 2
+         databases.  This enables you to access databases you may have created
          with the <link linkend="ref.sqlite">SQLite</link> extension in
          previous versions of PHP.
         </para>
+        <note>
+         <para>
+          The sqlite2 driver is only available in PHP 5.1 if you have enabled
+          both PDO and ext/sqlite.  It is not currently available via PECL.
+         </para>
+        </note>
         <para>
          The DSN prefix for connecting to SQLite 2 databases is
          <userinput>sqlite2:</userinput>.
@@ -95,9 +107,9 @@
        SQLite databases:
        <programlisting><![CDATA[
 sqlite:/opt/databases/mydb.sq3
-sqlite:memory:
+sqlite::memory:
 sqlite2:/opt/databases/mydb.sq2
-sqlite2:memory:
+sqlite2::memory:
 ]]>
        </programlisting>
       </para>