1 files changed, 18 insertions, 13 deletions
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 5d7e1e6a8c1..1db1f03dea0 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,11 +1,19 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.21 1999/05/04 02:19:20 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.22 1999/05/20 05:39:27 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.22  1999/05/20 05:39:27  thomas
+Rearrange and consolidate the Admin Guide.
+Add reference pages for utilities and remove standalone chapters for same.
+Add material for an appendix on date/time properties, but not yet
+ integrated with the User's Guide.
+Break up the former chapter on pg_options
+ into Admin and Programmer's Guides.
+
 Revision 1.21  1999/05/04 02:19:20  thomas
 Include chapters on security and an intro to SQL.
 
@@ -105,7 +113,6 @@ Move SQL reference pages up into the User's Guide.
 <!entity install  SYSTEM "install.sgml">
 <!entity installw SYSTEM "install-win32.sgml">
 <!entity intro-ag SYSTEM "intro-ag.sgml">
-<!entity options  SYSTEM "pg_options.sgml">
 <!entity ports    SYSTEM "ports.sgml">
 <!entity runtime  SYSTEM "runtime.sgml">
 <!entity recovery SYSTEM "recovery.sgml">
@@ -146,6 +153,7 @@ Move SQL reference pages up into the User's Guide.
 <!entity contacts SYSTEM "contacts.sgml">
 <!entity docguide SYSTEM "docguide.sgml">
 <!entity geqo     SYSTEM "geqo.sgml">
+<!entity options  SYSTEM "pg_options.sgml">
 <!entity page     SYSTEM "page.sgml">
 <!entity protocol SYSTEM "protocol.sgml">
 <!entity signals  SYSTEM "signals.sgml">
@@ -157,7 +165,7 @@ Move SQL reference pages up into the User's Guide.
 
  <Title>PostgreSQL</Title>
  <BookInfo>
-  <ReleaseInfo>Covering v6.4 for general release</ReleaseInfo>
+  <ReleaseInfo>Covering v6.5 for general release</ReleaseInfo>
   <BookBiblio>
    <AuthorGroup>
     <CorpAuthor>The PostgreSQL Development Team</CorpAuthor>
@@ -180,7 +188,7 @@ Move SQL reference pages up into the User's Guide.
     <AuthorInitials>TGL</AuthorInitials>
 -->
 
-   <Date>(last updated 1998-02-23)</Date>
+   <Date>(last updated 1998-05-19)</Date>
   </BookBiblio>
 
   <LegalNotice>
@@ -242,21 +250,18 @@ Your name here...
    </Para>
   </PartIntro>
 
-  &sql;
-   &environ;
-  &manage;
-  &syntax;
+   &sql;
+   &syntax;
    &datatype;
    &oper;
    &func;
    &typeconv;
-  &keys;
+   &keys;
    &array;
    &inherit;
-   &query-ug;
+   &environ;
+   &manage;
    &storage;
-   &psql;
-   &pgaccess;
    &commands;
  </Part>
 
@@ -274,7 +279,6 @@ Your name here...
    &installw;
    &runtime;
    &security;
-   &options;
    &start-ag;
    &recovery;
    &regress;
@@ -331,6 +335,7 @@ Your name here...
    </Para>
   </PartIntro>
    &arch-dev;
+   &options;
    &geqo;
    &protocol;
    &signals;