X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=doc%2Fcsql.xml;h=011c04663878bdc42759418ab1c07390526fa5cc;hb=61fd5f068d2a5dc42c88731d672730ba6aa9a9ea;hp=d0d09fa4c76caaa7efab2ccecd36dd4d1a59eac1;hpb=595658021ebaf450894bb143a346e409b55e02af;p=clsql.git

diff --git a/doc/csql.xml b/doc/csql.xml
index d0d09fa..011c046 100644
--- a/doc/csql.xml
+++ b/doc/csql.xml
@@ -135,20 +135,16 @@
     </para>
 
 <programlisting>
-CREATE TABLE EMPLOYEE (
-       emplid		NOT NULL	number(38),
-       first_name	NOT NULL	varchar2(30),
-       last_name	NOT NULL	varchar2(30),
-       emall				varchar2(100),
-       companyid	NOT NULL        number(38),
-       managerid			number(38)
-)
-
-CREATE TABLE COMPANY (
-       companyid	NOT NULL	number(38),
-       name	        NOT NULL	varchar2(100),
-       presidentid	NOT NULL	number(38)
-)
+CREATE TABLE EMPLOYEE ( emplid     NOT NULL number(38),
+                        first_name NOT NULL varchar2(30),
+                        last_name  NOT NULL varchar2(30),
+                        email               varchar2(100),
+                        companyid  NOT NULL number(38),
+                        managerid           number(38))
+
+CREATE TABLE COMPANY ( companyid   NOT NULL number(38),
+                       name        NOT NULL varchar2(100),
+                       presidentid NOT NULL number(38))
 </programlisting>
 
 <para>
@@ -189,7 +185,7 @@ mapped into a database).  They would be defined as follows:
 
 (clsql:def-view-class company ()
   ((companyid
-    :db-type :key
+    :db-kind :key
     :db-constraints :not-null
     :type integer
     :initarg :companyid)
@@ -251,16 +247,14 @@ mapped into a database).  They would be defined as follows:
 
   <listitem>
     <para>
-      <symbol>:db-type</symbol> - A string which will be used as the
+      <symbol>:column-</symbol> - A string which will be used as the
       type specifier for this slots column definition in the database.
       </para></listitem>
 
   <listitem>
     <para>
-      <symbol>:nulls-ok</symbol> - If &t;, all &sql; &null; values
-      retrieved from the database become nil; if &nil;, all &null;
-      values retrieved are converted by
-      <function>DATABASE-NULL-VALUE</function>. </para></listitem>
+      <symbol>:void-value</symbol> - The Lisp value to return if the
+      field is &null;. The default is &nil;.</para></listitem>
 
   <listitem>
     <para>
@@ -303,7 +297,7 @@ mapped into a database).  They would be defined as follows:
 <para>
 In an &sql; only application, the <symbol>EMPLOYEE</symbol> and
 <symbol>COMPANY</symbol> tables can be queried to determine things
-like, "Who is Vladamir's manager?", What company does Josef work
+like, "Who is Vladamir's manager?", "What company does Josef work
 for?", and "What employees work for Widgets Inc.".  This is done by
 joining tables with an &sql; query.
 </para>
@@ -469,7 +463,7 @@ first need to create our tables in the database:
 </para>
 
 <para>
-Note: the file <filename>doc/clsql-tutorial.lisp</filename> contains
+Note: the file <filename>examples/clsql-tutorial.lisp</filename> contains
 view class definitions which you can load into your list at this point
 in order to play along at home.
 </para>