diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 2a7a8ae7787..6c2b2c0b2c1 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/biblio.sgml,v 1.17 2002/01/07 02:29:11 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/biblio.sgml,v 1.18 2002/01/08 18:03:25 petere Exp $
 -->
 
  <bibliography id="biblio">
@@ -12,7 +12,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/biblio.sgml,v 1.17 2002/01/07 02:29:11 pete
 
   <para>
    Some white papers and technical reports from the original
-   <productname>Postgres</productname> development team
+   <productname>POSTGRES</productname> development team
    are available at
    <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/">
     the University of California, Berkeley, Computer Science
@@ -100,6 +100,26 @@ $Header: /cvsroot/pgsql/doc/src/sgml/biblio.sgml,v 1.17 2002/01/07 02:29:11 pete
     </copyright>
    </biblioentry>
 
+  <biblioentry id="ELMA99">
+   <title>Fundamentals of Database Systems</title>
+   <edition>3rd Edition</edition>
+   <authorgroup>
+    <author>
+     <firstname>Ramez</firstname>
+     <surname>Elmasri</surname>
+    </author>
+    <author>
+     <firstname>Shamkant</firstname>
+     <surname>Navathe</surname>
+    </author>
+   </authorgroup>
+   <isbn>0-805-31755-4</isbn>
+   <pubdate>August 1999</pubdate>
+   <publisher>
+    <publishername>Addison-Wesley</publishername>
+   </publisher>
+  </biblioentry>
+
    <biblioentry id="MELT93">
     <title>Understanding the New <acronym>SQL</acronym></title>
     <titleabbrev>Melton and Simon, 1993</titleabbrev>
@@ -476,6 +496,21 @@ ssimkovi@ag.or.at
     </confgroup>
    </biblioentry>
 
+  <biblioentry id="FONG">
+   <biblioset relation="article">
+    <title>The Design and Implementation of the Postgres Query Optimizer</title>
+    <author>
+     <firstname>Z.</firstname>
+     <surname>Fong</surname>
+    </author>
+    <publisher>
+     <publishername>University of California, Berkeley Computer Science Department</publishername>
+    </publisher>
+
+    <bibliomisc>file <filename>planner/Report.ps</filename> in the <quote>postgres-papers</quote> distribution</bibliomisc>
+   </biblioset>
+  </biblioentry>
+
   </bibliodiv>
  </bibliography>
 
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 95f99b11886..5483c633c6a 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.21 2002/01/08 05:39:26 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.22 2002/01/08 18:03:26 petere Exp $
 Genetic Optimizer
 -->
 
@@ -259,113 +259,46 @@ Genetic Optimizer
    </sect2>
   </sect1>
 
-   <bibliography id="geqo-biblio">
-    <title>
-     References
-    </title>
-    <para>Reference information for <acronym>GEQ</acronym> algorithms.
-    </para>
-    <biblioentry>
+ <sect1 id="geqo-biblio">
+  <title>Further Readings</title>
 
-     <bookbiblio>
-      <title>
-       The Hitch-Hiker's Guide to Evolutionary Computation
-      </title>
-      <authorgroup>
-       <author>
-	<firstname>J&ouml;rg</firstname>
-	<surname>Heitk&ouml;tter</surname>
-       </author>
-       <author>
-	<firstname>David</firstname>
-	<surname>Beasley</surname>
-       </author>
-      </authorgroup>
-      <publisher>
-       <publishername>
-	InterNet resource
-       </publishername>
-      </publisher>
-      <abstract>
-       <para>
-	FAQ in <ulink url="news://comp.ai.genetic">comp.ai.genetic</ulink>
-	is available at <ulink
-	url="http://surf.de.uu.net/encore/www/">here</ulink>.
-       </para>
-      </abstract>
-     </bookbiblio>
+  <para>
+   The following resources contain additional information about
+   genetic algorithms:
 
-     <bookbiblio>
-      <title>
-       Evolutionary Computation and its application to art and design
+   <itemizedlist>
+    <listitem>
+     <para>
+      <ulink url="http://surf.de.uu.net/encore/www/">The Hitch-Hiker's
+      Guide to Evolutionary Computation</ulink> (FAQ for <ulink
+      url="news://comp.ai.genetic">comp.ai.genetic</ulink>)
+     </para>
+    </listitem>
+   
+    <listitem>
+     <para>
+      <ulink url="http://www.red3d.com/cwr/evolve.html">Evolutionary
+       Computation and its application to art and design</ulink> by
+      Craig Reynolds
+     </para>
+    </listitem>
 
-      </title>
-      <authorgroup>
-       <author>
-	<firstname>Craig</firstname>
-	<surname>Reynolds</surname>
-       </author>
-      </authorgroup>
-      <publisher>
-       <publishername>
-	InterNet resource
-       </publishername>
-      </publisher>
-      <abstract>
-       <para>
-	The URL is <ulink
-	url="http://www.red3d.com/cwr/evolve.html">here</ulink>.
-       </para>
-      </abstract>
-     </bookbiblio>
+    <listitem>
+     <para>
+      <xref linkend="ELMA99">
+     </para>
+    </listitem>
 
-     <bookbiblio>
-      <title>
-       The Design and Implementation of the Postgres Query Optimizer
-      </title>
-      <authorgroup>
-       <author>
-	<firstname>Z.</firstname>
-	<surname>Fong</surname>
-       </author>
-      </authorgroup>
-      <publisher>
-       <publishername>
-	University of California, Berkeley Computer Science Department
-       </publishername>
-      </publisher>
-      <abstract>
-       <para>
-	File <filename>planner/Report.ps</filename> in the 'postgres-papers' distribution.
-       </para>
-      </abstract>
-     </bookbiblio>
+    <listitem>
+     <para>
+      <xref linkend="FONG">
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
 
-     <bookbiblio>
-      <title>
-       Fundamentals of Database Systems
-      </title>
-      <authorgroup>
-       <author>
-	<firstname>R.</firstname>
-	<surname>Elmasri</surname>
-       </author>
-       <author>
-	<firstname>S.</firstname>
-	<surname>Navathe</surname>
-       </author>
-      </authorgroup>
-      <publisher>
-       <publishername>
-	The Benjamin/Cummings Pub., Inc.
-       </publishername>
-      </publisher>
-     </bookbiblio>
-
-    </biblioentry>
-   </bibliography>
-
- </chapter>
+ </sect1>
+</chapter>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl
index 50f92730edc..b6eb0af84e7 100644
--- a/doc/src/sgml/stylesheet.dsl
+++ b/doc/src/sgml/stylesheet.dsl
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.16 2001/11/08 23:46:29 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/stylesheet.dsl,v 1.17 2002/01/08 18:03:26 petere Exp $ -->
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 
 <!-- must turn on one of these with -i on the jade command line -->
@@ -71,6 +71,7 @@
 
 (define (biblioentry-inline-elements)
   (list
+   (normalize "author")
    (normalize "authorgroup")
    (normalize "title")
    (normalize "subtitle")   
@@ -87,7 +88,8 @@
    (normalize "pubsnumber")
    (normalize "date")
    (normalize "pubdate")
-   (normalize "pagenums")))
+   (normalize "pagenums")
+   (normalize "bibliomisc")))
 
 (mode biblioentry-inline-mode