doc: Fix markup and improve placeholder names

This commit is contained in:
Peter Eisentraut 2015-12-03 10:20:54 -05:00
parent 375a3b3397
commit 0638a62dec

View File

@ -29,7 +29,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
<phrase>where <replaceable class="parameter">conflict_target</replaceable> can be one of:</phrase> <phrase>where <replaceable class="parameter">conflict_target</replaceable> can be one of:</phrase>
( { <replaceable class="parameter">column_name_index</replaceable> | ( <replaceable class="parameter">expression_index</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="PARAMETER">index_predicate</replaceable> ] ( { <replaceable class="parameter">index_column_name</replaceable> | ( <replaceable class="parameter">index_expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="PARAMETER">index_predicate</replaceable> ]
ON CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
<phrase>and <replaceable class="parameter">conflict_action</replaceable> is one of:</phrase> <phrase>and <replaceable class="parameter">conflict_action</replaceable> is one of:</phrase>
@ -293,8 +293,8 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
<parameter>conflict_target</parameter> can perform <parameter>conflict_target</parameter> can perform
<emphasis>unique index inference</emphasis>. When performing <emphasis>unique index inference</emphasis>. When performing
inference, it consists of one or more <replaceable inference, it consists of one or more <replaceable
class="PARAMETER">column_name_index</replaceable> columns and/or class="PARAMETER">index_column_name</replaceable> columns and/or
<replaceable class="PARAMETER">expression_index</replaceable> <replaceable class="PARAMETER">index_expression</replaceable>
expressions, and an optional <replaceable class="PARAMETER"> expressions, and an optional <replaceable class="PARAMETER">
index_predicate</replaceable>. All <replaceable index_predicate</replaceable>. All <replaceable
class="PARAMETER">table_name</replaceable> unique indexes that, class="PARAMETER">table_name</replaceable> unique indexes that,
@ -321,7 +321,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><literal>conflict_target</literal></term> <term><replaceable class="parameter">conflict_target</replaceable></term>
<listitem> <listitem>
<para> <para>
Specifies which conflicts <literal>ON CONFLICT</literal> takes Specifies which conflicts <literal>ON CONFLICT</literal> takes
@ -339,7 +339,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><literal>conflict_action</literal></term> <term><replaceable class="parameter">conflict_action</replaceable></term>
<listitem> <listitem>
<para> <para>
<parameter>conflict_action</parameter> specifies an <parameter>conflict_action</parameter> specifies an
@ -366,31 +366,31 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><replaceable class="PARAMETER">column_name_index</replaceable></term> <term><replaceable class="PARAMETER">index_column_name</replaceable></term>
<listitem> <listitem>
<para> <para>
The name of a <replaceable The name of a <replaceable
class="PARAMETER">table_name</replaceable> column. Used to class="PARAMETER">table_name</replaceable> column. Used to
infer arbiter indexes. Follows <command>CREATE infer arbiter indexes. Follows <command>CREATE
INDEX</command> format. <literal>SELECT</> privilege on INDEX</command> format. <literal>SELECT</> privilege on
<replaceable class="PARAMETER">column_name_index</replaceable> <replaceable class="PARAMETER">index_column_name</replaceable>
is required. is required.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><replaceable class="PARAMETER">expression_index</replaceable></term> <term><replaceable class="PARAMETER">index_expression</replaceable></term>
<listitem> <listitem>
<para> <para>
Similar to <replaceable Similar to <replaceable
class="PARAMETER">column_name_index</replaceable>, but used to class="PARAMETER">index_column_name</replaceable>, but used to
infer expressions on <replaceable infer expressions on <replaceable
class="PARAMETER">table_name</replaceable> columns appearing class="PARAMETER">table_name</replaceable> columns appearing
within index definitions (not simple columns). Follows within index definitions (not simple columns). Follows
<command>CREATE INDEX</command> format. <literal>SELECT</> <command>CREATE INDEX</command> format. <literal>SELECT</>
privilege on any column appearing within <replaceable privilege on any column appearing within <replaceable
class="PARAMETER">expression_index</replaceable> is required. class="PARAMETER">index_expression</replaceable> is required.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -400,8 +400,8 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
<listitem> <listitem>
<para> <para>
When specified, mandates that corresponding <replaceable When specified, mandates that corresponding <replaceable
class="PARAMETER">column_name_index</replaceable> or class="PARAMETER">index_column_name</replaceable> or
<replaceable class="PARAMETER">expression_index</replaceable> <replaceable class="PARAMETER">index_expression</replaceable>
use a particular collation in order to be matched during use a particular collation in order to be matched during
inference. Typically this is omitted, as collations usually inference. Typically this is omitted, as collations usually
do not affect whether or not a constraint violation occurs. do not affect whether or not a constraint violation occurs.
@ -415,8 +415,8 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
<listitem> <listitem>
<para> <para>
When specified, mandates that corresponding <replaceable When specified, mandates that corresponding <replaceable
class="PARAMETER">column_name_index</replaceable> or class="PARAMETER">index_column_name</replaceable> or
<replaceable class="PARAMETER">expression_index</replaceable> <replaceable class="PARAMETER">index_expression</replaceable>
use particular operator class in order to be matched during use particular operator class in order to be matched during
inference. Typically this is omitted, as the inference. Typically this is omitted, as the
<emphasis>equality</emphasis> semantics are often equivalent <emphasis>equality</emphasis> semantics are often equivalent