diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 143df87426cea91b625cf6c5f5c54dd7e00a0591..2c131a4f0883db76ce5a295058621df141963783 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-ALTERTABLE-1">
+<REFENTRY ID="SQL-ALTERTABLE">
 <REFMETA>
 <REFENTRYTITLE>
 ALTER TABLE
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 1087602c934f159b5f9c28a77b41fc8e07526067..fc57cd9849aa37f7f7f359ee9f981c67f961a149 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -1,4 +1,4 @@
-  <REFENTRY ID="SQL-ALTERUSER-1">
+  <REFENTRY ID="SQL-ALTERUSER">
    <REFMETA>
     <REFENTRYTITLE>
      ALTER USER
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 9939a9df6e74c5656424843752ec47803a7fa21c..e0fe23305d9ef052aaecdbd1b2163ac624a36deb 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-BEGINWORK-1">
+<REFENTRY ID="SQL-BEGINWORK">
  <REFMETA>
   <REFENTRYTITLE>
    BEGIN WORK
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index aba7eb0afa17367636ac9e85949eca05cd104515..b1a755957d0403c1971b6229862d08528b578c2d 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CLOSE-1">
+<REFENTRY ID="SQL-CLOSE">
  <REFMETA>
   <REFENTRYTITLE>
    CLOSE
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index 5a7bb1c8b2bf58d6a3051aba7d67d7d329d8f7cc..3a6e469ba524466f40c3992f6476fd7e02c31380 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CLUSTER-1">
+<REFENTRY ID="SQL-CLUSTER">
  <REFMETA>
  <REFENTRYTITLE>
   CLUSTER
@@ -10,7 +10,7 @@
   CLUSTER
  </REFNAME>
  <REFPURPOSE>
-  Gives storage clustering advice to PostgreSQL
+  Gives storage clustering advice to the backend
  </REFPURPOSE>
  
  <REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index 63c9dbdc4e1f69640ec9dd557c1f615d0dca1750..a631b7f9b8c2a1c5cbe79433071cc25abe8b82af 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-COMMIT-1">
+<REFENTRY ID="SQL-COMMIT">
  <REFMETA>
   <REFENTRYTITLE>
    COMMIT
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 1c49e14306888346f01b337bff2ac5642b95a64c..216d2abf1e0ba6b715306047b0d9df42734162d8 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-COPY-1">
+<REFENTRY ID="SQL-COPY">
  <REFMETA>
   <REFENTRYTITLE>
    COPY
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index b52c002fd63424fd3cb53535d9716f807519e4af..9dc3ba950fcc554402c42ee06296c27b4ee3ead3 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEAGGREGATE-1">
+<REFENTRY ID="SQL-CREATEAGGREGATE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE AGGREGATE
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 54d598575f647f2e68649898d2cd71bfa1915cbd..bd302599e69704ed48c39cdf4d2f8c3f95f5f5cf 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEDATABASE-1">
+<REFENTRY ID="SQL-CREATEDATABASE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE DATABASE
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index e032adec77a089df1996dd5f5878f1b6c5080d18..62fe39652f4a55c121037a6d9724417a5fc8040f 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEFUNCTION-1">
+<REFENTRY ID="SQL-CREATEFUNCTION">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE FUNCTION
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 36ecd53267e58cf2879931f888ce4a876d783b37..fda1c656110f273ba956928fa8f2295090457c1d 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEINDEX-1">
+<REFENTRY ID="SQL-CREATEINDEX">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE INDEX
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 57b41f7793bb0225b163b1df44bf1365dc3b6b1e..b35d8b7c92e49e21553b4d2d88b6c58d1f7ac436 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATELANGUAGE-1">
+<REFENTRY ID="SQL-CREATELANGUAGE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE LANGUAGE
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 29400bf3ce39d98b6e177b256a39cfff6ac213b8..febe709769d1023bb0fc2d3dba8aa31fa402b5f4 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEOPERATOR-1">
+<REFENTRY ID="SQL-CREATEOPERATOR">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE OPERATOR
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index f8d9ce204e3cee041eb2ad81dc5f7dc040989c00..887632061e391a9d6d8f0ac25a470f46f89ab2d0 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATERULE-1">
+<REFENTRY ID="SQL-CREATERULE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE RULE
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 262a6467483dd7a1a75dc181eb4769a56141258c..20d03240e32a617204105d249c7f2e971164dbe6 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATESEQUENCE-1">
+<REFENTRY ID="SQL-CREATESEQUENCE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE SEQUENCE
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 7e45e75b251b4a3747912d6e6c98196838234fe7..798e02fbf62dfe36c62050456e62243246d47a6d 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATETABLE-1">
+<REFENTRY ID="SQL-CREATETABLE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE TABLE
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 7d145f0929efc10d6ffe095d25a2b105914daa85..b98c90aa21e2287323b27c716804004b79cc6c71 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATETRIGGER-1">
+<REFENTRY ID="SQL-CREATETRIGGER">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE TRIGGER
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 78967a7d0a6c8e38ada5974e5a3ba92dbf931585..bd20bd14ed03a69ee65162ce3dd22db68d865f37 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATETYPE-1">
+<REFENTRY ID="SQL-CREATETYPE">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE TYPE
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index f0b807d195f3b792b16b43a42943e2c604cc02e4..14e6729890a579aa338c2486b48c514de5000978 100644
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEUSER-1">
+<REFENTRY ID="SQL-CREATEUSER">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE USER
@@ -318,4 +318,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index a626e7e0981a56c7efb616c7d1006eb78364a007..99b7be536214b3977815671afff71462ed1e636d 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CREATEVIEW-1">
+<REFENTRY ID="SQL-CREATEVIEW">
  <REFMETA>
   <REFENTRYTITLE>
    CREATE VIEW
