r10937: Automated commit for Debian build of clsql upstream-version-3.6.0

[clsql.git] / doc / csql.xml

diff --git a/doc/csql.xml b/doc/csql.xml
index 814b7f4188f848a02a262120e02fc18e19e99296..f84dd50691c54b8e748cd2f1ef344caeda7d9df8 100644 (file)
--- a/doc/csql.xml
+++ b/doc/csql.xml
@@ -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))