r8185: convert programlisting to screen

diff --git a/doc/appendix.xml b/doc/appendix.xml
index 4a0a3646644f6e9e2ad9295af17d263817e414be..4c77eaad0dc24548136eb0b6c3847f5426a78e6b 100644 (file)
--- a/doc/appendix.xml
+++ b/doc/appendix.xml
@@ -25,7 +25,7 @@
     <sect2>
       <title>Initialization</title>
       <para>Use 
-       <programlisting>(mk:load-system :clsql-mysql)</programlisting>
+       <screen>(mk:load-system :clsql-mysql)</screen>
        to load the MySQL back-end.  The database type for the MySQL
        back-end is <symbol>:mysql</symbol>.</para>
       </sect2>
@@ -91,7 +91,7 @@
       <sect2>
        <title>Initialization</title>
        <para>Use 
-         <programlisting>(mk:load-system :clsql-postgresql)</programlisting>
+         <screen>(mk:load-system :clsql-postgresql)</screen>
          to load the PostgreSQL back-end.  The database type for the
          PostgreSQL back-end is <symbol>:postgresql</symbol>.</para>
       </sect2>
@@ -180,7 +180,7 @@
       <sect2>
        <title>Initialization</title>
        <para>Use 
-         <programlisting>(mk:load-system :clsql-postgresql-socket)</programlisting>
+         <screen>(mk:load-system :clsql-postgresql-socket)</screen>
          to load the PostgreSQL Socket back-end.  The database type for the
          PostgreSQL Socket back-end is 
          <symbol>:postgresql-socket</symbol>.</para>
@@ -270,7 +270,7 @@
       <sect2>
        <title>Initialization</title>
        <para>Use 
-         <programlisting>(mk:load-system :clsql-aodbc)</programlisting>
+         <screen>(mk:load-system :clsql-aodbc)</screen>
          to load the MySQL back-end.  The database type for the AODBC
          back-end is <symbol>:aodbc</symbol>.</para>
       </sect2>

diff --git a/doc/intro.xml b/doc/intro.xml
index b0a431ae217041c9a2ada89c0e84e71ee03dd471..fa9a2a7c54e1d4cc4a24ffc7227d3c3d03577661 100644 (file)
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -126,9 +126,9 @@
       <title>Ensure &asdf; is loaded</title>
       <para>
        Simply load the file <filename>asdf.lisp</filename>.
-       <programlisting>
+       <screen>
 (load "asdf.lisp")
-       </programlisting>
+       </screen>
       </para>
     </sect2>
     
@@ -155,9 +155,9 @@
        linking on Linux. If you are using FreeBSD or Solaris, you will need
        to change the linker setting as instructed in the Makefile. 
        Then, you can give the command
-       <programlisting>
+       <screen>
 make libs
-       </programlisting>
+       </screen>
        in the root directory of &clsql; to build the libraries 
        <filename>interfaces/mysql/clsql-mysql.so</filename>
        and <filename>interfaces/clsql-uffi/clsql-uffi.so</filename>.
@@ -173,10 +173,10 @@ make libs
        The following example code assumes the &uffi; files reside in the
        <filename>/usr/share/lisp/uffi/</filename> 
        directory.
