From 807ad858e26f0262093b5570b18f3d610b91239f Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Tue, 4 May 1999 02:26:06 +0000
Subject: [PATCH] Include new introductory chapter on SQL from Stefan S. Should
 this be in the tutorial instead?

---
 doc/src/sgml/user.sgml | 84 ++++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index 713235cb3e..87278c7cd5 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -1,11 +1,15 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.7 1998/10/30 19:37:16 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.8 1999/05/04 02:26:06 thomas Exp $
 
 Postgres User's Manual.
 Derived from postgres.sgml.
 thomas 1998-02-24
 
 $Log: user.sgml,v $
+Revision 1.8  1999/05/04 02:26:06  thomas
+Include new introductory chapter on SQL from Stefan S.
+Should this be in the tutorial instead?
+
 Revision 1.7  1998/10/30 19:37:16  thomas
 Minor editing and markup changes as a result of preparing the Postscript
  documentation for v6.4.
@@ -33,23 +37,24 @@ Move SQL reference pages up into the User's Guide.
 <!entity notation SYSTEM "notation.sgml">
 <!entity y2k      SYSTEM "y2k.sgml">
 
-<!entity intro    SYSTEM "intro.sgml">
 <!entity advanced SYSTEM "advanced.sgml">
-<!entity environ  SYSTEM "environ.sgml">
-<!entity manage   SYSTEM "manage.sgml">
-<!entity datatype SYSTEM "datatype.sgml">
-<!entity oper     SYSTEM "oper.sgml">
-<!entity func     SYSTEM "func.sgml">
-<!entity typeconv SYSTEM "typeconv.sgml">
-<!entity keys     SYSTEM "keys.sgml">
 <!entity array    SYSTEM "array.sgml">
-<!entity inherit  SYSTEM "inherit.sgml">
-<!entity query-ug SYSTEM "query-ug.sgml">
-<!entity storage  SYSTEM "storage.sgml">
-<!entity psql     SYSTEM "psql.sgml">
-<!entity pgaccess SYSTEM "pgaccess.sgml">
 <!entity biblio   SYSTEM "biblio.sgml">
+<!entity datatype SYSTEM "datatype.sgml">
+<!entity environ  SYSTEM "environ.sgml">
+<!entity func     SYSTEM "func.sgml">
+<!entity inherit  SYSTEM "inherit.sgml">
+<!entity intro    SYSTEM "intro.sgml">
+<!entity keys     SYSTEM "keys.sgml">
+<!entity manage   SYSTEM "manage.sgml">
+<!entity oper     SYSTEM "oper.sgml">
+<!entity pgaccess SYSTEM "pgaccess.sgml">
+<!entity psql     SYSTEM "psql.sgml">
+<!entity query-ug SYSTEM "query-ug.sgml">
+<!entity sql      SYSTEM "sql.sgml">
+<!entity storage  SYSTEM "storage.sgml">
 <!entity syntax   SYSTEM "syntax.sgml">
+<!entity typeconv SYSTEM "typeconv.sgml">
 
 <!-- reference pages -->
 <!entity % allfiles SYSTEM "allfiles.sgml">
@@ -125,28 +130,29 @@ It provides SQL92/SQL3 language support,
 </Para>
 </Preface>
 
-&intro;
-&environ;
-&manage;
-&syntax;
-&datatype;
-&oper;
-&func;
-&typeconv;
-&keys;
-&array;
-&inherit;
-&query-ug;
-&storage;
-&psql;
-&pgaccess;
-&commands;
+  &intro;
+ &sql;
+  &environ;
+ &manage;
+ &syntax;
+  &datatype;
+  &oper;
+  &func;
+  &typeconv;
+ &keys;
+  &array;
+  &inherit;
+  &query-ug;
+  &storage;
+  &psql;
+  &pgaccess;
+  &commands;
 
 <!--
 &contacts;
 -->
 
-&biblio;
+ &biblio;
 
 <!--
 <index Id="index">
@@ -155,3 +161,19 @@ It provides SQL92/SQL3 language support,
 
 </Book>
 
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->