X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=doc%2Fcsql.xml;h=f84dd50691c54b8e748cd2f1ef344caeda7d9df8;hb=fe5d3a2b2a94e72fa7774d6b348f853127565699;hp=284de249342ffdf05aff263f9b1fc574f8bddc2d;hpb=9f1b97ba188b6c065146fc2cb7e818e5c62b7175;p=clsql.git

diff --git a/doc/csql.xml b/doc/csql.xml
index 284de24..f84dd50 100644
--- a/doc/csql.xml
+++ b/doc/csql.xml
@@ -36,19 +36,19 @@
     </para>
 
     <para>
-      &clsql; is based on the CommonSQL package from Xanalys, so the
-      documentation that Xanalys makes available online is useful for
+      &clsql; is based on the CommonSQL package from LispWorks Ltd, so the
+      documentation that LispWorks makes available online is useful for
       &clsql; as well.  It is suggested that developers new to &clsql; read
       their documentation as well, as any differences between CommonSQL
-      and &clsql; are minor. Xanalys makes the following documents
+      and &clsql; are minor. LispWorks makes the following documents
       available:
     </para>
 
     <itemizedlist>
       <listitem>
 	<para>
-	  <ulink url="http://www.lispworks.com/reference/lw43/LWUG/html/lwuser-167.htm">
-	    <citetitle>Xanalys &lw; User Guide - The &commonsql;
+	  <ulink url="http://www.lispworks.com/documentation/lw44/LWUG/html/lwuser-204.htm">
+	    <citetitle>&lw; User Guide - The &commonsql;
 	    Package
 	    </citetitle>
 	  </ulink>
@@ -57,8 +57,8 @@
 
       <listitem>
 	<para>
-	  <ulink url="http://www.lispworks.com/reference/lw43/LWRM/html/lwref-383.htm">
-	    <citetitle>Xanalys &lw; Reference Manual - The SQL
+	  <ulink url="http://www.lispworks.com/documentation/lw44/LWRM/html/lwref-424.htm">
+	    <citetitle>&lw; Reference Manual - The SQL
 	    Package</citetitle>
 	  </ulink>
 	</para>
@@ -66,7 +66,7 @@
 
       <listitem>
 	<para>
-	<ulink url="http://www.ravenbrook.com/doc/2002/09/13/common-sql/">
+	<ulink url="http://www.lispworks.com/documentation/sql-tutorial/index.html">
 	  <citetitle>&commonsql; Tutorial by Nick Levine</citetitle>
 	</ulink>
 	</para>
@@ -83,7 +83,7 @@
       <footnote>
 	<para>
 	<ulink
-	 url="http://www.arsdigita.com/books/sql/data-modeling.html">
+	 url="http://philip.greenspun.com/sql/data-modeling.html">
 	  <citetitle>Philip Greenspun's "SQL For Web Nerds" - Data
 	  Modeling</citetitle>
 	</ulink>
@@ -250,7 +250,7 @@ mapped into a database).  They would be defined as follows:
 
   <listitem>
     <para>
-      <symbol>:column-</symbol> - A string which will be used as the
+      <symbol>:db-type</symbol> - A string which will be used as the
       type specifier for this slots column definition in the database.
       </para></listitem>
 
@@ -300,7 +300,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 Vladimir'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>
@@ -316,12 +316,12 @@ SELECT first_name, last_name FROM employee, company
 </programlisting>
 
 <para>
-Who is Vladamir's manager?
+Who is Vladimir's manager?
 </para>
 
 <programlisting>
 SELECT managerid FROM employee
-       WHERE employee.first_name = "Vladamir"
+       WHERE employee.first_name = "Vladimir"
 	     AND employee.last_name = "Lenin"
 </programlisting>
 
@@ -489,7 +489,7 @@ any other CLOS object:
 			      
 (defvar employee1 (make-instance 'employee
 			       :emplid 1
-			       :first-name "Vladamir"
+			       :first-name "Vladimir"
 			       :last-name "Lenin"
 			       :email "lenin@soviet.org"
 			       :companyid 1))