r2750: *** empty log message ***

diff --git a/doc/clsql.pdf b/doc/clsql.pdf
index e5d68d45dc4bcc14b1df7ee1347264e36566e598..0e844b465032bb82a519bb3e50aa5c96f594d7b4 100644 (file)
Binary files a/doc/clsql.pdf and b/doc/clsql.pdf differ

diff --git a/doc/clsql.sgml b/doc/clsql.sgml
index 90117acd986528b724b149efdcf18333ac83706e..19e7e0f208d41641b5831910dd504e273a104c20 100644 (file)
--- a/doc/clsql.sgml
+++ b/doc/clsql.sgml
@@ -2,7 +2,9 @@
 
 <!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY defsystem "<application>Defsystem</application>">
+<!ENTITY asdf "<application>ASDF</application>">
 <!ENTITY clocc "<application><emphasis>CLOCC</emphasis></application>">
+<!ENTITY cclan "<application><emphasis>CCLAN</emphasis></application>">
 <!ENTITY uffi "<application><emphasis>UFFI</emphasis></application>">
 <!ENTITY ffi "<emphasis>FFI</emphasis>">
 <!ENTITY clsql "<application><emphasis>CLSQL</emphasis></application>">

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index 288b92626da972a274bb62721ec90bc2bf8890f6..1cd75365290160439bbbfeb5d31b7a12eb2a8169 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ

diff --git a/doc/intro.sgml b/doc/intro.sgml
index 5f0b76b81fb91fc1f413a324b83574d6d99b0d3e..8399857a428645f3379a39139259cc8ec283e04c 100644 (file)
--- a/doc/intro.sgml
+++ b/doc/intro.sgml
@@ -46,15 +46,9 @@ are:
 
     <sect2>
       <title>&defsystem;</title>
-      <para> &clsql; uses &defsystem to compile and load its
-components.  &defsystem; is included in the <ulink
-url="http://clocc.sourceforge.net"><citetitle>&clocc;</citetitle></ulink> collection. The
-version in the pre-packaged distribution is rather old and
-may not function well. The version in CVS tree tree works quite
-well. For convenience, a copy of the latest &defsystem; at the FTP
-<ulink
-url="ftp://ftp.med-info.com/pub/defsystem/"><citetitle>site</citetitle></ulink>
-of &clsql;.
+      <para> &clsql; uses &asdf; to compile and load its
+components.  &asdf; is included in the <ulink
+url="http://cclan.sourceforge.net"><citetitle>&cclan;</citetitle></ulink> collection.
       </para>
     </sect2>
 
@@ -145,14 +139,13 @@ in the root directory of &clsql; to build the libraries
       <title>Load &uffi;</title>
       <para>
        Unzip or untar the &uffi; distribution which creates a directory
-for the &uffi; files. Add that directory to Defsystem's <varname>mk:*central-registry*</varname>.
-You can do that by either pushing the pathname of the directory onto this variable, or
-use the new <function>add-registry-location</function> present in the newest versions of
-&defsystem;. The following example code assumes the &uffi; files reside in the
-<filename>/usr/local/src/lisp/uffi</filename> directory.
+for the &uffi; files. Add that directory to Defsystem's <varname>asdf:*central-registry*</varname>.
+You can do that by pushing the pathname of the directory onto this variable.
+ The following example code assumes the &uffi; files reside in the
+<filename>/usr/share/lisp/uffi/</filename> directory.
        <programlisting>
-(mk:add-registry-location #P"/usr/local/src/lisp/uffi")
-(mk:load-system :uffi)
+(push #P"/usr/share/lisp/uffi/" asdf:*central-repository*)
+(asdf:oos 'asdf:load-op :uffi)
         </programlisting>
       </para>
     </sect2>
@@ -161,19 +154,19 @@ use the new <function>add-registry-location</function> present in the newest ver
       <title>Load &clsql; modules</title>
       <para>
        Unzip or untar the &clsql; distribution which creates a directory
-for the &clsql; files. Add that directory to Defsystem's <varname>mk:*central-registry*</varname>.
-You can do that by either pushing the pathname of the directory onto this variable, or
-use the new <function>add-registry-location</function> present in the newest versions of
-&defsystem;. The following example code assumes the &clsql; files reside in the
-<filename>/usr/local/src/lisp/clsql</filename> directory. You need to load, at a minimum,
+for the &clsql; files. Add that directory to Defsystem's <varname>asdf:*central-registry*</varname>.
+You can do that by 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.
        <programlisting>
-(mk:add-registry-location #P"/usr/local/src/lisp/clsql")
-(mk:load-system :clsql)              ; main clsql package
-(mk:load-system :clsql-mysql)       ; MySQL interface
-(mk:load-system :clsql-postgresql)  ; PostgreSQL interface
-(mk:load-system :clsql-postgresql-socket) ; Socket PGSQL interface
-(mk:load-system :clsql-aodbc)       ; Allegro ODBC interface
+(push #P"/usr/share/lisp/clsql/" asdf:*central-repository*)
+(asdf:oos 'asdf:load-op :clsql-base)        ; base clsql package
+(asdf:oos 'asdf:load-op :clsql-mysql)       ; MySQL interface
+(asdf:oos 'asdf:load-op :clsql-postgresql)  ; PostgreSQL interface
+(asdf:oos 'asdf:load-op :clsql-postgresql-socket) ; Socket PGSQL interface
+(asdf:oos 'asdf:load-op :clsql-aodbc)       ; Allegro ODBC interface
+(asdf:oos 'asdf:load-op :clsql)             ; main clsql package
         </programlisting>
       </para>
     </sect2>