diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index 42f4d94236..2fc180ae86 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.30 2010/02/05 19:38:21 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/keywords.sgml,v 2.31 2010/03/02 20:40:48 petere Exp $ -->
 
 <appendix id="sql-keywords-appendix">
  <title><acronym>SQL</acronym> Key Words</title>
@@ -441,7 +441,7 @@
    </row>
    <row>
     <entry><token>BETWEEN</token></entry>
-    <entry>reserved (can be function or type)</entry>
+    <entry>non-reserved (cannot be function or type)</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>non-reserved</entry>
@@ -495,6 +495,14 @@
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>BLOCKED</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>BOM</token></entry>
     <entry></entry>
@@ -895,6 +903,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>COMMENTS</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>COMMIT</token></entry>
     <entry>non-reserved</entry>
@@ -1047,6 +1063,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>CONTROL</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>CONVERSION</token></entry>
     <entry>non-reserved</entry>
@@ -1311,6 +1335,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>DATALINK</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DATE</token></entry>
     <entry></entry>
@@ -1343,6 +1375,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>DB</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DEALLOCATE</token></entry>
     <entry>non-reserved</entry>
@@ -1591,6 +1631,94 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>DLNEWCOPY</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLPREVIOUSCOPY</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLCOMPLETE</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLCOMPLETEONLY</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLCOMPLETEWRITE</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLPATH</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLPATHONLY</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLPATHWRITE</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLSCHEME</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLURLSERVER</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
+   <row>
+    <entry><token>DLVALUE</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DO</token></entry>
     <entry>reserved</entry>
@@ -1777,7 +1905,7 @@
    </row>
    <row>
     <entry><token>EXCLUDE</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
@@ -1887,6 +2015,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>FILE</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>FILTER</token></entry>
     <entry></entry>
@@ -1945,7 +2081,7 @@
    </row>
    <row>
     <entry><token>FOLLOWING</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
@@ -2023,6 +2159,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>FS</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>FULL</token></entry>
     <entry>reserved (can be function or type)</entry>
@@ -2039,6 +2183,14 @@
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>FUNCTIONS</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>FUSION</token></entry>
     <entry></entry>
@@ -2279,6 +2431,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>IMPORT</token></entry>
+    <entry></entry>
+    <entry>reserved</entry>
+    <entry>reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>IN</token></entry>
     <entry>reserved</entry>
@@ -2463,6 +2623,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>INTEGRITY</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>INTERSECT</token></entry>
     <entry>reserved</entry>
@@ -2695,6 +2863,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>LIBRARY</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>LIKE</token></entry>
     <entry>reserved (can be function or type)</entry>
@@ -2714,11 +2890,19 @@
    <row>
     <entry><token>LIMIT</token></entry>
     <entry>reserved</entry>
-    <entry></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>LINK</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>LISTEN</token></entry>
     <entry>non-reserved</entry>
@@ -3370,8 +3554,8 @@
    <row>
     <entry><token>OFF</token></entry>
     <entry>reserved</entry>
-    <entry></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry></entry>
    </row>
@@ -3665,7 +3849,7 @@
    </row>
    <row>
     <entry><token>PARTITION</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry></entry>
@@ -3687,6 +3871,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>PASSTHROUGH</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>PASSWORD</token></entry>
     <entry>non-reserved</entry>
@@ -3727,6 +3919,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>PERMISSION</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>PLACING</token></entry>
     <entry>reserved</entry>
@@ -3785,7 +3985,7 @@
    </row>
    <row>
     <entry><token>PRECEDING</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
@@ -3897,7 +4097,7 @@
    </row>
    <row>
     <entry><token>RANGE</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry></entry>
@@ -3951,6 +4151,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>RECOVERY</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>RECURSIVE</token></entry>
     <entry>non-reserved</entry>
@@ -4111,6 +4319,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>REQUIRING</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>RESET</token></entry>
     <entry>non-reserved</entry>
@@ -4135,6 +4351,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>RESTORE</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>RESTRICT</token></entry>
     <entry>non-reserved</entry>
@@ -4431,6 +4655,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>SELECTIVE</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>SELF</token></entry>
     <entry></entry>
@@ -4455,6 +4687,14 @@
     <entry>reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>SEQUENCES</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>SERIALIZABLE</token></entry>
     <entry>non-reserved</entry>
@@ -4903,6 +5143,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>TABLES</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>TABLESAMPLE</token></entry>
     <entry></entry>
@@ -5031,6 +5279,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>TOKEN</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>TOP_LEVEL_COUNT</token></entry>
     <entry></entry>
@@ -5217,7 +5473,7 @@
    </row>
    <row>
     <entry><token>UNBOUNDED</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
@@ -5271,6 +5527,14 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>UNLINK</token></entry>
+    <entry></entry>
+    <entry>non-reserved</entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>UNLISTEN</token></entry>
     <entry>non-reserved</entry>
@@ -5810,7 +6074,7 @@
    <row>
     <entry><token>YES</token></entry>
     <entry>non-reserved</entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry></entry>
     <entry></entry>
     <entry></entry>