diff --git a/doc/src/sgml/admin.sgml b/doc/src/sgml/admin.sgml
index b69d9f759f..a3ce1cc52f 100644
--- a/doc/src/sgml/admin.sgml
+++ b/doc/src/sgml/admin.sgml
@@ -1,37 +1,9 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.20 2000/03/30 22:22:40 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.21 2000/03/31 03:27:40 thomas Exp $
 
 Postgres Administrator's Guide.
 Derived from postgres.sgml.
 - thomas 1998-10-27
-
-$Log: admin.sgml,v $
-Revision 1.20  2000/03/30 22:22:40  thomas
-Accumulated fixups.
-Add some chapters on new topics.
-Change to referencing OASIS/Docbook v3.1 rather than Davenport/Docbook v3.0
-Grepped for and fixed apparent tag mangling from emacs
- "Normalize" operation. Should be the last of those.
-
-Revision 1.19  2000/03/28 14:16:06  thomas
-Update SGML catalog references to DocBook 3.1 on FreeBSD.
-Matches postgresql.org/hub.org environment.
-
-Revision 1.18  1999/12/06 16:37:11  thomas
-Remove references to PostgreSQL as "public-domain" since that has a
- specific meaning wrt copyright (or lack thereof).
-
-Revision 1.17  1999/09/29 05:18:14  thomas
-Strip out some cvs log info.
-
-Revision 1.16  1999/06/23 06:15:13  thomas
-Add backup/restore info to Admin Guide.
-Split management chapter from start-ag.sgml to manage-ag.sgml.
-
-Revision 1.15  1999/06/03 04:21:47  thomas
-Markup changes for v6.5 release.
-Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
-
 -->
 
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
@@ -160,7 +132,7 @@ Don't bother with an index until we get some index entries.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -170,7 +142,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index eb60f91c7a..3142c32739 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.9 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="advanced">
   <title>Advanced <productname>Postgres</productname> <acronym>SQL</acronym> Features</title>
 
@@ -325,7 +329,7 @@ SELECT name, population
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -335,7 +339,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index 85b9e8b0ba..2afc105201 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.8 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="overview">
   <title>Overview of PostgreSQL Internals</title>
 
@@ -4078,7 +4082,7 @@ instead.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -4088,7 +4092,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 500032c1f2..87124d0091 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/biblio.sgml,v 1.12 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <bibliography id="biblio">
   <title>Bibliography</title>
 
@@ -857,7 +861,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 9fcd532d02..a158a5c2c0 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,35 +1,7 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.6 1999/05/26 17:30:28 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.7 2000/03/31 03:27:40 thomas Exp $
 CVS code repository
 Thomas Lockhart
