Skip to content

Commit 7eb9a82

Browse files
committed
Fix PDF doc generation.
Commit c649fa2 broke PDF generation, due to a misplaced id attribute. Per buildfarm member crake.
1 parent c649fa2 commit 7eb9a82

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

doc/src/sgml/func.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22453,11 +22453,11 @@ SELECT count(*) FROM sometable;
2245322453

2245422454
<tbody>
2245522455
<row>
22456-
<entry role="func_table_entry"><para role="func_signature">
22456+
<entry id="merge-action" role="func_table_entry"><para role="func_signature">
2245722457
<indexterm>
2245822458
<primary>merge_action</primary>
2245922459
</indexterm>
22460-
<function id="merge_action">merge_action</function> ( )
22460+
<function>merge_action</function> ( )
2246122461
<returnvalue>text</returnvalue>
2246222462
</para>
2246322463
<para>

doc/src/sgml/ref/merge.sgml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ DELETE
101101
The optional <literal>RETURNING</literal> clause causes <command>MERGE</command>
102102
to compute and return value(s) based on each row inserted, updated, or
103103
deleted. Any expression using the source or target table's columns, or
104-
the <xref linkend="merge_action"/> function can be computed. When an
105-
<command>INSERT</command> or <command>UPDATE</command> action is performed,
106-
the new values of the target table's columns are used. When a
107-
<command>DELETE</command> is performed, the old values of the target table's
108-
columns are used. The syntax of the <literal>RETURNING</literal> list is
109-
identical to that of the output list of <command>SELECT</command>.
104+
the <link linkend="merge-action"><function>merge_action()</function></link>
105+
function can be computed. When an <command>INSERT</command> or
106+
<command>UPDATE</command> action is performed, the new values of the target
107+
table's columns are used. When a <command>DELETE</command> is performed,
108+
the old values of the target table's columns are used. The syntax of the
109+
<literal>RETURNING</literal> list is identical to that of the output list
110+
of <command>SELECT</command>.
110111
</para>
111112

112113
<para>
@@ -462,8 +463,8 @@ DELETE
462463
An expression to be computed and returned by the <command>MERGE</command>
463464
command after each row is changed (whether inserted, updated, or deleted).
464465
The expression can use any columns of the source or target tables, or the
465-
<xref linkend="merge_action"/> function to return additional information
466-
about the action executed.
466+
<link linkend="merge-action"><function>merge_action()</function></link>
467+
function to return additional information about the action executed.
467468
</para>
468469
<para>
469470
Writing <literal>*</literal> will return all columns from the source

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy