diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index 080c3c404bc..9c49e07153c 100644
--- a/doc/src/sgml/keywords.sgml
+++ b/doc/src/sgml/keywords.sgml
@@ -369,7 +369,7 @@
    </row>
    <row>
     <entry><token>ATTRIBUTE</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
@@ -817,7 +817,7 @@
    </row>
    <row>
     <entry><token>COLLATION</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry>reserved</entry>
@@ -1151,30 +1151,6 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
-   <row>
-    <entry><token>CREATEDB</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>CREATEROLE</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>CREATEUSER</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
    <row>
     <entry><token>CROSS</token></entry>
     <entry>reserved (can be function or type)</entry>
@@ -1975,6 +1951,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>EXTENSION</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>EXTERNAL</token></entry>
     <entry>non-reserved</entry>
@@ -2743,6 +2727,14 @@
     <entry>non-reserved</entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>LABEL</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>LAG</token></entry>
     <entry></entry>
@@ -2975,14 +2967,6 @@
     <entry></entry>
     <entry></entry>
    </row>
-   <row>
-    <entry><token>LOGIN</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
    <row>
     <entry><token>LOWER</token></entry>
     <entry></entry>
@@ -3335,46 +3319,6 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
-   <row>
-    <entry><token>NOCREATEDB</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>NOCREATEROLE</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>NOCREATEUSER</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>NOINHERIT</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
-   <row>
-    <entry><token>NOLOGIN</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
    <row>
     <entry><token>NONE</token></entry>
     <entry>non-reserved (cannot be function or type)</entry>
@@ -3399,14 +3343,6 @@
     <entry></entry>
     <entry></entry>
    </row>
-   <row>
-    <entry><token>NOSUPERUSER</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
    <row>
     <entry><token>NOT</token></entry>
     <entry>reserved</entry>
@@ -3865,7 +3801,7 @@
    </row>
    <row>
     <entry><token>PASSING</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>non-reserved</entry>
     <entry></entry>
     <entry></entry>
@@ -4169,7 +4105,7 @@
    </row>
    <row>
     <entry><token>REF</token></entry>
-    <entry></entry>
+    <entry>non-reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
     <entry>reserved</entry>
@@ -5087,14 +5023,6 @@
     <entry>non-reserved</entry>
     <entry>reserved</entry>
    </row>
-   <row>
-    <entry><token>SUPERUSER</token></entry>
-    <entry>non-reserved</entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-    <entry></entry>
-   </row>
    <row>
     <entry><token>SYMMETRIC</token></entry>
     <entry>reserved</entry>
@@ -5543,6 +5471,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>UNLOGGED</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>UNNAMED</token></entry>
     <entry></entry>
@@ -5671,6 +5607,14 @@
     <entry></entry>
     <entry></entry>
    </row>
+   <row>
+    <entry><token>VALIDATE</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>VALIDATOR</token></entry>
     <entry>non-reserved</entry>
@@ -5961,7 +5905,7 @@
    </row>
    <row>
     <entry><token>XMLEXISTS</token></entry>
-    <entry></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
     <entry>reserved</entry>
     <entry></entry>
     <entry></entry>