diff --git a/doc/src/sgml/libpgtcl.sgml b/doc/src/sgml/libpgtcl.sgml
index 7adae80f31c11dc7be11ac7dd6efb0558c645bed..7bc254ac7722af866cc9e006df2b05af7c708fd8 100644
--- a/doc/src/sgml/libpgtcl.sgml
+++ b/doc/src/sgml/libpgtcl.sgml
@@ -148,7 +148,7 @@ proc getDBs { {host "localhost"} {port "5432"} } {
 <Sect1>
 <Title>pgtcl Command Reference Information</Title>
 
-<REFENTRY ID="PGTCL-PGCONNECT-1">
+<REFENTRY ID="PGTCL-PGCONNECT">
 <REFMETA>
 <REFENTRYTITLE>pg_connect</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Connection Management</REFMISCINFO>
@@ -266,7 +266,7 @@ The return result is either an error message or a handle for a database
 </REFSECT1>
 </REFENTRY>
 
-<REFENTRY ID="PGTCL-PGDISCONNECT-1">
+<REFENTRY ID="PGTCL-PGDISCONNECT">
 <REFMETA>
 <REFENTRYTITLE>pg_disconnect</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Connection Management</REFMISCINFO>
@@ -338,7 +338,7 @@ pg_disconnect <REPLACEABLE CLASS="PARAMETER">dbHandle</REPLACEABLE>
 
 </REFENTRY>
 
-<REFENTRY ID="PGTCL-PGEXEC-1">
+<REFENTRY ID="PGTCL-PGEXEC">
 <REFMETA>
 <REFENTRYTITLE>pg_exec</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Connection Management</REFMISCINFO>
@@ -424,7 +424,7 @@ and a result number.
 </PARA>
 </REFSECT1>
 
-<REFENTRY ID="PGTCL-PGLISTEN-1">
+<REFENTRY ID="PGTCL-PGLISTEN">
 <REFMETA>
 <REFENTRYTITLE>pg_listen</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Asynchronous Notify</REFMISCINFO>
@@ -535,7 +535,7 @@ the idle loop to be entered.
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGSELECT-1">
+<REFENTRY ID="PGTCL-PGSELECT">
 <REFMETA>
 <REFENTRYTITLE>pg_select</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Connection Management</REFMISCINFO>
@@ -662,7 +662,7 @@ pg_select <REPLACEABLE CLASS="PARAMETER">dbHandle</REPLACEABLE> <REPLACEABLE CLA
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGRESULT-1">
+<REFENTRY ID="PGTCL-PGRESULT">
 <REFMETA>
 <REFENTRYTITLE>pg_result</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Connection Management</REFMISCINFO>
@@ -847,7 +847,7 @@ clear the result buffer. Do not reuse after this
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOCREAT-1">
+<REFENTRY ID="PGTCL-PGLOCREAT">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_creat</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -940,7 +940,7 @@ The OR delimiter character is "|".
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOOPEN-1">
+<REFENTRY ID="PGTCL-PGLOOPEN">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_open</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1038,7 +1038,7 @@ Mode can be either "r", "w", or "rw".
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOCLOSE-1">
+<REFENTRY ID="PGTCL-PGLOCLOSE">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_close</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1117,7 +1117,7 @@ A file descriptor for use in later pg_lo* routines.
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOREAD-1">
+<REFENTRY ID="PGTCL-PGLOREAD">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_read</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1216,7 +1216,7 @@ at most <REPLACEABLE CLASS="PARAMETER">len</REPLACEABLE> bytes from a large obje
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOWRITE-1">
+<REFENTRY ID="PGTCL-PGLOWRITE">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_write</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1316,7 +1316,7 @@ the actual string to write, not a variable name.
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOLSEEK-1">
+<REFENTRY ID="PGTCL-PGLOLSEEK">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_lseek</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1415,7 +1415,7 @@ can be "SEEK_CUR", "SEEK_END", or "SEEK_SET".
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOTELL-1">
+<REFENTRY ID="PGTCL-PGLOTELL">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_tell</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1505,7 +1505,7 @@ to <REPLACEABLE CLASS="PARAMETER">offset</REPLACEABLE> in bytes from the beginni
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOUNLINK-1">
+<REFENTRY ID="PGTCL-PGLOUNLINK">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_unlink</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1587,7 +1587,7 @@ None
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOIMPORT-1">
+<REFENTRY ID="PGTCL-PGLOIMPORT">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_import</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
@@ -1670,7 +1670,7 @@ XXX Does this return a lobjId? Is that the same as the objOid in other calls? th
 
 <!-- ********************************************************** -->
 
-<REFENTRY ID="PGTCL-PGLOEXPORT-1">
+<REFENTRY ID="PGTCL-PGLOEXPORT">
 <REFMETA>
 <REFENTRYTITLE>pg_lo_export</REFENTRYTITLE>
 <REFMISCINFO>PGTCL - Large Objects</REFMISCINFO>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 0316f079e3edb8922d205ab0ab1bca16edeaba62..c184ff2846078a62509ce9085cee001a97c9bbb8 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,4 +1,4 @@
-<Chapter Id="spi">
+<Chapter id="spi">
 <DocInfo>
 <AuthorGroup>
 <Author>
@@ -60,7 +60,7 @@ On error, a negative or NULL result will be returned.
 <Sect1>
 <Title>Interface Functions</Title>
 
-<REFENTRY ID="SPI-SPICONNECT-1">
+<REFENTRY ID="SPI-SPICONNECT">
 <REFMETA>
 <REFENTRYTITLE>SPI_connect</REFENTRYTITLE>
 <REFMISCINFO>SPI - Connection Management</REFMISCINFO>
@@ -191,7 +191,7 @@ Return status
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIFINISH-1">
+<REFENTRY ID="SPI-SPIFINISH">
 <REFMETA>
 <REFENTRYTITLE>SPI_finish</REFENTRYTITLE>
 <REFMISCINFO>SPI - Connection Management</REFMISCINFO>
@@ -316,7 +316,7 @@ SPI_finish(void)
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIEXEC-1">
+<REFENTRY ID="SPI-SPIEXEC">
 <REFMETA>
 <REFENTRYTITLE>SPI_exec</REFENTRYTITLE>
 <REFMISCINFO>SPI - Connection Management</REFMISCINFO>
@@ -573,7 +573,7 @@ You may pass many queries in one string or query string may be
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIPREPARE-1">
+<REFENTRY ID="SPI-SPIPREPARE">
 <REFMETA>
 <REFENTRYTITLE>SPI_prepare</REFENTRYTITLE>
 <REFMISCINFO>SPI - Plan Preparation</REFMISCINFO>
@@ -728,7 +728,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPISAVEPLAN-1">
+<REFENTRY ID="SPI-SPISAVEPLAN">
 <REFMETA>
 <REFENTRYTITLE>SPI_saveplan</REFENTRYTITLE>
 <REFMISCINFO>SPI - Plan Storage</REFMISCINFO>
@@ -883,7 +883,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIEXECP-1">
+<REFENTRY ID="SPI-SPIEXECP">
 <REFMETA>
 <REFENTRYTITLE>SPI_execp</REFENTRYTITLE>
 <REFMISCINFO>SPI - Plan Execution</REFMISCINFO>
@@ -1099,7 +1099,7 @@ procedures.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPICOPYTUPLE-1">
+<REFENTRY ID="SPI-SPICOPYTUPLE">
 <REFMETA>
 <REFENTRYTITLE>SPI_copytuple</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Copy</REFMISCINFO>
@@ -1213,7 +1213,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIMODIFYTUPLE-1">
+<REFENTRY ID="SPI-SPIMODIFYTUPLE">
 <REFMETA>
 <REFENTRYTITLE>SPI_modifytuple</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Modify</REFMISCINFO>
@@ -1398,7 +1398,7 @@ is not changed.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIFNUMBER-1">
+<REFENTRY ID="SPI-SPIFNUMBER">
 <REFMETA>
 <REFENTRYTITLE>SPI_fnumber</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -1518,7 +1518,7 @@ Attribute numbers are 1 based.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIFNAME-1">
+<REFENTRY ID="SPI-SPIFNAME">
 <REFMETA>
 <REFENTRYTITLE>SPI_fname</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -1638,7 +1638,7 @@ Returns a newly-allocated copy of the attribute name.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIGETVALUE-1">
+<REFENTRY ID="SPI-SPIGETVALUE">
 <REFMETA>
 <REFENTRYTITLE>SPI_getvalue</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -1774,7 +1774,7 @@ Allocates memory as required by the value.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIGETBINVAL-1">
+<REFENTRY ID="SPI-SPIGETBINVAL">
 <REFMETA>
 <REFENTRYTITLE>SPI_getbinval</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -1920,7 +1920,7 @@ Does not allocate new space for the binary value.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIGETTYPE-1">
+<REFENTRY ID="SPI-SPIGETTYPE">
 <REFMETA>
 <REFENTRYTITLE>SPI_gettype</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -2046,7 +2046,7 @@ Does not allocate new space for the binary value.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIGETTYPEID-1">
+<REFENTRY ID="SPI-SPIGETTYPEID">
 <REFMETA>
 <REFENTRYTITLE>SPI_gettypeid</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -2172,7 +2172,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIGETRELNAME-1">
+<REFENTRY ID="SPI-SPIGETRELNAME">
 <REFMETA>
 <REFENTRYTITLE>SPI_getrelname</REFENTRYTITLE>
 <REFMISCINFO>SPI - Tuple Information</REFMISCINFO>
@@ -2274,7 +2274,7 @@ Copies the relation name into new storage.
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIPALLOC-1">
+<REFENTRY ID="SPI-SPIPALLOC">
 <REFMETA>
 <REFENTRYTITLE>SPI_palloc</REFENTRYTITLE>
 <REFMISCINFO>SPI - Memory Management</REFMISCINFO>
@@ -2378,7 +2378,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIREPALLOC-1">
+<REFENTRY ID="SPI-SPIREPALLOC">
 <REFMETA>
 <REFENTRYTITLE>SPI_repalloc</REFENTRYTITLE>
 <REFMISCINFO>SPI - Memory Management</REFMISCINFO>
@@ -2492,7 +2492,7 @@ TBD
 <!-- *********************************************** -->
 <!-- *********************************************** -->
 
-<REFENTRY ID="SPI-SPIPFREE-1">
+<REFENTRY ID="SPI-SPIPFREE">
 <REFMETA>
 <REFENTRYTITLE>SPI_pfree</REFENTRYTITLE>
 <REFMISCINFO>SPI - Memory Management</REFMISCINFO>