@@ -282,4 +282,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/current_date.sgml b/doc/src/sgml/ref/current_date.sgml
index 034e23c8b476c67010a8be6d06f2d2197317456d..9c76ebabfc784ee583a72bb971dd822edaceb41d 100644
--- a/doc/src/sgml/ref/current_date.sgml
+++ b/doc/src/sgml/ref/current_date.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CURRENT-DATE-1">
+<REFENTRY ID="SQL-CURRENT-DATE">
  <REFMETA>
   <REFENTRYTITLE>
    SQL_CURRENT_DATE
@@ -10,7 +10,7 @@
    SQL_CURRENT_DATE
   </REFNAME>
   <REFPURPOSE>
-- returns the current date, (i.e "today").
+Returns the current date
   </REFPURPOSE>
  <REFSYNOPSISDIV>
   <REFSYNOPSISDIVINFO>
@@ -168,4 +168,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/current_time.sgml b/doc/src/sgml/ref/current_time.sgml
index a4d563429798bb84d1a8360370bb093ce6e90b95..e6b4f21af639f9ee93944091ead4f2ced0359e1a 100644
--- a/doc/src/sgml/ref/current_time.sgml
+++ b/doc/src/sgml/ref/current_time.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CURRENT-TIME-1">
+<REFENTRY ID="SQL-CURRENT-TIME">
  <REFMETA>
   <REFENTRYTITLE>
    SQL_CURRENT_TIME
@@ -10,7 +10,7 @@
    SQL_CURRENT_TIME
   </REFNAME>
   <REFPURPOSE>
-    - returns the current local time, (i.e "now").
+Returns the current local time
   </REFPURPOSE>
  <REFSYNOPSISDIV>
   <REFSYNOPSISDIVINFO>
@@ -183,4 +183,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/current_timestamp.sgml b/doc/src/sgml/ref/current_timestamp.sgml
index 1a170efcb021b59c578b47cab4d03515ad9b91aa..ef68c5fe371c886294eaa369c4be9813eaa41381 100644
--- a/doc/src/sgml/ref/current_timestamp.sgml
+++ b/doc/src/sgml/ref/current_timestamp.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CURRENT-TIMESTAMP-1">
+<REFENTRY ID="SQL-CURRENT-TIMESTAMP">
  <REFMETA>
   <REFENTRYTITLE>
    SQL_CURRENT_TIMESTAMP
@@ -10,8 +10,7 @@
    SQL_CURRENT_TIMESTAMP
   </REFNAME>
   <REFPURPOSE>
-   returns the current timestamp, (i.e the
-   date "today" concatenated with time "now").
+   Returns the current date and time
   </REFPURPOSE>
   
   
@@ -191,4 +190,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/current_user.sgml b/doc/src/sgml/ref/current_user.sgml
index 4f619ebbf0807d47be4c358e4e9153dc9df9dbde..c13951dffdc13958a92ab4c811480e1871bf6f6d 100644
--- a/doc/src/sgml/ref/current_user.sgml
+++ b/doc/src/sgml/ref/current_user.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-CURRENT-USER-1">
+<REFENTRY ID="SQL-CURRENT-USER">
  <REFMETA>
   <REFENTRYTITLE>
    SQL_CURRENT_USER
@@ -10,7 +10,7 @@
    SQL_CURRENT_USER
   </REFNAME>
   <REFPURPOSE>
-   - returns the current user name.
+   Returns the current user name
   </REFPURPOSE>
  <REFSYNOPSISDIV>
   <REFSYNOPSISDIVINFO>
@@ -190,4 +190,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 7b1d6fc89e37c92352f8e214be4276525b090f9e..9e2850110980b5eafeda0662f5549570715ea091 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-DELETE-1">
+<REFENTRY ID="SQL-DELETE">
  <REFMETA>
   <REFENTRYTITLE>
    DELETE
@@ -204,4 +204,4 @@ sgml-exposed-tags:nil
 sgml-local-catalogs:"/usr/lib/sgml/catalog"
 sgml-local-ecat-files:nil
 End:
--->
\ No newline at end of file
+-->
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 5a857bc9307846acbd79e9cc7741996e9cdba5fd..3cb79803274ee1537198e9d48889c9d88c032ee6 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -1,4 +1,4 @@
-<REFENTRY ID="SQL-DROPFUNCTION-1">
+<REFENTRY ID="SQL-DROPFUNCTION">
  <REFMETA>
   <REFENTRYTITLE>
    DROP FUNCTION