-       <programlisting>
+       <screen>
 (push #P"/usr/share/lisp/uffi/" asdf:*central-registry*)
 (asdf:oos 'asdf:load-op :uffi)
-       </programlisting>
+       </screen>
       </para>
     </sect2>
    <sect2>
@@ -189,10 +189,10 @@ make libs
         The following example code assumes the cl-md5 files reside in the
        <filename>/usr/share/lisp/cl-md5/</filename> 
        directory.
-       <programlisting>
+       <screen>
 (push #P"/usr/share/lisp/cl-md5/" asdf:*central-registry*)
 (asdf:oos 'asdf:load-op :md5)
-       </programlisting>
+       </screen>
      </para>
    </sect2>
    
@@ -206,7 +206,7 @@ make libs
        <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>
+       <screen>
 (push #P"/usr/share/lisp/clsql/" asdf:*central-repository*)
 (asdf:operate 'asdf:load-op 'clsql-base)        ; base clsql package
 (asdf:operate 'asdf:load-op 'clsql-mysql)       ; MySQL interface
@@ -214,7 +214,7 @@ make libs
 (asdf:operate 'asdf:load-op 'clsql-postgresql-socket) ; Socket PGSQL interface
 (asdf:operate 'asdf:load-op 'clsql-aodbc)       ; Allegro ODBC interface
 (asdf:operate 'asdf:load-op 'clsql)             ; main clsql package
-       </programlisting>
+       </screen>
       </para>
     </sect2>
     
@@ -227,9 +227,9 @@ make libs
        in the <filename>tests/tests.lisp</filename> file in the &clsql;
        source directory. After creating that file, you can run the test suite
        with &asdf;:
-       <programlisting>
+       <screen>
          (asdf:operate 'asdf:test-op 'clsql)
-        </programlisting>.     .
+        </screen>
       </para>
     </sect2>
     

diff --git a/doc/ref_clsql.xml b/doc/ref_clsql.xml
index 04062ceeb49596ef9e3cac37d612b29e416d2104..a567cc76f7d569fea820ad546324e9b884dd38f2 100644 (file)
--- a/doc/ref_clsql.xml
+++ b/doc/ref_clsql.xml
@@ -555,12 +555,12 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (setf *default-database-type* :mysql)
 => :mysql
 (initialize-database-type)
 => t
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Affected By</title>
@@ -606,14 +606,14 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (setf *default-database-type* :mysql)
 => :mysql
 (initialize-database-type)
 => t
 *initialized-database-types*
 => (:MYSQL)
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Affected By</title>
@@ -685,7 +685,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 *initialized-database-types*
 => NIL
 (setf *default-database-type* :mysql)
@@ -701,7 +701,7 @@
 => T
 *initialized-database-types*
 => (:MYSQL)
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -833,7 +833,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (connected-databases)
 => NIL
 (connect '(nil "template1" "dent" nil) :database-type :postgresql)
@@ -851,7 +851,7 @@
 => T
 (connected-databases)
 => NIL
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -926,7 +926,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (connected-databases)
 => NIL
 (connect '("dent" "newesim" "dent" "dent") :database-type :mysql)
@@ -951,7 +951,7 @@
 => NIL
 (connected-databases)
 => NIL
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Affected By</title>
@@ -1105,7 +1105,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (database-name-from-spec '("dent" "newesim" "dent" "dent") :mysql)
 => "dent/newesim/dent"
 (connect '("dent" "newesim" "dent" "dent") :database-type :mysql)
@@ -1122,7 +1122,7 @@
 
 (database-name-from-spec '("www.pmsf.de" "template1" "dent" nil) :postgresql)
 => "www.pmsf.de/template1/dent"
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1220,7 +1220,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (database-name-from-spec '("dent" "newesim" "dent" "dent") :mysql)
 => "dent/newesim/dent"
 (connect '("dent" "newesim" "dent" "dent") :database-type :mysql)
@@ -1246,7 +1246,7 @@
 => NIL
 (find-database **)
 => #&lt;CLSQL-POSTGRESQL:POSTGRESQL-DATABASE {48392D2D}>
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1413,7 +1413,7 @@
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (database-name-from-spec '("dent" "newesim" "dent" "dent") :mysql)
 => "dent/newesim/dent"
 (connect '("dent" "newesim" "dent" "dent") :database-type :mysql)
@@ -1442,7 +1442,7 @@
 >>                (SETQ RESULT OLD-DB)))
 >> 0] 0
 => #&lt;CLSQL-MYSQL:MYSQL-DATABASE {480451F5}>
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1540,10 +1540,10 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (disconnect :database (find-database "dent/newesim/dent"))
 => T
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1610,10 +1610,10 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (disconnect-pool)
 => T
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1701,7 +1701,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (database-name-from-spec '("dent" "newesim" "dent" "dent") :mysql)
 => "dent/newesim/dent"
 (connect '("dent" "newesim" "dent" "dent") :database-type :mysql)
@@ -1727,7 +1727,7 @@ The default is &nil;.
 => NIL
 (find-database **)
 => #&lt;CLSQL-POSTGRESQL:POSTGRESQL-DATABASE {48392D2D}>
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1803,7 +1803,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (execute-command "create table eventlog (time char(30),event char(70))")
 => T
 
@@ -1829,7 +1829,7 @@ The default is &nil;.
 
 (execute-command "drop table eventlog")
 => T
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -1956,7 +1956,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (execute-command "create table simple (name char(50), salary numeric(10,2))")
 => T
 (execute-command "insert into simple values ('Mai, Pierre',10000)")
@@ -1979,7 +1979,7 @@ The default is &nil;.
 ;; MySQL-specific:
 (query "show tables")
 => (("demo") ("log") ("newlog") ("simple") ("spacetrial"))
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -2116,7 +2116,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (map-query 'list #'(lambda (salary name) 
                     (declare (ignorable name))
                     (read-from-string salary))
@@ -2140,7 +2140,7 @@ The default is &nil;.
          list))
 => NIL
 => (("Hacker, Random J." . 8000.5) ("Mai, Pierre" . 10000.0))
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -2264,7 +2264,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (do-query ((salary name) "select salary,name from simple")
   (format t "~30A gets $~2,5$~%" name (read-from-string salary)))
 >> Mai, Pierre                    gets $10000.00
@@ -2274,7 +2274,7 @@ The default is &nil;.
 (do-query ((salary name) "select salary,name from simple")
   (return (cons salary name)))
 => ("10000.00" . "Mai, Pierre")
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>
@@ -2378,7 +2378,7 @@ The default is &nil;.
       </refsect1>
       <refsect1>
        <title>Examples</title>
-       <programlisting>
+       <screen>
 (defvar *my-db* (connect '("dent" "newesim" "dent" "dent"))
   "My database"
 => *MY-DB*
@@ -2411,7 +2411,7 @@ The default is &nil;.
 >> CLOS Benchmark entry                     => 32000
 => #&lt;EQUAL hash table, 3 entries {48350A1D}>
 => #&lt;EQUAL hash table, 5 entries {48350FCD}>
-       </programlisting>
+       </screen>
       </refsect1>
       <refsect1>
        <title>Side Effects</title>