diff --git a/doc/src/sgml/admin.sgml b/doc/src/sgml/admin.sgml
index de0f6a3f7a0005cb9add73ca3dd473f45ab92ecb..c7bbe53220e04531738d7e101361fe517265daa2 100644
--- a/doc/src/sgml/admin.sgml
+++ b/doc/src/sgml/admin.sgml
@@ -18,7 +18,7 @@
 <!entity biblio   SYSTEM "biblio.sgml">
 ]>
 <!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
-<Book>
+<Book Id="admin">
 
 <!-- Title information -->
 
diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index c9d2256b198c90d829358231c477a0b8066a308d..f0709c3ea83a887ff9db38c1a54d05fe1781e6a3 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="advanced">
 <Title>Advanced <ProductName>Postgres</ProductName> <Acronym>SQL</Acronym> Features</Title>
 
 <Para>
diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml
index aada6f71c6598ad46e6dc107a2d6574b374063e1..e6f54b675ace4a67322659e7ebdfeb6209b99cea 100644
--- a/doc/src/sgml/array.sgml
+++ b/doc/src/sgml/array.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="arrays">
 <Title>Arrays</Title>
 
 <Para>
diff --git a/doc/src/sgml/compiler.sgml b/doc/src/sgml/compiler.sgml
index 5d9c0eb07555ce5288057f95a431813c04e40aff..f04b48b0ee6a6127a9d461649a52cd8dfd98bb29 100644
--- a/doc/src/sgml/compiler.sgml
+++ b/doc/src/sgml/compiler.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="compiler">
 <DocInfo>
 <AuthorGroup>
 <Author>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 0d7b03596cfa0f6c34f1c94a4d09ca0fdb047ac7..db84f5ae172f6587ef82fa9eafcb077dfd3c2b65 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="datatype">
 <Title>Data Types</Title>
 
 <Abstract>
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index d4097e77404eefd7f25974614cfc58462915ac3c..4cd047ab34303daac54c7655327c2ec8a0a83ec1 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="dfunc">
 <Title>Linking Dynamically-Loaded Functions</Title>
 
 <Para>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 32fd459e52536b8a13a51ec9ec8f18ecaf280da3..cf7681b926e7dc5665fd4c3eacb5fa3d3417c62a 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="ecpg">
 <DocInfo>
 <AuthorGroup>
 <Author>
diff --git a/doc/src/sgml/environ.sgml b/doc/src/sgml/environ.sgml
index 64d9506423ea1e221c9df64472ef73a1126c0e82..862ccbdbdaa559de1ab7281fa415100e8f41210f 100644
--- a/doc/src/sgml/environ.sgml
+++ b/doc/src/sgml/environ.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="environ">
 <Title>Setting Up Your Environment</Title>
 
 <Para>
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index fe790b2542daf260f9497cb476b86921e391ca7a..bddaafb091d26fc8d32cf0bc612a466fc754b0a9 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="extend">
 <Title>Extending <Acronym>SQL</Acronym>: An Overview</Title>
 
 <Para>
diff --git a/doc/src/sgml/func-ref.sgml b/doc/src/sgml/func-ref.sgml
index 66f476fb2e9d21ad362c679a4e2408467e05a171..129a9d2473a7be1db70a30363c6d912603abcfb3 100644
--- a/doc/src/sgml/func-ref.sgml
+++ b/doc/src/sgml/func-ref.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="func-ref">
 <Title>Functions</Title>
 
 <Abstract>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index 63feea7ee2cb421fec1e9a863696c8891bdf92c7..84273b4ffc5f4a15618f8e5206d3629146ead88e 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="gist">
 <DocInfo>
 <AuthorGroup>
 <Author>
diff --git a/doc/src/sgml/inherit.sgml b/doc/src/sgml/inherit.sgml
index be2bcfa237fe1834fe3d266eece793f405359d8b..9d6cecf1b35ebad9ef0aa0505c43b5492e278c1e 100644
--- a/doc/src/sgml/inherit.sgml
+++ b/doc/src/sgml/inherit.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="inherit">
 <Title>Inheritance</Title>
 
 <Para>
diff --git a/doc/src/sgml/install.sgml b/doc/src/sgml/install.sgml
index 9a67c98640b20f466d8c3e07bc0cd607305c46e7..7a4803ddca3ed4c221224b4b1a67149bf9f3689e 100644
--- a/doc/src/sgml/install.sgml
+++ b/doc/src/sgml/install.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="install">
 <Title>Installation</Title>
 
 <Abstract>
diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml
index 3b7279762dfa99faf014e0709f4f1340f35c7a0f..35f137e48b2316455b5040588e2048fe70cbe2ee 100644
--- a/doc/src/sgml/jdbc.sgml
+++ b/doc/src/sgml/jdbc.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="jdbc">
 <Title>JDBC Interface</Title>
 
 <Para>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 5dcab58900747b126d3c48867fad61de6921d30a..b165e1d91f52639a5118ea4f11e60b7923d298e2 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="libpq">
 <Title><FileName>libpq</FileName></Title>
 
 <Para>
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 8462de950728982b8286b7fede908764cd665272..a7bed5001a520754479cf97b7abc6e0fe87c4ea4 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="largeObjects">
 <Title>Large Objects</Title>
 
 <Para>
diff --git a/doc/src/sgml/manage.sgml b/doc/src/sgml/manage.sgml
index 332dc2459da98e9eb62795ec7fff5b6f846470e0..22c0a918394d6946514ddbe6d991ac289146867e 100644
--- a/doc/src/sgml/manage.sgml
+++ b/doc/src/sgml/manage.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="manage">
 <Title>Managing a Database</Title>
 
 <Para>
diff --git a/doc/src/sgml/odbc.sgml b/doc/src/sgml/odbc.sgml
index cb75579b6b6b1bfe88f40c459b7513db05400a50..c9e2d5821ca00f1ee07d382d424eaae893f03ca5 100644
--- a/doc/src/sgml/odbc.sgml
+++ b/doc/src/sgml/odbc.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="odbc">
 <DocInfo>
 <AuthorGroup>
 <Author>
diff --git a/doc/src/sgml/pgaccess.sgml b/doc/src/sgml/pgaccess.sgml
index 9404e71b4e1cae52d083b399c509b7500c4674ac..90e02cd0441f6093e5661ea6d7840488c4216af8 100644
--- a/doc/src/sgml/pgaccess.sgml
+++ b/doc/src/sgml/pgaccess.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="pgaccess">
 <Title><Command>pgaccess</Command></Title>
 
 <Para>
diff --git a/doc/src/sgml/programmer.sgml b/doc/src/sgml/programmer.sgml
index f8e95c8dd11869078a35c8245a2150143f77ee8a..38a74e3457e27eb6837d47481e9043e31ccf7f36 100644
--- a/doc/src/sgml/programmer.sgml
+++ b/doc/src/sgml/programmer.sgml
@@ -59,7 +59,7 @@
 <!entity contacts SYSTEM "contacts.sgml">
 ]>
 <!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
-<Book>
+<Book Id="programmer">
 
 <!-- Title information -->
 
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 1fd64282a51da224b09609324da10320ab79be87..3f87d58f171466024904dd4c4792823220345e70 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="protocol">
 <DocInfo>
 <Author>
 <FirstName>Phil</FirstName>
diff --git a/doc/src/sgml/psql.sgml b/doc/src/sgml/psql.sgml
index 28ff1cd9a24b369fb5c6de551684a884b066163c..1846eaead4aafbec4a1805b18bace78789e9d6df 100644
--- a/doc/src/sgml/psql.sgml
+++ b/doc/src/sgml/psql.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="psql">
 <Title><Command>psql</Command></Title>
 
 <Para>
diff --git a/doc/src/sgml/query-ug.sgml b/doc/src/sgml/query-ug.sgml
index abd496f5f5032af5359e881f4236a56e1d3e521b..6d4112ce2bd52473b59dcff19b19f4c7f5ba9728 100644
--- a/doc/src/sgml/query-ug.sgml
+++ b/doc/src/sgml/query-ug.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="query-ug">
 <TITLE>The Query Language</TITLE>
 
 <Para>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index df119fd365ad7ab1dfcb0abf35e8d0b5f5225c83..52f230235c14f6ebec5fee3c5d7ab34d4711304d 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,4 +1,4 @@
-<Chapter ID="QUERY">
+<Chapter ID="query">
 <TITLE>The Query Language</TITLE>
 
 <Para>
diff --git a/doc/src/sgml/recovery.sgml b/doc/src/sgml/recovery.sgml
index 2eec4e885e420df7cb637fc6528de0401c36fe02..ba19b6ed6c5ab59dceff286575237b730862ba9f 100644
--- a/doc/src/sgml/recovery.sgml
+++ b/doc/src/sgml/recovery.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="recovery">
 <Title>Database Recovery</Title>
 
 <Para>
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index f5a8d8a3d5f95becf0b1f562a85f0ae0a8f079e0..a31817e1dd9f11c80f7b354f380b206dd25c1a35 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="regress">
 <Title>Regression Test</Title>
 
 <Abstract>
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index 236d3fc9cc6c2bc0757224419a82ac67fb0800c4..29a4c1d6828b50705d1d0bcf47b968800e49fee8 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="rules">
 <Title>The <ProductName>Postgres</ProductName> Rule System</Title>
 
 <Para>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index c403f816f876c36e83ac2baa91591aff2275db58..0316f079e3edb8922d205ab0ab1bca16edeaba62 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="spi">
 <DocInfo>
 <AuthorGroup>
 <Author>
