Fix PDF doc generation.

Commit c649fa24a4 broke PDF generation, due to a misplaced id
attribute.

Per buildfarm member crake.

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index ebb984a994e803549c91081fcbfd107ed350f35a..3c52d90d3ab6926e84775dcacdf73d6e102ba1b6 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -22453,11 +22453,11 @@ SELECT count(*) FROM sometable;
 
     
      
-      
+      id="merge-action" role="func_table_entry">
        
         merge_action
        
-        id="merge_action">merge_action ( )
+       merge_action ( )
        text
       
       

diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml
index 71feb6634f5421a4a5e7b74bde199b638d96fc49..44e5ec080d25cc14b6bba57285db82f6245737d3 100644 (file)
--- a/doc/src/sgml/ref/merge.sgml
+++ b/doc/src/sgml/ref/merge.sgml
@@ -101,12 +101,13 @@ DELETE
    The optional RETURNING clause causes MERGE
    to compute and return value(s) based on each row inserted, updated, or
    deleted.  Any expression using the source or target table's columns, or
-   the  function can be computed.  When an
-   INSERT or UPDATE action is performed,
-   the new values of the target table's columns are used.  When a
-   DELETE is performed, the old values of the target table's
-   columns are used.  The syntax of the RETURNING list is
-   identical to that of the output list of SELECT.
+   the merge_action()
+   function can be computed.  When an INSERT or
+   UPDATE action is performed, the new values of the target
+   table's columns are used.  When a DELETE is performed,
+   the old values of the target table's columns are used.  The syntax of the
+   RETURNING list is identical to that of the output list
+   of SELECT.
   
 
   
@@ -462,8 +463,8 @@ DELETE
       An expression to be computed and returned by the MERGE
       command after each row is changed (whether inserted, updated, or deleted).
       The expression can use any columns of the source or target tables, or the
-      <xref linkend="merge_action"/> function to return additional information
-      about the action executed.
+      <link linkend="merge-action">merge_action()
+      function to return additional information about the action executed.
      
      
       Writing * will return all columns from the source