diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index aa83257a0b2bb348dc9651f6f86952d9c0e13630..217ed9574bce3333a23ebf820680f5033c016e55 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="arch-dev">
 	<TITLE>Architecture</TITLE>
 
 <Sect1>
diff --git a/doc/src/sgml/arch-pg.sgml b/doc/src/sgml/arch-pg.sgml
index 5a22fd36e7161797ccde9e9646eb69ea507bd79f..3b03811418ca53b98d03fe6501bc2483d1786d79 100644
--- a/doc/src/sgml/arch-pg.sgml
+++ b/doc/src/sgml/arch-pg.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="arch-pg">
 	<TITLE>Architecture</TITLE>
 
 <Sect1>
diff --git a/doc/src/sgml/arch.sgml b/doc/src/sgml/arch.sgml
index b1404b353ccb117019e73cee1e8a086e2321d757..aeb53207c07bd63a5d3f056e1a412c421ff0a372 100644
--- a/doc/src/sgml/arch.sgml
+++ b/doc/src/sgml/arch.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="arch">
 	<TITLE>Architecture</TITLE>
 
 <Sect1>
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 1cae84a3edd60af34d6a0f5c637cd05bf448a3c6..2f48936a2f6103d0f27a62c13cf7b65f939e22d2 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -1,4 +1,4 @@
-<BIBLIOGRAPHY>
+<BIBLIOGRAPHY Id="biblio">
 <Title><Acronym>SQL</Acronym> References</Title>
 
 <Para>
@@ -167,7 +167,7 @@ Selected references and readings for <Acronym>SQL</Acronym> and <ProductName>Pos
 <!--
 <BIBLIOMISC>&dash;</BIBLIOMISC>
 
-<BOOKBIBLIO ID="REFERENCE">
+<BOOKBIBLIO ID="POSTGRES-REFERENCE">
 -->
 <TITLE>The <ProductName>PostgreSQL</ProductName> Reference Manual</TITLE>
 <Editor>
@@ -205,7 +205,7 @@ Selected references and readings for <Acronym>SQL</Acronym> and <ProductName>Pos
 -->
 </BIBLIOENTRY>
 
-<BIBLIOENTRY ID="REFERENCE">
+<BIBLIOENTRY ID="POSTGRES-USERS">
 <!--
 <BIBLIOMISC>&dash;</BIBLIOMISC>
 
diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml
index 8979cfdbdcc56580b201cec3f5faec9b1ee8a60d..bb82e53a2c91d126ab5845901c6eaa93f0503c8b 100644
--- a/doc/src/sgml/contacts.sgml
+++ b/doc/src/sgml/contacts.sgml
@@ -1,13 +1,25 @@
-<Appendix label="B">
+<Appendix Label="B" Id="contacts">
 <Title>Contacts</Title>
 
-<Sect1>
-<Title>Introduction</Title>
+<!--
 <Para>
+Support for <productname>Postgres</productname> comes primarily from
+this printed documentation, the web-based mailing list archives,
+and the mailing lists themselves.
 </Para>
 
-<Sect1>
+<Sect1 id="mailing-list">
+<Title>Mailing Lists</Title>
+
+<Para>
+Refer to the introduction in this manual or to the
+<ulink url="postgresql.org"><productname>Postgres</productname> web page</ulink>
+ for subscription information to the no-cost mailing lists.
+</Para>
+
+<Sect1 id="people">
 <Title>People</Title>
+-->
 
 <Para>
 <ItemizedList Mark="bullet" Spacing="compact">
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 61abf13ca431b1aef9dae0d97108813559829e7d..0f67b82b012cf199a688e35345571a4cc4444ca0 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="geqo">
 <DocInfo>
 <Author>
 <FirstName>Martin</FirstName>
