X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=doc%2Fintro.xml;h=465c95f7ea3317a89f9238724c6d396d221969af;hp=7b7dec07c67adb0159fc335995a933898c9bffa9;hb=fd2493718d0e1114fcbe3dd578dab658ea383e81;hpb=a45ef0dbfaf9b1d726380561d8e4da9305a5895e

diff --git a/doc/intro.xml b/doc/intro.xml
index 7b7dec0..465c95f 100644
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -14,7 +14,7 @@
     linkend="gloss-sql">SQL</glossterm> databases.  A number of Common
     Lisp implementations and SQL databases are supported. The general
     structure of &clsql; is based on the &commonsql; package by
-    Xanalys.
+    LispWorks Ltd.
     </para>
   </sect1>
   
@@ -42,7 +42,8 @@
 	  <para>Optimized loading of integer and floating-point fields.</para>
 	</listitem>
 	<listitem>
-	  <para>Additional database backends: &odbc;, &aodbc;, and &sqlite;.</para>
+	  <para>Additional database backends: &odbc;, &aodbc;, &sqlite;
+	  and &sqlite3;.</para>
 	</listitem>
 	<listitem>
 	  <para>A compatibility layer for &cmucl; specific code.</para>
@@ -95,7 +96,7 @@
     <sect2>
       <title>&md5;</title>
       <para>&clsql;'s postgresql-socket interface uses Pierre Mai's 
-	<ulink url="ftp://clsql.b9.com/">md5</ulink>
+	<ulink url="http://files.b9.com/md5/">md5</ulink>
 	module.
       </para>       
     </sect2>
@@ -106,8 +107,8 @@
 	implementations of &uffi;. The following implementations are supported:
       </para>
       <itemizedlist mark="opencircle">
-	<listitem><para>&acl; v6.2 and 7.0b on Debian Linux x86 &
-	x86_64 & PowerPC, FreeBSD 4.5, and Microsoft Windows
+	<listitem><para>&acl; v6.2 and 7.0b on Debian Linux x86 &amp;
+	x86_64 &amp; PowerPC, FreeBSD 4.5, and Microsoft Windows
 	XP.</para></listitem>
 	<listitem><para>&lw; v4.3 on Debian Linux and Microsoft
 	Windows XP.</para></listitem>
@@ -131,7 +132,9 @@
 	<listitem><para>&postgresql; v7.4 with both direct API and TCP
 	socket connections.</para></listitem>
 	<listitem><para>&sqlite;.</para></listitem>
+	<listitem><para>&sqlite3;.</para></listitem>
 	<listitem><para>Direct &odbc; interface.</para></listitem>
+        <listitem><para>&oracle; OCI.</para></listitem>
 	<listitem><para>Allegro's DB interface (&aodbc;).</para></listitem>
       </itemizedlist>
     </sect2>
@@ -190,7 +193,7 @@
     </sect2>
     
     <sect2>
-      <title>Load &uffi;</title>
+      <title>Add &uffi; path</title>
       <para>
 	Unzip or untar the &uffi; distribution which creates a directory
 	for the &uffi; files. Add that directory to &asdf;'s <varname>asdf:*central-registry*</varname>.
@@ -200,12 +203,11 @@
 	directory.
 	<screen>
 (push #P"/usr/share/lisp/uffi/" asdf:*central-registry*)
-(asdf:operate 'asdf:load-op :uffi)
 	</screen>
       </para>
     </sect2>
    <sect2>
-     <title>Load &md5; module</title>
+     <title>Add &md5; path</title>
      <para>
        If you plan to use the clsql-postgresql-socket interface, you
        must load the md5 module.  Unzip or untar the cl-md5
@@ -217,13 +219,12 @@
        <filename>/usr/share/lisp/cl-md5/</filename> directory.
        <screen>
 (push #P"/usr/share/lisp/cl-md5/" asdf:*central-registry*)
-(asdf:operate 'asdf:load-op :md5)
        </screen>
      </para>
    </sect2>
    
    <sect2>
-     <title>Load &clsql; modules</title>
+     <title>Add &clsql; path and load module</title>
      <para>
        Unzip or untar the &clsql; distribution which creates a
        directory for the &clsql; files. Add that directory to &asdf;'s
@@ -231,28 +232,23 @@
        pushing the pathname of the directory onto this variable.  The
        following example code assumes the &clsql; files reside in the
        <filename>/usr/share/lisp/clsql/</filename> directory. You need
-       to load, at a minimum, the main <symbol>clsql</symbol> system
-       and at least one interface system. The below example show loading
-       all &clsql; systems.
+       to load the <symbol>clsql</symbol> system.
 
 	<screen>
 (push #P"/usr/share/lisp/clsql/" asdf:*central-registry*)
 (asdf:operate 'asdf:load-op 'clsql)                   ; main CLSQL package
-(asdf:operate 'asdf:load-op 'clsql-mysql)             ; MySQL interface
-(asdf:operate 'asdf:load-op 'clsql-postgresql)        ; PostgreSQL interface
-(asdf:operate 'asdf:load-op 'clsql-postgresql-socket) ; Socket PGSQL interface
-(asdf:operate 'asdf:load-op 'clsql-odbc)              ; ODBC interface
-(asdf:operate 'asdf:load-op 'clsql-sqlite)            ; SQLite interface
-(asdf:operate 'asdf:load-op 'clsql-aodbc)             ; Allegro ODBC interface
 	</screen>
       </para>
     </sect2>
     
     <sect2>
-      <title>Run test suite</title>
+      <title>Run test suite (optional)</title>
       <para>
-	After loading &clsql;, you can execute the test suite. A
-	configuration file named
+	The test suite can be executed using the &asdf;
+	<symbol>test-op</symbol> operator. If &clsql; has not been
+	loaded with <symbol>asdf:load-op</symbol>, the
+	<symbol>asdf:test-op</symbol> operator will automatically load
+	&clsql;. A configuration file named
 	<filename>.clsql-test.config</filename> must be created in
 	your home directory. There are instructures on the format of
 	that file in the <filename>tests/README</filename>. After