From 243188d5a588c42c3882846ab373d055da7a22e3 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 27 Jan 2005 17:26:08 +0000 Subject: [PATCH] r10285: * doc/*.xml: Fix spelling of Vladimir --- ChangeLog | 3 ++- doc/csql.xml | 8 ++++---- doc/ref-fddl.xml | 2 +- doc/ref-fdml.xml | 28 ++++++++++++++-------------- doc/ref-oodml.xml | 2 +- doc/ref-recording.xml | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6773d1f..ebcf926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ * tests/*.lisp: Change Vladamir to Vladimir per Cyrus Harmon's suggestion. * sql/utils.lisp: Fix unnecessary consing noted by Fred Gilham. - + * doc/*.xml: Fix spelling of Vladimir + 24 Jan 2005 Kevin Rosenberg * doc/bookinfo.xml, doc/csql.xml, doc/intro.xml: Update links now that LispWorks is an independant company [noted by diff --git a/doc/csql.xml b/doc/csql.xml index 814b7f4..b01abe1 100644 --- a/doc/csql.xml +++ b/doc/csql.xml @@ -300,7 +300,7 @@ mapped into a database). They would be defined as follows: In an &sql; only application, the EMPLOYEE and COMPANY 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. @@ -316,12 +316,12 @@ SELECT first_name, last_name FROM employee, company -Who is Vladamir's manager? +Who is Vladimir's manager? SELECT managerid FROM employee - WHERE employee.first_name = "Vladamir" + WHERE employee.first_name = "Vladimir" AND employee.last_name = "Lenin" @@ -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)) diff --git a/doc/ref-fddl.xml b/doc/ref-fddl.xml index 2fc7c52..5caa87d 100644 --- a/doc/ref-fddl.xml +++ b/doc/ref-fddl.xml @@ -575,7 +575,7 @@ ("Konstantin" "Chernenko" "chernenko@soviet.org") ("Mikhail" "Gorbachev" "gorbachev@soviet.org") ("Boris" "Yeltsin" "yeltsin@soviet.org") - ("Vladamir" "Putin" "putin@soviet.org")), + ("Vladimir" "Putin" "putin@soviet.org")), ("first_name" "last_name" "email") diff --git a/doc/ref-fdml.xml b/doc/ref-fdml.xml index 5eb4f07..c512cdb 100644 --- a/doc/ref-fdml.xml +++ b/doc/ref-fdml.xml @@ -486,7 +486,7 @@ :from [employee] :where [= [emplid] 1] :field-names nil) -=> (("Vladamir" "Lenin" "lenin@soviet.org")) +=> (("Vladimir" "Lenin" "lenin@soviet.org")) (update-records [employee] :av-pairs'((first_name "Yuri") (last_name "Gagarin") @@ -904,22 +904,22 @@ Examples (query "select emplid,first_name,last_name,height from employee where emplid = 1") -=> ((1 "Vladamir" "Lenin" 1.5564661d0)), +=> ((1 "Vladimir" "Lenin" 1.5564661d0)), ("emplid" "first_name" "last_name" "height") (query "select emplid,first_name,last_name,height from employee where emplid = 1" :field-names nil) -=> ((1 "Vladamir" "Lenin" 1.5564661d0)) +=> ((1 "Vladimir" "Lenin" 1.5564661d0)) (query "select emplid,first_name,last_name,height from employee where emplid = 1" :field-names nil :result-types nil) -=> (("1" "Vladamir" "Lenin" "1.5564661")) +=> (("1" "Vladimir" "Lenin" "1.5564661")) (query "select emplid,first_name,last_name,height from employee where emplid = 1" :field-names nil :result-types '(:int t t :double)) -=> ((1 "Vladamir" "Lenin" 1.5564661)) +=> ((1 "Vladimir" "Lenin" 1.5564661)) (query "select last_name from employee where emplid > 5" :flatp t) => ("Andropov" "Chernenko" "Gorbachev" "Yeltsin" "Putin"), @@ -1065,7 +1065,7 @@ :where [< [emplid] 5]] :titles '("ID" "FORENAME" "SURNAME" "EMAIL")) ID FORENAME SURNAME EMAIL -1 Vladamir Lenin lenin@soviet.org +1 Vladimir Lenin lenin@soviet.org 2 Josef Stalin stalin@soviet.org 3 Leon Trotsky trotsky@soviet.org 4 Nikita Kruschev kruschev@soviet.org @@ -1079,7 +1079,7 @@ ID FORENAME SURNAME EMAIL 7 Konstantin Chernenko chernenko@soviet.org 8 Mikhail Gorbachev gorbachev@soviet.org 9 Boris Yeltsin yeltsin@soviet.org -10 Vladamir Putin putin@soviet.org +10 Vladimir Putin putin@soviet.org => @@ -1397,7 +1397,7 @@ ID FORENAME SURNAME EMAIL :field-names nil :result-types nil :order-by [first-name]) -=> ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir" +=> ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladimir" "Yuri") (select [first-name] [count [*]] :from [employee] @@ -1406,7 +1406,7 @@ ID FORENAME SURNAME EMAIL :order-by [first-name] :field-names nil) => (("Boris" "1") ("Josef" "1") ("Konstantin" "1") ("Leon" "1") ("Leonid" "1") - ("Mikhail" "1") ("Nikita" "1") ("Vladamir" "2") ("Yuri" "1")) + ("Mikhail" "1") ("Nikita" "1") ("Vladimir" "2") ("Yuri" "1")) (select [last-name] :from [employee] :where [like [email] "%org"] @@ -1454,7 +1454,7 @@ ID FORENAME SURNAME EMAIL :order-by '(([first-name] :asc) ([last-name] :desc))) => (("Boris" "Yeltsin") ("Josef" "Stalin") ("Konstantin" "Chernenko") ("Leon" "Trotsky") ("Leonid" "Brezhnev") ("Mikhail" "Gorbachev") - ("Nikita" "Kruschev") ("Vladamir" "Putin") ("Vladamir" "Lenin") + ("Nikita" "Kruschev") ("Vladimir" "Putin") ("Vladimir" "Lenin") ("Yuri" "Andropov")) (select [last-name] :from [employee] @@ -1465,7 +1465,7 @@ ID FORENAME SURNAME EMAIL :field-names nil) => ("Andropov" "Boris" "Brezhnev" "Chernenko" "Gorbachev" "Josef" "Konstantin" "Kruschev" "Lenin" "Leon" "Leonid" "Mikhail" "Nikita" "Putin" "Stalin" - "Trotsky" "Vladamir" "Yeltsin" "Yuri") + "Trotsky" "Vladimir" "Yeltsin" "Yuri") @@ -1825,7 +1825,7 @@ ID FORENAME SURNAME EMAIL :order-by [last-name]] collect (concatenate 'string forename " " surname)) => ("Yuri Andropov" "Leonid Brezhnev" "Konstantin Chernenko" "Mikhail Gorbachev" - "Nikita Kruschev" "Vladamir Lenin" "Vladamir Putin" "Josef Stalin" + "Nikita Kruschev" "Vladimir Lenin" "Vladimir Putin" "Josef Stalin" "Leon Trotsky" "Boris Yeltsin") (loop for (e) being the records in @@ -2033,8 +2033,8 @@ ID FORENAME SURNAME EMAIL [select [first-name] [last-name] :from [employee] :order-by [last-name]]) => (("Yuri" "Andropov") ("Leonid" "Brezhnev") ("Konstantin" "Chernenko") - ("Mikhail" "Gorbachev") ("Nikita" "Kruschev") ("Vladamir" "Lenin") - ("Vladamir" "Putin") ("Josef" "Stalin") ("Leon" "Trotsky") + ("Mikhail" "Gorbachev") ("Nikita" "Kruschev") ("Vladimir" "Lenin") + ("Vladimir" "Putin") ("Josef" "Stalin") ("Leon" "Trotsky") ("Boris" "Yeltsin")) (map-query 'list #'last-name [select 'employee :order-by [emplid]]) diff --git a/doc/ref-oodml.xml b/doc/ref-oodml.xml index 51cb36c..50139a6 100644 --- a/doc/ref-oodml.xml +++ b/doc/ref-oodml.xml @@ -282,7 +282,7 @@ (slot-value (car *) 'email) => "lenin@soviet.org" (select 'employee :where [= [slot-value 'employee 'emplid] 1] :flatp t :refresh t) -Details for Vladamir Lenin have been updated from the database. +Details for Vladimir Lenin have been updated from the database. => (#<EMPLOYEE {48149995}>) (slot-value (car *) 'email) => "v.lenin@soviet.org" diff --git a/doc/ref-recording.xml b/doc/ref-recording.xml index fb06078..fb4fc1c 100644 --- a/doc/ref-recording.xml +++ b/doc/ref-recording.xml @@ -539,7 +539,7 @@ ;; 2004-07-02 17:38:45 dent/test/dent => SELECT emplid,first_name,last_name,email FROM employee => ";; 2004-07-02 17:38:45 dent/test/dent => SELECT emplid,first_name,last_name,email FROM employee -1 Vladamir Lenin lenin@soviet.org +1 Vladimir Lenin lenin@soviet.org 2 Josef Stalin stalin@soviet.org 3 Leon Trotsky trotsky@soviet.org 4 Nikita Kruschev kruschev@soviet.org @@ -548,7 +548,7 @@ 7 Konstantin Chernenko chernenko@soviet.org 8 Mikhail Gorbachev gorbachev@soviet.org 9 Boris Yeltsin yeltsin@soviet.org -10 Vladamir Putin putin@soviet.org " +10 Vladimir Putin putin@soviet.org " -- 2.34.1