@@ -274,7 +274,7 @@ Suggestions are welcome :-(
 Enable bushy query tree processing within <ProductName>Postgres</ProductName>;
 that may improve the quality of query plans.
 
-<BIBLIOGRAPHY>
+<BIBLIOGRAPHY Id="geqo-references">
 <TITLE>
 References
 </TITLE>
diff --git a/doc/src/sgml/intro-pg.sgml b/doc/src/sgml/intro-pg.sgml
index 1f9cd52f56abc7a5d679bbff7fca725af99d43f5..78cf982390274b29e580c83ec68925815accef49 100644
--- a/doc/src/sgml/intro-pg.sgml
+++ b/doc/src/sgml/intro-pg.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="intro-pg">
 <TITLE>Introduction</TITLE>
 
 <Para>
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 9c0e81c1b0d3fd5ac87811e6983d613adfb7e4e3..45b42e43ccab9043db566365f6e09c66b69735d3 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="intro">
 <TITLE>Introduction</TITLE>
 
 <Para>
diff --git a/doc/src/sgml/libpgtcl.sgml b/doc/src/sgml/libpgtcl.sgml
index 82c267a4563f4722cc61a93661169be43db36e0f..7adae80f31c11dc7be11ac7dd6efb0558c645bed 100644
--- a/doc/src/sgml/libpgtcl.sgml
+++ b/doc/src/sgml/libpgtcl.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="pgtcl">
 <Title>pgtcl</Title>
 
 <Para>
@@ -516,6 +516,8 @@ parameter, the request is established, or the command string of an already
 existing request is replaced.  With no callbackCommand parameter, a prior
 request is canceled.
 </PARA>
+
+<para>
 After a <PARA><FUNCTION>pg_listen</FUNCTION> request is established,
 the specified command string is executed whenever a NOTIFY message bearing
 the given name arrives from the backend.  This occurs when any
diff --git a/doc/src/sgml/ports.sgml b/doc/src/sgml/ports.sgml
index f6700d1b839274010f6788878d608a25a765189d..23aab0888d2247a77f32f2469ec2cf7096e3fc55 100644
--- a/doc/src/sgml/ports.sgml
+++ b/doc/src/sgml/ports.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="ports">
 <Title>Ports</Title>
 
 <Sect1>
@@ -6,7 +6,7 @@
 
 <Para>
      <ProductName>Postgres</ProductName>  is  available  free  of charge. This manual
-     describes version 6.3 of <ProductName>Postgres</ProductName>.  The authors  have
+     describes version 6.4 of <ProductName>Postgres</ProductName>.  The authors  have
      compiled  and  tested <ProductName>Postgres</ProductName> on the following 
      platforms:
 
@@ -54,6 +54,13 @@
     <ENTRY>1998-03-01</ENTRY>
     <ENTRY>(<ULink url="mailto:brook@trillium.NMSU.Edu">Brook Milligan</ULink>)</ENTRY>
   </ROW>
+  <ROW>
+    <ENTRY>NetBSD 1.3</ENTRY>
+    <ENTRY>NS32532</ENTRY>
+    <ENTRY>v6.3</ENTRY>
+    <ENTRY>1998-07-20</ENTRY>
+    <ENTRY>(<ULink url="mailto:phil@steelhead.cs.wwu.edu">Phil Nelson</ULink>)</ENTRY>
+  </ROW>
   <ROW>
     <ENTRY>NetBSD 1.3</ENTRY>
     <ENTRY>Sparc</ENTRY>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 820b39cfddf857ca32343b34453b7aa7a96ee103..65410985877ef2b9314d333f0deb3302e04dded4 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -73,7 +73,7 @@
 <!entity contacts SYSTEM "contacts.sgml">
 ]>
 <!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
-<Book>
+<Book Id="postgres">
 
 <!-- Title information -->
 
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index e05e99ed9a9e67bf5ad696b03de6b2184a3f7fc4..17aeca12899609eb48d31e5fa2d6f04c1a4ef071 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -13,7 +13,7 @@
 <!entity biblio     SYSTEM "biblio.sgml">
 <!entity contacts   SYSTEM "contacts.sgml">
 ]>
-<Book>
+<Book Id="reference">
 
 <!-- Title information -->
 
@@ -80,7 +80,7 @@ Your name here...
 </Dedication>
 -->
 
-<Preface>
+<Preface Id="preface">
 <Title>Summary</Title>
 
 <Para>
@@ -104,7 +104,8 @@ It provides SQL92/SQL3 language support,
 &contacts;
 &biblio;
 
-<INDEX> </INDEX>
+<index Id="index">
+</index>
 
 </Book>
 
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index d6d77425f37c0b04d53e7fa78800b10da63a4d12..d61d7650b28b318ee5a9abe83b8bf4701a068726 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="release">
 <Title>Release Notes</Title>
 
 <Para>
@@ -228,7 +228,7 @@ Old-style <quote>time travel</quote> has been removed. Performance has been impr
 <note>
 <para>
 Bruce Momjian wrote the following notes to introduce the new release.
-<note>
+</note>
 
 <para>
 There are some general 6.3 issues that I want to mention.  These are
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index bd6dc001607cc40da2e89495f850e7e5d14727ac..0567e3a554476c216a7b333e39d7b28574673bbc 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="start">
 <Title>Getting Started</Title>
 
 <Abstract>