diff --git a/doc/src/sgml/start-ag.sgml b/doc/src/sgml/start-ag.sgml
index 6ca52ddaf705ab4906bb2c4434fc5ba7bae33d20..4e08fe77bac64c2ed884d80357d076c9123ebf39 100644
--- a/doc/src/sgml/start-ag.sgml
+++ b/doc/src/sgml/start-ag.sgml
@@ -4,7 +4,7 @@
 -	- thomas 1998-02-24
 -->
 
-<Chapter>
+<Chapter Id="start-ag">
 <Title>Runtime Environment</Title>
 
 <Para>
@@ -153,7 +153,7 @@ There is one evident drawback of using locale - it's speed ! So, use locale only
 
 </Chapter>
 
-<Chapter>
+<Chapter Id="postmaster">
 <Title>Starting <Application>postmaster</Application></Title>
 
 <Para>
@@ -186,7 +186,7 @@ There is one evident drawback of using locale - it's speed ! So, use locale only
 </Para>
 </Chapter>
 
-<Chapter>
+<Chapter Id="newuser">
 <Title>Adding and Deleting Users</Title>
 
 <Para>
@@ -200,7 +200,7 @@ to the underlying
 </Para>
 </Chapter>
 
-<Chapter>
+<Chapter Id="disk">
 <Title>Disk Management</Title>
 
 <Para>
@@ -266,7 +266,7 @@ To test the new location, create a database <Database>test</Database> by typing
 </Sect1>
 </Chapter>
 
-<Chapter>
+<Chapter Id="trouble">
 <Title>Troubleshooting</Title>
 
 <Para>
@@ -296,7 +296,7 @@ FATAL 1:Feb 17 23:19:55:process userid (2360) != database owner (268)
 </Para>
 </Chapter>
 
-<Chapter>
+<Chapter Id="manage-ag">
 <Title>Managing a Database</Title>
 
 <Para>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index 7a0495e22704baf4bdfb285cb40b1ee3e3c67683..10ece92393e969bd357c8345f24ed9089ac7164a 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="storage">
 <Title>Disk Storage</Title>
 
 <Para>
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index b8b7fc12ab318727dc4098d9fe2c241ef0ddbcf4..f612f651686b0ba27fcd30b0d6ba2517d16dfdd7 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="triggers">
 <Title>Triggers</Title>
 
 <Para>
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 6ff48eb750ea508e9826dfadfe180961fe3cdeab..5873a377726afb8e8cdb3d2fc134a13441423b04 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -12,7 +12,7 @@
 <!entity advanced SYSTEM "advanced.sgml">
 <!entity biblio   SYSTEM "biblio.sgml">
 ]>
-<Book>
+<Book Id="tutorial">
 
 <!-- Title information -->
 
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 674bf843b6303e590fec4b53ad5dd4d46020088e..451e85138eb903bca051a51f08365a5e25ca1687 100644
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,4 +1,4 @@
-<chapter>
+<chapter Id="typeconv">
 <title>Type Conversion</title>
 
 <para>
diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index c6d18b9963e04211f3ed95d515040d79ce5bcdcd..86f35f2f4bb4e21d698ef7a721dca763e15710d9 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -23,7 +23,7 @@
 <!entity biblio   SYSTEM "biblio.sgml">
 ]>
 <!-- entity manpages SYSTEM "man/manpages.sgml" subdoc -->
-<Book>
+<Book Id="user">
 
 <!-- Title information -->
 
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 81df0a8577eb1bdfd7499d63564202adc31344c1..b4d9aa440286da00583960353235a58f8ced100d 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="xaggr">
 <Title>Extending <Acronym>SQL</Acronym>: Aggregates</Title>
 
 <Para>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 880ea9fdc466c31a6d879e59c024401545f8c049..cbad3a04baea33f8ee9138c15d616b19e3b4cd5a 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="xfunc">
 <Title>Extending <Acronym>SQL</Acronym>: Functions</Title>
 
 <Para>
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index b77af369e6a2ba6bb6998bc79dda18663cd28a00..820ebc9d296dfca526c75acd520157a2352797ee 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="xindex">
 <Title>Interfacing Extensions To Indices</Title>
 
 <Para>
diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml
index fa5e7342f674248774c0af23ca3f08eeba41e818..1e96e0a18c1a45123a51f1b46759fb38b2c0ec31 100644
--- a/doc/src/sgml/xoper.sgml
+++ b/doc/src/sgml/xoper.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="xoper">
 <Title>Extending <Acronym>SQL</Acronym>: Operators</Title>
 
 <Para>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index 980fa2f00936bd1296ba177c8cdf0325a3c5ef49..b1e592ea49605fdf4fb45492ade3de6791534f5f 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -1,4 +1,4 @@
-<Chapter>
+<Chapter Id="xtypes">
 <Title>Extending <Acronym>SQL</Acronym>: Types</Title>
 <Para>
      As previously mentioned, there are two kinds  of  types