-
-$Log: cvs.sgml,v $
-Revision 1.6  1999/05/26 17:30:28  thomas
-Add chapters on CVS access, MVCC, SQL theory to the docs.
-Add an appendix with more details on date/time attributes and handling.
-Update most references to Postgres version numbers to 6.5,
- *except* for the porting list which will require a report
- from a successful installation to be updated.
-
-Revision 1.5  1999/05/22 02:27:23  thomas
-Finish initial markup of cvs.sgml, and include it in the programmer's guide
- and the integrated doc. Clean up other markup.
-
-Revision 1.4  1999/04/06 15:38:10  thomas
-Start indenting markup. No text changes.
-
-Revision 1.3  1999/03/30 15:25:56  thomas
-Fix up small markup problems. Force omit-tags to nil so we have tag
- completion as required by the newest DocBook conventions.
-
-Revision 1.2  1999/01/07 03:00:43  thomas
-Put in more markup. Not done yet though.
-
-Revision 1.1  1998/12/18 16:08:19  thomas
-Information on the CVS tree and remote access.
-Not yet complete, integrated, or marked up.
-Not yet included in a document (should go in the developer's doc?).
-
 -->
 
 <appendix label="DG1" id="cvs">
@@ -890,7 +862,7 @@ instructions again...
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -900,7 +872,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 1199b20b6a..8eb62c22c3 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.26 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="datatype">
   <title id="datatype-title">Data Types</title>
 
@@ -1770,7 +1774,7 @@ where
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -1780,7 +1784,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index f89f2be23a..bfc3666a9f 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,35 +1,6 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.7 2000/03/29 03:57:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.8 2000/03/31 03:27:40 thomas Exp $
 Date/time details
-
-$Log: datetime.sgml,v $
-Revision 2.7  2000/03/29 03:57:10  thomas
-Change rules for interpreting date/time input to disallow 1 and 3 character
- years. Rejects dates like '0.085', which were accepted previously.
-Minor mods of ODBC markup.
-
-Revision 2.6  2000/02/02 16:21:06  thomas
-Add detailed information on Australian time zones.
-
-Revision 2.5  1999/10/12 13:57:04  thomas
-Sequence of date interpretation not quite right.
-
-Revision 2.4  1999/06/23 06:17:51  thomas
-Clarify input/output timezone information.
-Add detail on exact interpretation of "concatenated date"
- for various lengths.
-
-Revision 2.3  1999/05/26 17:30:28  thomas
-Add chapters on CVS access, MVCC, SQL theory to the docs.
-Add an appendix with more details on date/time attributes and handling.
-Update most references to Postgres version numbers to 6.5,
- *except* for the porting list which will require a report
- from a successful installation to be updated.
-
-Revision 2.2  1999/05/22 02:27:23  thomas
-Finish initial markup of cvs.sgml, and include it in the programmer's guide
- and the integrated doc. Clean up other markup.
-
 -->
 
 <appendix label="UG1" id="datetime-appendix">
@@ -774,7 +745,7 @@ Finish initial markup of cvs.sgml, and include it in the programmer's guide
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -784,7 +755,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index 42d1ef5fbf..c7a0bba563 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.9 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="dfunc">
   <title id="dfunc-title">Linking Dynamically-Loaded Functions</title>
 
@@ -375,7 +379,7 @@ procedure.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -385,7 +389,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 75ef0b128c..4ac1eba848 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.13 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter>
   <docinfo>
    <authorgroup>
@@ -1045,7 +1049,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index cad198c225..231fde0f43 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.5 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="extend">
   <title>Extending <acronym>SQL</acronym>: An Overview</title>
 
@@ -263,7 +267,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -273,7 +277,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 0c2154f5a3..fd6d58aca0 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,26 +1,6 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.8 1999/03/30 15:25:56 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.9 2000/03/31 03:27:40 thomas Exp $
 Genetic Optimizer
-
-$Log: geqo.sgml,v $
-Revision 1.8  1999/03/30 15:25:56  thomas
-Fix up small markup problems. Force omit-tags to nil so we have tag
- completion as required by the newest DocBook conventions.
-
-Revision 1.7  1999/02/19 01:57:08  thomas
-Fix SGML markup from last content changes.
-
-Revision 1.6  1999/02/18 05:26:17  momjian
-Enable bushy plans by default.
-
-Revision 1.5  1998/12/29 02:24:15  thomas
-Clean up to ensure tag completion as required by the newest versions
- of Norm's Modular Style Sheets and jade/docbook.
-From Vince Vielhaber <vev@michvhf.com>.
-
-Revision 1.4  1998/08/15 06:55:05  thomas
-Change Id field in chapter tag to change html output file name.
-
 -->
 
 <Chapter Id="geqo">
@@ -402,7 +382,7 @@ The Benjamin/Cummings Pub., Inc.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -412,7 +392,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index 2c930292b0..05f45f9931 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.7 2000/03/31 03:27:40 thomas Exp $
+-->
+
 <sect1>
  <title>A Short History of <productname>Postgres</productname></title>
 
@@ -251,7 +255,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -261,7 +265,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/indexcost.sgml b/doc/src/sgml/indexcost.sgml
index 4f9702cf7c..175e0576f0 100644
--- a/doc/src/sgml/indexcost.sgml
+++ b/doc/src/sgml/indexcost.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.2 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter>
   <title>Index Cost Estimation Functions</title>
 
@@ -230,7 +234,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 90deb9b67f..b11bdbda81 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.6 2000/03/31 03:27:40 thomas Exp $
+-->
+
 <sect1>
  <title>Resources</title>
 
@@ -160,7 +164,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -170,7 +174,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/inherit.sgml b/doc/src/sgml/inherit.sgml
index 0a49df2c51..d71abd163a 100644
--- a/doc/src/sgml/inherit.sgml
+++ b/doc/src/sgml/inherit.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/inherit.sgml,v 1.6 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="inherit">
   <title>Inheritance</title>
 
@@ -86,7 +90,7 @@ SELECT c.name, c.altitude
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -96,7 +100,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index b002c8c395..196bc43136 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -1,106 +1,105 @@
-<Chapter Id="install-win32">
-<Title>Installation on Win32</Title>
+ <chapter id="install-win32">
+  <title>Installation on Win32</title>
 
-<Abstract>
-<Para>
-Build and installation instructions for <ProductName>Postgres</ProductName>
-v6.4 client libraries on Win32.
-</Para>
-</Abstract>
+  <abstract>
+   <para>
+    Build and installation instructions for <productname>Postgres</productname>
+    v6.4 client libraries on Win32.
+   </para>
+  </abstract>
 
-<Sect1>
-<Title>Building the libraries</Title>
+  <sect1>
+   <title>Building the libraries</title>
 
-<Para>
-The makefiles included in <ProductName>Postgres</ProductName> are written
-for <ProductName>Microsoft Visual C++</ProductName>, and will probably
-not work with other systems. It should be possible to compile the libaries
-manually in other cases.
-</Para>
+   <para>
+    The makefiles included in <productname>Postgres</productname> are written
+    for <productname>Microsoft Visual C++</productname>, and will probably
+    not work with other systems. It should be possible to compile the libaries
+    manually in other cases.
+   </para>
 
-<Para>
-To build the libraries, change directory into the <filename>src</filename>
-directory, and type the commands
-<programlisting>
+   <para>
+    To build the libraries, change directory into the <filename>src</filename>
+    directory, and type the commands
+    <programlisting>
 copy include\config.h.win32 include\config.h
 nmake /f win32.mak
-</programlisting>
-This assumes that you have <ProductName>Visual C++</ProductName> in your
-path.
-</Para>
+    </programlisting>
+    This assumes that you have <productname>Visual C++</productname> in your
+    path.
+   </para>
 
-<Para>
-The following files will be built:
+   <para>
+    The following files will be built:
 
-<ItemizedList Mark="bullet" Spacing="compact">
-<ListItem>
-<Para>
-<filename>interfaces\libpq\Release\libpq.dll</filename>
- - The dynamically linkable frontend library
-</Para>
-</ListItem>
+    <itemizedlist spacing="compact" mark="bullet">
+     <listitem>
+      <para>
+       <filename>interfaces\libpq\Release\libpq.dll</filename>
+       - The dynamically linkable frontend library
+      </para>
+     </listitem>
 
-<ListItem>
-<Para>
-<filename>interfaces\libpq\Release\libpqdll.lib</filename>
- - Import library to link your program to libpq.dll
-</Para>
-</ListItem>
+     <listitem>
+      <para>
+       <filename>interfaces\libpq\Release\libpqdll.lib</filename>
+       - Import library to link your program to libpq.dll
+      </para>
+     </listitem>
 
-<ListItem>
-<Para>
-<filename>interfaces\libpq\Release\libpq.lib</filename> - Static library version of the frontend library
-</Para>
-</ListItem>
+     <listitem>
+      <para>
+       <filename>interfaces\libpq\Release\libpq.lib</filename> - Static library version of the frontend library
+      </para>
+     </listitem>
 
-<ListItem>
-<Para>
-<filename>bin\psql\Release\psql.exe</filename> - The <ProductName>Postgresql</ProductName> interactive SQL monitor
-</Para>
-</ListItem>
+     <listitem>
+      <para>
+       <filename>bin\psql\Release\psql.exe</filename> - The <productname>Postgresql</productname> interactive SQL monitor
+      </para>
+     </listitem>
 
-</ItemizedList>
-</Para>
+    </itemizedlist>
+   </para>
 
-</Sect1>
+  </sect1>
 
-<Sect1>
-<Title>Installing the libraries</Title>
-<Para>
-The only part of the library to really be installed is the 
-<filename>libpq.dll</filename> library. This file should in most cases 
-be placed in the <filename>WINNT\SYSTEM32</filename> directory (or in
-<filename>WINDOWS\SYSTEM</filename> on a Windows 95/98 system). If this
-file is installed using a setup program, it should be installed with
-version checking using the VERSIONINFO resource included in the file,
-to ensure that a newer version of the library is not overwritten.
-</Para>
-<Para>
-If you plan to do development using libpq on this machine, you will have
-to add the <filename>src\include</filename> and 
-<filename>src\interfaces\libpq</filename> directories to the include
-path in your compilers settings.
-</Para>
-</Sect1>
+  <sect1>
+   <title>Installing the libraries</title>
+   <para>
+    The only part of the library to really be installed is the 
+    <filename>libpq.dll</filename> library. This file should in most cases 
+    be placed in the <filename>WINNT\SYSTEM32</filename> directory (or in
+    <filename>WINDOWS\SYSTEM</filename> on a Windows 95/98 system). If this
+    file is installed using a setup program, it should be installed with
+    version checking using the VERSIONINFO resource included in the file,
+    to ensure that a newer version of the library is not overwritten.
+   </para>
+   <para>
+    If you plan to do development using libpq on this machine, you will have
+    to add the <filename>src\include</filename> and 
+    <filename>src\interfaces\libpq</filename> directories to the include
+    path in your compilers settings.
+   </para>
+  </sect1>
 
-<Sect1>
-<Title>Using the libraries</Title>
-<Para>
-To use the libraries, you must add the <filename>libpqdll.lib</filename>
-file to your project (in Visual C++, just right-click on the project and
-chose to add it).
-</Para>
-<Para>
-Once this is done, it should be possible to use the library just as you
-would on a Unix platform.
-</Para>
-</Sect1>
-
-</Chapter>
+  <sect1>
+   <title>Using the libraries</title>
+   <para>
+    To use the libraries, you must add the <filename>libpqdll.lib</filename>
+    file to your project (in Visual C++, just right-click on the project and
+    chose to add it).
+   </para>
+   <para>
+    Once this is done, it should be possible to use the library just as you
+    would on a Unix platform.
+   </para>
+  </sect1>
+ </chapter>
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:t
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -110,7 +109,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/install.sgml b/doc/src/sgml/install.sgml
index ef58efd41e..1856e94ec4 100644
--- a/doc/src/sgml/install.sgml
+++ b/doc/src/sgml/install.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.37 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <Chapter Id="install">
   <Title>Installation</Title>
 
@@ -12,31 +16,31 @@
    If you haven't gotten the <ProductName>PostgreSQL</ProductName> distribution,
    get it from <ULink url="ftp://ftp.postgresql.org">ftp.postgresql.org</ULink>,
    then unpack it:
-<ProgramListing>
+   <ProgramListing>
 gunzip postgresql-7.0.tar.gz
 tar -xf postgresql-7.0.tar
 mv postgresql-7.0 /usr/src
-</ProgramListing>
+   </ProgramListing>
   </Para>
 
   <Sect1>
    <Title>Before you start</Title>
 
-  <Para>
-   Building <Productname>PostgreSQL</Productname> requires <acronym>GNU</acronym>
-   <Application>make</Application>.  It will <Emphasis>not</Emphasis>
-   work with other <Application>make</Application> programs. On GNU/Linux systems
-   GNU make is the default tool, on other systems you may find that
-   GNU <Application>make</Application> is installed under the name <Quote>gmake</Quote>.
-   We will use that name from now on to indicate <acronym>GNU</acronym>
-   <Application>make</Application>, no matter what name it has on your system.
-   To test for <acronym>GNU</acronym> <Application>make</Application> enter
-<programlisting>
+   <Para>
+    Building <Productname>PostgreSQL</Productname> requires <acronym>GNU</acronym>
+    <Application>make</Application>.  It will <Emphasis>not</Emphasis>
+    work with other <Application>make</Application> programs. On GNU/Linux systems
+    GNU make is the default tool, on other systems you may find that
+    GNU <Application>make</Application> is installed under the name <Quote>gmake</Quote>.
+    We will use that name from now on to indicate <acronym>GNU</acronym>
+    <Application>make</Application>, no matter what name it has on your system.
+    To test for <acronym>GNU</acronym> <Application>make</Application> enter
+    <programlisting>
 <userinput>gmake --version</userinput>
-</programlisting>
-   If you need to get <acronym>GNU</acronym> <Application>make</Application>, you can
-   find it at <ULink url="ftp://ftp.gnu.org">ftp://ftp.gnu.org</ULink>.
-  </Para>
+    </programlisting>
+    If you need to get <acronym>GNU</acronym> <Application>make</Application>, you can
+    find it at <ULink url="ftp://ftp.gnu.org">ftp://ftp.gnu.org</ULink>.
+   </Para>
 
    <Para>
     Up to date information on supported platforms is at
@@ -600,7 +604,7 @@ and start experimenting.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -610,7 +614,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 048cda6246..a6e55e3b13 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,49 +1,8 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.8 2000/03/30 22:22:40 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.9 2000/03/31 03:27:40 thomas Exp $
 
 Postgres quick Installation Guide.
 - thomas 1998-10-26
-
-$Log: installation.sgml,v $
-Revision 1.8  2000/03/30 22:22:40  thomas
-Accumulated fixups.
-Add some chapters on new topics.
-Change to referencing OASIS/Docbook v3.1 rather than Davenport/Docbook v3.0
-Grepped for and fixed apparent tag mangling from emacs
- "Normalize" operation. Should be the last of those.
-
-Revision 1.7  1999/12/06 16:37:11  thomas
-Remove references to PostgreSQL as "public-domain" since that has a
- specific meaning wrt copyright (or lack thereof).
-
-Revision 1.6  1999/06/04 15:51:42  thomas
-Add blurb on new docs in release notes.
-Make minor info and markup changes for v6.5 release.
-
-Revision 1.5  1999/06/03 04:21:48  thomas
-Markup changes for v6.5 release.
-Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
-
-Revision 1.4  1999/05/26 17:30:29  thomas
-Add chapters on CVS access, MVCC, SQL theory to the docs.
-Add an appendix with more details on date/time attributes and handling.
-Update most references to Postgres version numbers to 6.5,
- *except* for the porting list which will require a report
- from a successful installation to be updated.
-
-Revision 1.3  1998/11/02 15:53:02  thomas
-Move configuration info to after installation procedure.
-Include only the current release  in the release notes section.
-
-Revision 1.2  1998/10/30 19:37:00  thomas
-Minor editing and markup changes as a result of preparing the Postscript
- documentation for v6.4.
-Bigger updates to the installation instructions (install and config).
-
-Revision 1.1  1998/10/27 06:11:08  thomas
-First cut at standalone installation guide to replace INSTALL text source.
-
-
 -->
 
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
@@ -164,7 +123,7 @@ and installing documentation, and then print or browse the
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -174,7 +133,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/intro-ag.sgml b/doc/src/sgml/intro-ag.sgml
index f7ad4c7818..ebf7e13b23 100644
--- a/doc/src/sgml/intro-ag.sgml
+++ b/doc/src/sgml/intro-ag.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/intro-ag.sgml,v 1.5 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="intro-ag">
   <title>Introduction</title>
 
@@ -37,7 +41,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/intro-pg.sgml b/doc/src/sgml/intro-pg.sgml
index a8cb214e4e..c9d4583430 100644
--- a/doc/src/sgml/intro-pg.sgml
+++ b/doc/src/sgml/intro-pg.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/intro-pg.sgml,v 1.8 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="intro-pg">
   <title>Introduction</title>
 
@@ -57,7 +61,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index eba5ac8581..0acf9a2689 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/intro.sgml,v 1.10 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="intro">
   <title>Introduction</title>
 
@@ -81,7 +85,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -91,7 +95,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml
index 0e2fc75b59..2db6ab0f9d 100644
--- a/doc/src/sgml/jdbc.sgml
+++ b/doc/src/sgml/jdbc.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.10 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="jdbc">
   <title>JDBC Interface</title>
 
@@ -2645,7 +2649,7 @@ document, and also includes precompiled drivers for v6.4, and earlier.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -2655,7 +2659,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/layout.sgml b/doc/src/sgml/layout.sgml
index 7a1ea320bb..46e265f443 100644
--- a/doc/src/sgml/layout.sgml
+++ b/doc/src/sgml/layout.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/layout.sgml,v 2.3 2000/03/31 03:27:40 thomas Exp $
+-->
+
 <chapter id="layout">
 <Title>System Layout</Title>
 
@@ -62,7 +66,7 @@ environment is properly set up.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -72,7 +76,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 278dc962e8..02da480b49 100644
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/legal.sgml,v 1.7 2000/03/31 03:27:40 thomas Exp $
+-->
+
 <sect1 id="copyright">
  <title>Copyrights and Trademarks</title>
 
@@ -43,7 +47,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -53,7 +57,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/libpgtcl.sgml b/doc/src/sgml/libpgtcl.sgml
index 724bbff597..dd6797b764 100644
--- a/doc/src/sgml/libpgtcl.sgml
+++ b/doc/src/sgml/libpgtcl.sgml
@@ -1,5 +1,5 @@
 <Chapter Id="pgtcl">
-<Title>pgtcl</Title>
+<Title>pgtcl - TCL Binding Library</Title>
 
 <Para>
 <literal>pgtcl</literal> is a tcl package for front-end programs 
diff --git a/doc/src/sgml/libpq++.sgml b/doc/src/sgml/libpq++.sgml
index 65cc873e28..8db88f6007 100644
--- a/doc/src/sgml/libpq++.sgml
+++ b/doc/src/sgml/libpq++.sgml
@@ -1,5 +1,9 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.13 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="libpqplusplus">
-  <title>libpq C++ Binding</title>
+  <title>libpq - C++ Binding Library</title>
   
   <para>
    <filename>libpq++</filename> is the C++ API to 
@@ -735,7 +739,7 @@ data.endcopy();
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -745,7 +749,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index c8cc2ee3e6..1188d02b7d 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,9 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.36 2000/03/31 03:27:40 thomas Exp $
+-->
+
  <chapter id="libpq-chapter">
-  <title id="libpq">libpq</title>
+  <title id="libpq">libpq - C Library</title>
 
   <para>
    <filename>libpq</filename> is the <acronym>C</acronym>
@@ -2350,7 +2354,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/lisp.sgml b/doc/src/sgml/lisp.sgml
index 08f4aca005..ecd5abed5f 100644
--- a/doc/src/sgml/lisp.sgml
+++ b/doc/src/sgml/lisp.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/lisp.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="lisp">
   <title id="lisp-title">Lisp Programming Interface</title>
 
@@ -88,7 +92,7 @@ Changes since last release:
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -98,7 +102,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index ae36251ee3..59e0985470 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.10 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="largeObjects">
   <title id="largeObjects-title">Large Objects</title>
 
@@ -521,7 +525,7 @@ SELECT lo_export(image.raster, '/tmp/motd') from image
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -531,7 +535,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index 6b66ff6d14..24e8399199 100644
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/manage-ag.sgml,v 2.7 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="manage-ag">
   <title>Managing a Database</title>
 
@@ -283,7 +287,7 @@ reload with
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -293,7 +297,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/manage.sgml b/doc/src/sgml/manage.sgml
index c2d44e546f..4fe540b881 100644
--- a/doc/src/sgml/manage.sgml
+++ b/doc/src/sgml/manage.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/manage.sgml,v 1.9 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="manage">
   <Title>Managing a Database</Title>
 
@@ -289,7 +293,7 @@ TBD
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -299,7 +303,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index a6a7399c9b..c612ae6a32 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.7 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="mvcc">
   <title>Multi-Version Concurrency Control</title>
 
@@ -542,7 +546,7 @@ ERROR:  Can't serialize access due to concurrent update
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -552,7 +556,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index b33034a1fc..053857c96e 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.8 2000/03/31 03:27:41 thomas Exp $
+-->
+
 <sect1 id="terminology">
  <title>Terminology</title>
 
@@ -111,7 +115,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -121,7 +125,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/odbc.sgml b/doc/src/sgml/odbc.sgml
index 783694f4f2..5008830ae3 100644
--- a/doc/src/sgml/odbc.sgml
+++ b/doc/src/sgml/odbc.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.14 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="odbc">
   <docinfo>
    <authorgroup>
@@ -1096,7 +1100,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/oper.sgml b/doc/src/sgml/oper.sgml
index 350cdb2c07..84979a548b 100644
--- a/doc/src/sgml/oper.sgml
+++ b/doc/src/sgml/oper.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/oper.sgml,v 1.15 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="operators">
   <Title id="operators-title">Operators</Title>
 
@@ -903,7 +907,7 @@ logical union
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -913,7 +917,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/pg_options.sgml b/doc/src/sgml/pg_options.sgml
index 15ac35f65f..7bb2b0b839 100644
--- a/doc/src/sgml/pg_options.sgml
+++ b/doc/src/sgml/pg_options.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/pg_options.sgml,v 1.5 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="pg-options-dev">
   <DocInfo>
    <AuthorGroup>
@@ -220,7 +224,7 @@ postgres <replaceable>options</replaceable> -T "verbose=2,query,hostlookup-"
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -230,7 +234,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/plan.sgml b/doc/src/sgml/plan.sgml
index ef30a1a2a7..f105eeccd1 100644
--- a/doc/src/sgml/plan.sgml
+++ b/doc/src/sgml/plan.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plan.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter>
   <title>Understanding Performance</title>
 
@@ -257,7 +261,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index d535359386..f02226b5d4 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/plperl.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="pl-perl">
   <title>Perl Procedural Language</title>
 
@@ -125,7 +129,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/plsql.sgml b/doc/src/sgml/plsql.sgml
index a501610c20..66fcdcbba9 100644
--- a/doc/src/sgml/plsql.sgml
+++ b/doc/src/sgml/plsql.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter>
   <title>PL/pgSQL</title>
 
@@ -897,7 +901,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 4318a141bf..ae1f3229ca 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter>
   <title>PL/Tcl</title>
 
@@ -495,7 +499,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/populate.sgml b/doc/src/sgml/populate.sgml
index e902c62798..391b96aa73 100644
--- a/doc/src/sgml/populate.sgml
+++ b/doc/src/sgml/populate.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/populate.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter>
   <title>Populating a Database</title>
 
@@ -69,7 +73,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 525ea3a53b..11b603f652 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.9 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="query">
   <title>The Query Language</title>
 
@@ -454,7 +458,7 @@ SELECT city, max(temp_lo)
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -464,7 +468,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 91c2c71c35..8a21874a2d 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.41 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="release">
   <title>Release Notes</title>
 
@@ -3275,7 +3279,7 @@ In general, however, v6.3 is substantially faster than previous releases (thanks
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -3285,7 +3289,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index b937471e53..bfcf237573 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.7 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="runtime">
   <Title>Runtime Environment</Title>
 
@@ -615,7 +619,7 @@ showportnumber
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -625,7 +629,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/security.sgml b/doc/src/sgml/security.sgml
index e1749cd1c2..55e9a969b8 100644
--- a/doc/src/sgml/security.sgml
+++ b/doc/src/sgml/security.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/security.sgml,v 1.8 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="security">
   <Title>Security</Title>
 
@@ -607,7 +611,7 @@ psql -h localhost -p 3333 -d mpw
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -617,7 +621,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 08a5e6073f..347c7efa99 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.2 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter>
   <title>Postgres Source Code</title>
 
@@ -70,7 +74,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index ecefb2696f..1df0a41c8a 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.7 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="sql">
   <title>SQL</title>
 
@@ -1822,7 +1826,7 @@ The only tuple returned by both parts of the query is the one having $SNO=2$.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -1832,7 +1836,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/start-ag.sgml b/doc/src/sgml/start-ag.sgml
index 547b26f968..0e6bd867c3 100644
--- a/doc/src/sgml/start-ag.sgml
+++ b/doc/src/sgml/start-ag.sgml
@@ -1,4 +1,5 @@
 <!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/start-ag.sgml,v 1.10 2000/03/31 03:27:41 thomas Exp $
 -	This file currently contains several small chapters.
 -	Each chapter should be split off into a separate source file...
 -	- thomas 1998-02-24
@@ -124,7 +125,7 @@ Creating Postgres database system directory /home/postgres/data/base
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -134,7 +135,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index eb390b6722..5589eca7f3 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.9 2000/03/31 03:27:41 thomas Exp $
+-->
+
 <Chapter Id="start">
 <Title>Getting Started</Title>
 
@@ -318,7 +322,7 @@ mydb=> \q
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:t
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -328,7 +332,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 30f57e5ccf..b668eb89e6 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.18 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="syntax">
   <title>SQL Syntax</title>
 
@@ -836,7 +840,7 @@ sqrt(emp.salary)
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -846,7 +850,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/trouble.sgml b/doc/src/sgml/trouble.sgml
index dae22b3372..49a8406c61 100644
--- a/doc/src/sgml/trouble.sgml
+++ b/doc/src/sgml/trouble.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/trouble.sgml,v 2.5 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="trouble">
   <Title>Troubleshooting</Title>
 
@@ -257,7 +261,7 @@ postgres <replaceable>options</replaceable> -T "verbose=2,query,hostlookup-"
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -267,7 +271,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 02a210ac0e..cbd6ec6a32 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -1,9 +1,10 @@
-<!-- tutorial.sgml
--
-- Postgres tutorial. Derived from postgres.sgml.
-- thomas 1998-02-23
--
-- -->
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/tutorial.sgml,v 1.9 2000/03/31 03:27:41 thomas Exp $
+
+Postgres tutorial. Derived from postgres.sgml.
+thomas 1998-02-23
+-->
+
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about    SYSTEM "about.sgml">
@@ -108,7 +109,7 @@ Your name here...
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -118,7 +119,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index d770f9cc61..674cf67f9c 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/user.sgml,v 1.18 2000/03/31 03:27:41 thomas Exp $
+-->
+
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!entity about      SYSTEM "about.sgml">
@@ -142,7 +146,7 @@ Your name here...
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -152,7 +156,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 7c4e855534..8d5cb93a2d 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/xaggr.sgml,v 1.7 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="xaggr">
   <title>Extending <acronym>SQL</acronym>: Aggregates</title>
 
@@ -165,7 +169,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 246772e90e..d049ed41a7 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.13 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <chapter id="xfunc">
   <title id="xfunc-title">Extending <acronym>SQL</acronym>: Functions</title>
 
@@ -1041,7 +1045,7 @@ memmove(destination-&gt;data, buffer, 40);
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -1051,7 +1055,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index b5f4a67f52..eb2d232ec2 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.10 2000/03/28 02:59:55 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.11 2000/03/31 03:27:41 thomas Exp $
 Postgres documentation
 -->
 
@@ -484,7 +484,7 @@ CREATE OPERATOR = (
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -494,7 +494,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml
index 153e365e12..a0513a7051 100644
--- a/doc/src/sgml/xoper.sgml
+++ b/doc/src/sgml/xoper.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/xoper.sgml,v 1.9 2000/03/31 03:27:41 thomas Exp $
+-->
+
  <Chapter Id="xoper">
   <Title>Extending <Acronym>SQL</Acronym>: Operators</Title>
 
@@ -448,7 +452,7 @@ SELECT (a + b) AS c FROM test_complex;
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -458,7 +462,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml
index 51c6647052..5c9fbd1a61 100644
--- a/doc/src/sgml/xplang.sgml
+++ b/doc/src/sgml/xplang.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/xplang.sgml,v 1.7 2000/03/31 03:27:42 thomas Exp $
+-->
+
  <chapter id="xplang">
   <title id="xplang-title">Procedural Languages</title>
 
@@ -142,7 +146,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/y2k.sgml b/doc/src/sgml/y2k.sgml
index d8420ef114..895a3d40ef 100644
--- a/doc/src/sgml/y2k.sgml
+++ b/doc/src/sgml/y2k.sgml
@@ -1,3 +1,7 @@
+<!--
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.5 2000/03/31 03:27:42 thomas Exp $
+-->
+
 <sect1 id="y2k">
  <title>Y2K Statement</title>
 
@@ -74,7 +78,7 @@
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -84,7 +88,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->