Move SQL reference pages up into the User's Guide.

diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 447a9d8e58152746f4034904269ed7fe8f19f427..a1a847c876805625d8be6808049ddb93b52368c1 100644 (file)
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,10 +1,13 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.7 1998/08/15 06:52:53 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.8 1998/08/17 16:20:33 thomas Exp $
 Postgres integrated documentation.
 Other subset docs should be copied and shrunk from here.
 thomas 1998-02-23
 
 $Log: postgres.sgml,v $
+Revision 1.8  1998/08/17 16:20:33  thomas
+Move SQL reference pages up into the User's Guide.
+
 Revision 1.7  1998/08/15 06:52:53  thomas
 Include new chapters.
 
@@ -34,6 +37,10 @@ Include new chapters.
 <!entity psql     SYSTEM "psql.sgml">
 <!entity pgaccess SYSTEM "pgaccess.sgml">
 
+<!-- reference pages -->
+<!entity % allfiles SYSTEM "allfiles.sgml">
+%allfiles;
+
 <!-- administrator's guide -->
 <!entity start-ag SYSTEM "start-ag.sgml">
 <!entity install  SYSTEM "install.sgml">
@@ -64,11 +71,6 @@ Include new chapters.
 <!entity odbc     SYSTEM "odbc.sgml">
 <!entity jdbc     SYSTEM "jdbc.sgml">
 
-<!-- reference pages -->
-<!entity intro-ref  SYSTEM "intro-ref.sgml">
-<!entity % allfiles SYSTEM "allfiles.sgml">
-%allfiles;
-
 <!-- developer's guide -->
 <!entity arch-dev SYSTEM "arch-dev.sgml">
 <!entity geqo     SYSTEM "geqo.sgml">
@@ -87,7 +89,7 @@ Include new chapters.
 
 <Title>PostgreSQL</Title>
 <BookInfo>
-    <ReleaseInfo>Covering v6.3 for general release</ReleaseInfo>
+    <ReleaseInfo>Covering v6.4 for general release</ReleaseInfo>
     <BookBiblio>
     <AuthorGroup>
       <CorpAuthor>The PostgreSQL Development Team</CorpAuthor>
@@ -183,6 +185,7 @@ Information for users.
 &storage;
 &psql;
 &pgaccess;
+&commands;
 </Part>
 
 <part Id="part-admin">
@@ -239,17 +242,6 @@ User and programmer interfaces.
 &jdbc;
 </Part>
 
-<part Id="part-reference">
-<Title>Reference</Title>
-<PartIntro>
-<Para>
-Command syntax.
-</Para>
-</PartIntro>
-<!-- &intro-ref; -->
-&commands;
-</Part>
-
 <part Id="part-developer">
 <Title>Developer's Guide</Title>
 <PartIntro>

diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index 6ddbfd1360337146ab3b9e68828cad6a358690d2..8bfc77893518d05578b5cb6a5b8b1a5fcf7f8a92 100644 (file)
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -1,10 +1,13 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.4 1998/08/15 06:52:54 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.5 1998/08/17 16:20:32 thomas Exp $
 Postgres User's Manual.
 Derived from postgres.sgml.
 thomas 1998-02-24
 
 $Log: user.sgml,v $
+Revision 1.5  1998/08/17 16:20:32  thomas
+Move SQL reference pages up into the User's Guide.
+
 Revision 1.4  1998/08/15 06:52:54  thomas
 Include new chapters.
 
@@ -27,6 +30,10 @@ Include new chapters.
 <!entity psql     SYSTEM "psql.sgml">
 <!entity pgaccess SYSTEM "pgaccess.sgml">
 <!entity biblio   SYSTEM "biblio.sgml">
+
+<!-- reference pages -->
+<!entity % allfiles SYSTEM "allfiles.sgml">
+%allfiles;
 ]>
 <!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
 <Book Id="user">
@@ -35,7 +42,7 @@ Include new chapters.
 
 <Title>PostgreSQL User's Guide</Title>
 <BookInfo>
-    <ReleaseInfo>Covering v6.3 for general release</ReleaseInfo>
+    <ReleaseInfo>Covering v6.4 for general release</ReleaseInfo>
     <BookBiblio>
     <AuthorGroup>
       <CorpAuthor>The PostgreSQL Development Team</CorpAuthor>
@@ -111,6 +118,7 @@ It provides SQL92/SQL3 language support,
 &storage;
 &psql;
 &pgaccess;
+&commands;
 
 <!--
 &contacts;