diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index b9565b3283cd85b7801a3759c85479616d330f05..572fb5dc421ac6b6615d657a0558a2dff6e658fc 100644
--- a/doc/src/sgml/keywords.sgml
+++ b/doc/src/sgml/keywords.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.19 2006/12/30 21:21:52 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.20 2008/01/30 10:37:36 petere Exp $ -->
 
 <appendix id="sql-keywords-appendix">
  <title><acronym>SQL</acronym> Key Words</title>
@@ -208,7 +208,7 @@
    </row>
    <row>
     <entry><token>ALWAYS</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
     <entry></entry>
@@ -346,6 +346,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>BASE64</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>BEFORE</token></entry>
     <entry>non-reserved</entry>
@@ -794,6 +801,13 @@
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
    </row>
+   <row>
+    <entry><token>CONFIGURATION</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>CONNECT</token></entry>
     <entry></entry>
@@ -864,6 +878,13 @@
     <entry>non-reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>CONTENT</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>CONTINUE</token></entry>
     <entry></entry>
@@ -880,7 +901,7 @@
    </row>
    <row>
     <entry><token>CONVERT</token></entry>
-    <entry>non-reserved (cannot be function or type)</entry>
+    <entry></entry>
     <entry>reserved</entry>
     <entry>non-reserved</entry>
     <entry>reserved</entry>
@@ -906,6 +927,13 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>COST</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>COUNT</token></entry>
     <entry></entry>
@@ -985,7 +1013,7 @@
    </row>
    <row>
     <entry><token>CURRENT</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
@@ -1286,7 +1314,7 @@
    </row>
    <row>
     <entry><token>DICTIONARY</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry></entry>
     <entry>reserved</entry>
     <entry></entry>
@@ -1298,6 +1326,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>DISCARD</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DISCONNECT</token></entry>
     <entry></entry>
@@ -1326,6 +1361,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>DOCUMENT</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DOMAIN</token></entry>
     <entry>non-reserved</entry>
@@ -1424,6 +1466,13 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>ENUM</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>EQUALS</token></entry>
     <entry></entry>
@@ -1543,6 +1592,13 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>FAMILY</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>FETCH</token></entry>
     <entry>non-reserved</entry>
@@ -1781,6 +1837,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>HEX</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>HIERARCHY</token></entry>
     <entry></entry>
@@ -2292,6 +2355,13 @@
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>MAPPING</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>MATCH</token></entry>
     <entry>non-reserved</entry>
@@ -2455,7 +2525,7 @@
    </row>
    <row>
     <entry><token>NAME</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
@@ -2644,7 +2714,7 @@
    </row>
    <row>
     <entry><token>NULLS</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
     <entry></entry>
@@ -2929,6 +2999,13 @@
     <entry>non-reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>PARSER</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>PARTIAL</token></entry>
     <entry>non-reserved</entry>
@@ -2992,6 +3069,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>PLANS</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>PLI</token></entry>
     <entry></entry>
@@ -3300,6 +3384,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>REPLICA</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>RESET</token></entry>
     <entry>non-reserved</entry>
@@ -3540,7 +3631,7 @@
    </row>
    <row>
     <entry><token>SEARCH</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry></entry>
@@ -3783,6 +3874,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>STANDALONE</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>START</token></entry>
     <entry>non-reserved</entry>
@@ -3860,6 +3958,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>STRIP</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>STRUCTURE</token></entry>
     <entry></entry>
@@ -4000,6 +4105,13 @@
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>TEXT</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>THAN</token></entry>
     <entry></entry>
@@ -4366,7 +4478,7 @@
    </row>
    <row>
     <entry><token>VALUE</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
@@ -4420,6 +4532,13 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>VERSION</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>VIEW</token></entry>
     <entry>non-reserved</entry>
@@ -4455,6 +4574,13 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>WHITESPACE</token></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>WIDTH_BUCKET</token></entry>
     <entry></entry>
@@ -4471,7 +4597,7 @@
    </row>
    <row>
     <entry><token>WITH</token></entry>
-    <entry>non-reserved</entry>
+    <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
@@ -4505,11 +4631,109 @@
     <entry>reserved</entry>
    </row>
    <row>
-    <entry><token>YEAR</token></entry>
+    <entry><token>XML</token></entry>
     <entry>non-reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLAGG</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLATTRIBUTES</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLBINARY</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLCOMMENT</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLCONCAT</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
     <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLELEMENT</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLFOREST</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
     <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLNAMESPACES</token></entry>
+    <entry></entry>
     <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLPARSE</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLPI</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLROOT</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>XMLSERIALIZE</token></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>YEAR</token></entry>
+    <entry>non-reserved</entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+   </row>
+   <row>
+    <entry><token>YES</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
    </row>
    <row>
     <entry><token>ZONE</token></entry>