doc: Fix markup and improve placeholder names

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




This is the main PostgreSQL git repository.
RSS
Atom



window.onload = function () {
	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
	onloadTZSetup('local', tz_cookie, 'datetime');
};