Make the SQL command synopses appear less random.

diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index 6eceb19c3c0a52ed2b7526e7b04758d70930b991..777861e58038164188eeaa62731ae486f3e502b6 100644 (file)
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -20,8 +20,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>variable</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>variable</replaceable>
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>parameter</replaceable>
 
 ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>
 </synopsis>
@@ -70,12 +70,12 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <repl
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable>variable</replaceable></term>
+      <term><replaceable>parameter</replaceable></term>
       <term><replaceable>value</replaceable></term>
       <listitem>
        <para>
         Set the session default for this database of the specified
-        configuration variable to the given value.  If
+        configuration parameter to the given value.  If
         <replaceable>value</replaceable> is <literal>DEFAULT</literal>
         or, equivalently, <literal>RESET</literal> is used, the
         database-specific variable setting is removed and the system-wide
@@ -86,7 +86,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <repl
 
        <para>
         See <xref linkend="sql-set" endterm="sql-set-title"> and <xref linkend="runtime-config">
-        for more information about allowed variable names
+        for more information about allowed parameter names
         and values.
        </para>
       </listitem>

diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index d7a9d9f129ad676b8163e690c7fc6170585d6473..e41f517a8215e2e625438053aa1de9acc6950acf 100644 (file)
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -24,15 +24,15 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
   <synopsis>
-ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
-    { SET DEFAULT <replaceable class="PARAMETER">value</replaceable> | DROP DEFAULT }
-ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
+ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
+    { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT }
+ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     { SET | DROP } NOT NULL
-ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
+ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     ADD <replaceable class="PARAMETER">domain_constraint</replaceable>
-ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
+ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     DROP CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
-ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
+ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     OWNER TO <replaceable class="PARAMETER">new_owner</replaceable> 
   </synopsis>
  </refsynopsisdiv>
@@ -111,7 +111,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
    <para>
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER"> domain </replaceable></term>
+      <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
        The name (possibly schema-qualified) of an existing domain to
@@ -121,7 +121,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER"> domain_constraint </replaceable></term>
+      <term><replaceable class="PARAMETER">domain_constraint</replaceable></term>
       <listitem>
        <para>
        New domain constraint for the domain.
@@ -130,7 +130,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER"> constraint_name </replaceable></term>
+      <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
       <listitem>
        <para>
        Name of an existing constraint to drop.

diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index a217af28aeeb338c73e39a916fa0edfc85d2779c..0dbb94a11e8a25fe0879533f0ca1c778be5d52f1 100644 (file)
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
   <synopsis>
-ALTER SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
+ALTER SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
     [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ]
     [ RESTART [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
   </synopsis>
@@ -46,7 +46,7 @@ ALTER SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT
    <para>
     <variablelist>
      <varlistentry>
-      <term><replaceable class="parameter">seqname</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
        The name (optionally schema-qualified) of a sequence to be altered.

diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index b1e4543aa612b2b792943ac61222c71ff9980e11..028ef41807aabe453a2e0e153d719ea0017e9aef 100644 (file)
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -20,33 +20,33 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">type</replaceable> [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     DROP [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> [ RESTRICT | CASCADE ]
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET DEFAULT <replaceable class="PARAMETER">value</replaceable> | DROP DEFAULT }
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
+    ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT }
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET | DROP } NOT NULL
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable>
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     SET WITHOUT OIDS
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     RENAME [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> TO <replaceable
     class="PARAMETER">new_column</replaceable>
-ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
-    RENAME TO <replaceable class="PARAMETER">new_table</replaceable>
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
+    RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     ADD <replaceable class="PARAMETER">table_constraint</replaceable>
-ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ]
+ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     DROP CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
-ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
-    OWNER TO <replaceable class="PARAMETER">new_owner</replaceable> 
-ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
-       CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable>
+ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
+    OWNER TO <replaceable class="PARAMETER">new_owner</replaceable>
+ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
+    CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -220,7 +220,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
     <variablelist>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">table</replaceable></term>
+      <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
        The name (possibly schema-qualified) of an existing table to
@@ -264,7 +264,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_table</replaceable></term>
+      <term><replaceable class="PARAMETER">new_name</replaceable></term>
       <listitem>
        <para>
        New name for the table.

diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 302d30f5224b7ee0d0d33fa2de226cb329c35983..ab7166d2549611ca0fab7512e13dfe4a4d944987 100644 (file)
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -20,8 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TRIGGER <replaceable class="PARAMETER">trigger</replaceable> ON <replaceable class="PARAMETER">table</replaceable>
-    RENAME TO <replaceable class="PARAMETER">newname</replaceable>
+ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table</replaceable> RENAME TO <replaceable class="PARAMETER">newname</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -45,7 +44,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">trigger</replaceable> ON <replaceab
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">trigger</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       The name of an existing trigger to alter.

diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 74444667b338d8ea2ab337a713fc7974a28cb2fa..3d7d2e5eebd7c9c5ac68e7ea5a4814c67fdcf315 100644 (file)
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
 
 where <replaceable class="PARAMETER">option</replaceable> can be:
 
@@ -29,10 +29,10 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
     | CREATEUSER | NOCREATEUSER 
     | VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>'
 
-ALTER USER <replaceable class="PARAMETER">username</replaceable> RENAME TO <replaceable>newname</replaceable>
+ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>
 
-ALTER USER <replaceable class="PARAMETER">username</replaceable> SET <replaceable>variable</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replaceable>variable</replaceable>
+ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>parameter</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -75,7 +75,7 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">username</replaceable></term>
+      <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
        The name of the user whose attributes are to be altered.
@@ -152,12 +152,12 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable>variable</replaceable></term>
+      <term><replaceable>parameter</replaceable></term>
       <term><replaceable>value</replaceable></term>
       <listitem>
        <para>
         Set this user's session default for the specified configuration
-        variable to the given value.  If
+        parameter to the given value.  If
         <replaceable>value</replaceable> is <literal>DEFAULT</literal>
         or, equivalently, <literal>RESET</literal> is used, the
         user-specific variable setting is removed and the user will
@@ -166,9 +166,9 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea
        </para>
 
        <para>
-        See <xref linkend="sql-set" endterm="sql-set-title"> and <xref linkend="runtime-config">
-        for more information about allowed variable names
-        and values.
+        See <xref linkend="sql-set" endterm="sql-set-title"> and <xref
+        linkend="runtime-config"> for more information about allowed
+        parameter names and values.
        </para>
       </listitem>
      </varlistentry>

diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index c04096f1e92d5eac2efc9b49e5d61297bae023ec..5ffcee8f98eeff7ff30c5cdadf85dc896104b55c 100644 (file)
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLOSE <replaceable class="PARAMETER">cursor</replaceable>
+CLOSE <replaceable class="PARAMETER">name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -51,7 +51,7 @@ CLOSE <replaceable class="PARAMETER">cursor</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">cursor</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       The name of an open cursor to close.

diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index cd5c6767f0b42fb5de0c67f3552e2c78b9906437..2f48e26238c086481b8a5897d632c8166dd3352c 100644 (file)
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>COPY</refname>
-  <refpurpose>copy data between files and tables</refpurpose>
+  <refpurpose>copy data between a file and a table</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-copy">
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]
+COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]
     FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
     [ [ WITH ] 
           [ BINARY ] 
@@ -28,7 +28,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="
           [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
           [ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ] ]
 
-COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]
+COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]
     TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
     [ [ WITH ] 
           [ BINARY ]
@@ -74,7 +74,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="parameter">table</replaceable></term>
+    <term><replaceable class="parameter">tablename</replaceable></term>
     <listitem>
      <para>
       The name (possibly schema-qualified) of an existing table.
@@ -571,12 +571,12 @@ ZW      ZIMBABWE
    still supported:
 
 <synopsis>
-COPY [ BINARY ] <replaceable class="parameter">table</replaceable> [ WITH OIDS ]
+COPY [ BINARY ] <replaceable class="parameter">tablename</replaceable> [ WITH OIDS ]
     FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
     [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
     [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
 
-COPY [ BINARY ] <replaceable class="parameter">table</replaceable> [ WITH OIDS ]
+COPY [ BINARY ] <replaceable class="parameter">tablename</replaceable> [ WITH OIDS ]
     TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
     [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
     [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]

diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index b97d0efbd30bc0ff6edafff1c23a27a1d988a5ec..3e85213d79e45e7d3c0dde0fccfce07186635e1b 100644 (file)
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -8,7 +8,7 @@
 
  <refnamediv>
   <refname>CREATE CAST</refname>
-  <refpurpose>define a user-defined cast</refpurpose>
+  <refpurpose>define a new cast</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-createcast">

diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml
index c5ad0772193ca82ed7785b099603953926e607a2..8df48f38e8284c0137abf56fd05967fd0fc205f4 100644 (file)
--- a/doc/src/sgml/ref/create_constraint.sgml
+++ b/doc/src/sgml/ref/create_constraint.sgml
@@ -22,8 +22,8 @@ PostgreSQL documentation
 <synopsis>
 CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
     AFTER <replaceable class="parameter">events</replaceable> ON
-    <replaceable class="parameter">table</replaceable> <replaceable class="parameter">constraint</replaceable> <replaceable class="parameter">attributes</replaceable>
-    FOR EACH ROW EXECUTE PROCEDURE <replaceable class="parameter">func</replaceable> ( <replaceable class="parameter">args</replaceable> )
+    <replaceable class="parameter">tablename</replaceable> <replaceable class="parameter">constraint</replaceable> <replaceable class="parameter">attributes</replaceable>
+    FOR EACH ROW EXECUTE PROCEDURE <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">args</replaceable> )
 </synopsis>
  </refsynopsisdiv>
 
@@ -62,7 +62,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">table</replaceable></term>
+      <term><replaceable class="PARAMETER">tablename</replaceable></term>
       <listitem>
        <para>
        The name (possibly schema-qualified) of the table in which
@@ -90,7 +90,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">func</replaceable>(<replaceable class="PARAMETER">args</replaceable>)</term>
+      <term><replaceable class="PARAMETER">funcname</replaceable>(<replaceable class="PARAMETER">args</replaceable>)</term>
       <listitem>
        <para>
        The function to call as part of the trigger processing.

diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index 2653365d294843e8242f7948449c3b3810162193..22feb3208e39b13cd95f4e8ce451ecc0be7edfc1 100644 (file)
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -8,7 +8,7 @@
 
  <refnamediv>
   <refname>CREATE CONVERSION</refname>
-  <refpurpose>define a user-defined conversion</refpurpose>
+  <refpurpose>define a new conversion</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-createconversion">

diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml
index e994bf65160ea52a17aa98ecb4847cf5201a1266..a9be2f972f5743095a8a3fef8d90f59191058c9d 100644 (file)
--- a/doc/src/sgml/ref/create_domain.sgml
+++ b/doc/src/sgml/ref/create_domain.sgml
@@ -20,8 +20,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE DOMAIN <replaceable class="parameter">domainname</replaceable> [AS] <replaceable class="parameter">data_type</replaceable>
-    [ DEFAULT <replaceable>default_expr</> ]
+CREATE DOMAIN <replaceable class="parameter">name</replaceable> [AS] <replaceable class="parameter">data_type</replaceable>
+    [ DEFAULT <replaceable>expression</> ]
     [ <replaceable class="PARAMETER">constraint</replaceable> [ ... ] ]
 
 where <replaceable class="PARAMETER">constraint</replaceable> is:
@@ -60,7 +60,7 @@ where <replaceable class="PARAMETER">constraint</replaceable> is:
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="parameter">domainname</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
        The name (optionally schema-qualified) of a domain to be created.
@@ -79,7 +79,7 @@ where <replaceable class="PARAMETER">constraint</replaceable> is:
      </varlistentry>
 
      <varlistentry>
-      <term><literal>DEFAULT <replaceable>default_expr</replaceable></literal></term>
+      <term><literal>DEFAULT <replaceable>expression</replaceable></literal></term>
 
       <listitem>
        <para>

diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 8833a906b21b998cc3ce442344a7b99621019ab7..b25680c12b7035aed512cb7a262da06b009c3275 100644 (file)
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable> ON <replaceable class="parameter">table</replaceable> [ USING <replaceable class="parameter">method</replaceable> ]
+CREATE [ UNIQUE ] INDEX <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table</replaceable> [ USING <replaceable class="parameter">method</replaceable> ]
     ( { <replaceable class="parameter">column</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [, ...] )
     [ WHERE <replaceable class="parameter">predicate</replaceable> ]
 </synopsis>
@@ -113,7 +113,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="parameter">index_name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
        The name of the index to be created.  No schema name can be included

diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index c6a146cf00deb70c04af46ecdbeacf2087fad05f..42bf00de54bf58249690c79f1fe4f66daca02954 100644 (file)
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">langname</replaceable>
+CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">name</replaceable>
     HANDLER <replaceable class="parameter">call_handler</replaceable> [ VALIDATOR <replaceable>valfunction</replaceable> ]
 </synopsis>
  </refsynopsisdiv>
@@ -83,7 +83,7 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">langna
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="parameter">langname</replaceable></term>
+     <term><replaceable class="parameter">name</replaceable></term>
 
      <listitem>
       <para>

diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 3a7f7b65afd806baa9cc6002be40727b5845d036..f649efc21e65ceae36e6607544f88c737d17a096 100644 (file)
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>CREATE OPERATOR CLASS</refname>
-  <refpurpose>define a new operator class for indexes</refpurpose>
+  <refpurpose>define a new operator class</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-createopclass">
@@ -22,7 +22,7 @@ PostgreSQL documentation
 <synopsis>
 CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAULT ] FOR TYPE <replaceable class="parameter">data_type</replaceable> USING <replaceable class="parameter">index_method</replaceable> AS
   {  OPERATOR <replaceable class="parameter">strategy_number</replaceable> <replaceable class="parameter">operator_name</replaceable> [ ( <replaceable class="parameter">op_type</replaceable>, <replaceable class="parameter">op_type</replaceable> ) ] [ RECHECK ]
-   | FUNCTION <replaceable class="parameter">support_number</replaceable> <replaceable class="parameter">func_name</replaceable> ( <replaceable class="parameter">argument_types</replaceable> )
+   | FUNCTION <replaceable class="parameter">support_number</replaceable> <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] )
    | STORAGE <replaceable class="parameter">storage_type</replaceable>
   } [, ... ]
 </synopsis>
@@ -167,7 +167,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="parameter">func_name</replaceable></term>
+    <term><replaceable class="parameter">funcname</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of a function that is an

diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 17920b1e30c61266f8f4b5427d099fa5f240036e..02925163095bc2957eb049ec225d0ec28a48cabf 100644 (file)
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 CREATE OPERATOR <replaceable>name</replaceable> (
-    PROCEDURE = <replaceable class="parameter">func_name</replaceable>
+    PROCEDURE = <replaceable class="parameter">funcname</replaceable>
     [, LEFTARG = <replaceable class="parameter">lefttype</replaceable> ] [, RIGHTARG = <replaceable class="parameter">righttype</replaceable> ]
     [, COMMUTATOR = <replaceable class="parameter">com_op</replaceable> ] [, NEGATOR = <replaceable class="parameter">neg_op</replaceable> ]
     [, RESTRICT = <replaceable class="parameter">res_proc</replaceable> ] [, JOIN = <replaceable class="parameter">join_proc</replaceable> ]
@@ -89,7 +89,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
   </para>
 
   <para>
-   The <replaceable class="parameter">func_name</replaceable>
+   The <replaceable class="parameter">funcname</replaceable>
    procedure must have been previously defined using <command>CREATE
    FUNCTION</command> and must be defined to accept the correct number
    of arguments (either one or two) of the indicated types.
@@ -121,7 +121,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="parameter">func_name</replaceable></term>
+      <term><replaceable class="parameter">funcname</replaceable></term>
       <listitem>
        <para>
        The function used to implement this operator.

diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index aea758ea2244054a834c03cebfb0d42dc5fecf90..e83b69c50b0b179dd63d5a68b71af20cc2243390 100644 (file)
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
+CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ]
     [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ]
     [ START [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
 </synopsis>
@@ -33,7 +33,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
    <command>CREATE SEQUENCE</command> creates a new sequence number
    generator.  This involves creating and initializing a new special
    single-row table with the name <replaceable
-   class="parameter">seqname</replaceable>.  The generator will be
+   class="parameter">name</replaceable>.  The generator will be
    owned by the user issuing the command.
   </para>
 
@@ -59,7 +59,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep
    Although you cannot update a sequence directly, you can use a query like
 
 <programlisting>
-SELECT * FROM <replaceable>seqname</replaceable>;
+SELECT * FROM <replaceable>name</replaceable>;
 </programlisting>
 
    to examine the parameters and current state of a sequence.  In particular,
@@ -88,7 +88,7 @@ SELECT * FROM <replaceable>seqname</replaceable>;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="parameter">seqname</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the sequence to be created.

diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 58aae2c9933830213a850aa651af9b3d86e75f4f..6e3fa3b0ae8611c0f42fcca1175a2b1d31654fe2 100644 (file)
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
 <synopsis>
 CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTER } { <replaceable class="PARAMETER">event</replaceable> [ OR ... ] }
     ON <replaceable class="PARAMETER">table</replaceable> [ FOR [ EACH ] { ROW | STATEMENT } ]
-    EXECUTE PROCEDURE <replaceable class="PARAMETER">func</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> )
+    EXECUTE PROCEDURE <replaceable class="PARAMETER">funcname</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> )
 </synopsis>
  </refsynopsisdiv>
  

diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 27811bca13e187e6b9a269c2b8ee62f870f9bfad..a1f0dcf1165293590f7f799743ba8974ff6d8056 100644 (file)
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -20,10 +20,10 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE TYPE <replaceable class="parameter">typename</replaceable> AS
+CREATE TYPE <replaceable class="parameter">name</replaceable> AS
     ( <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [, ... ] )
 
-CREATE TYPE <replaceable class="parameter">typename</replaceable> (
+CREATE TYPE <replaceable class="parameter">name</replaceable> (
     INPUT = <replaceable class="parameter">input_function</replaceable>,
     OUTPUT = <replaceable class="parameter">output_function</replaceable>
     [ , RECEIVE = <replaceable class="parameter">receive_function</replaceable> ]
@@ -274,7 +274,7 @@ CREATE TYPE <replaceable class="parameter">typename</replaceable> (
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="parameter">typename</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of a type to be created.

diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 64b865d5ef0fd66dd12a153d3facf4f0b070bbac..1d02853f8f4edd4709e06f0246da7a33781b0cc4 100644 (file)
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
 
 where <replaceable class="PARAMETER">option</replaceable> can be:
     
@@ -51,7 +51,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="parameter">username</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
        The name of the user.

diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index 52469573f20cb3c8f6f812d3c839383ef7f42869..a4aed218c723bf7d9a1edc4cf12ed20578b4456b 100644 (file)
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]
+DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]
     CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable>
     [ FOR { READ ONLY | UPDATE [ OF <replaceable class="parameter">column</replaceable> [, ...] ] } ]
 </synopsis>
@@ -83,7 +83,7 @@ DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INS
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="parameter">cursorname</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the cursor to be created.

diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index 69352258f3fa07bfb888a1abd2f39706a10df6d0..6709f5576c48b46d4284baa59c9e552afce5fa81 100644 (file)
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP AGGREGATE</refname>
-  <refpurpose>remove a user-defined aggregate function</refpurpose>
+  <refpurpose>remove an aggregate function</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-dropaggregate">

diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml
index 224290a6db2a37a8321af88fb80d7e81fdd3e1fd..3974c8030ae76a7b3da2283c2c1f5260ded1d2ef 100644 (file)
--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
@@ -8,7 +8,7 @@
 
  <refnamediv>
   <refname>DROP CAST</refname>
-  <refpurpose>remove a user-defined cast</refpurpose>
+  <refpurpose>remove a cast</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-dropcast">

diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml
index 94086ce540393c7b09524be891f9f1533ea7bd4d..a2311209d667e23065247ab3c472dea8011a19ce 100644 (file)
--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
@@ -8,7 +8,7 @@
 
  <refnamediv>
   <refname>DROP CONVERSION</refname>
-  <refpurpose>remove a user-defined conversion</refpurpose>
+  <refpurpose>remove a conversion</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-dropconversion">
@@ -17,7 +17,7 @@
 
  <refsynopsisdiv>
 <synopsis>
-DROP CONVERSION <replaceable>conversion_name</replaceable> [ CASCADE | RESTRICT ]
+DROP CONVERSION <replaceable>name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
   
@@ -35,7 +35,7 @@ DROP CONVERSION <replaceable>conversion_name</replaceable> [ CASCADE | RESTRICT
 
    <variablelist>
     <varlistentry>
-     <term><replaceable>conversion_name</replaceable></term>
+     <term><replaceable>name</replaceable></term>
 
      <listitem>
       <para>

diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index 9159cb913a8eba6f758e85b1b35c9a3eccb629ba..3b37fdb2257784a1c486a84ff3a33fa021c7686a 100644 (file)
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ CASCADE | RESTRICT ]
+DROP DOMAIN <replaceable class="PARAMETER">name</replaceable> [, ...]  [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,7 +38,7 @@ DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ C
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">domainname</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of an existing domain.

diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 2be2fd920bdc96d4d1f2dbdd54330e09649c548c..80bb815604894e056ca50ea72f49ef63f61bb67e 100644 (file)
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP FUNCTION</refname>
-  <refpurpose>remove a user-defined function</refpurpose>
+  <refpurpose>remove a function</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-dropfunction">

diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 6f76fb70a455df2700d532f1e68513e0e76565df..eaacf6a65ee67be5f1858a65b8da868eff2ea0d1 100644 (file)
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP LANGUAGE</refname>
-  <refpurpose>remove a user-defined procedural language</refpurpose>
+  <refpurpose>remove a procedural language</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-droplanguage">

diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml
index d249d4479f76dfdff8527e2ed5bf71ca576a2de3..4918c5df6c99ca04cd194e909a3c72c631ed1a4c 100644 (file)
--- a/doc/src/sgml/ref/drop_opclass.sgml
+++ b/doc/src/sgml/ref/drop_opclass.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP OPERATOR CLASS</refname>
-  <refpurpose>remove a user-defined operator class</refpurpose>
+  <refpurpose>remove an operator class</refpurpose>
  </refnamediv>
   
  <indexterm zone="sql-dropopclass">

diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index c7215671b9776960f4ad76a29834bc05a9808190..735b9af607f5c20a525140636b0d3a602cd12a3e 100644 (file)
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP OPERATOR</refname>
-  <refpurpose>remove a user-defined operator</refpurpose>
+  <refpurpose>remove an operator</refpurpose>
  </refnamediv>
   
  <indexterm zone="sql-dropoperator">

diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index 5e0ad008368d79e9d015b3895447c520e2f87482..4a99ec94cb344604b2db2e3f34e4815433658e7f 100644 (file)
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DROP TYPE</refname>
-  <refpurpose>remove a user-defined data type</refpurpose>
+  <refpurpose>remove a data type</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-droptype">
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP TYPE <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,7 +38,7 @@ DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...] [ CASCAD
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">typename</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the data type to remove.

diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index c7fcfdc001f4b4c3814ae949b8267bbe8fc5c2e9..70b0255cb3ca3964b61dcb7ecfcc8f597257e5b2 100644 (file)
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor</replaceable>
+FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable>
 
 where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:
 
@@ -270,7 +270,7 @@ where <replaceable class="PARAMETER">direction</replaceable> can be empty or one
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">cursor</replaceable></term>
+    <term><replaceable class="PARAMETER">cursorname</replaceable></term>
     <listitem>
      <para>
       An open cursor's name.

diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml
index 5b00058bafbbb8d42092b65091d46294ed3e910f..ffaceec75407249e7ae94f72f1e262ec56dabcb8 100644 (file)
--- a/doc/src/sgml/ref/move.sgml
+++ b/doc/src/sgml/ref/move.sgml
@@ -11,7 +11,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>MOVE</refname>
-  <refpurpose>reposition a cursor</refpurpose>
+  <refpurpose>position a cursor</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-move">
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor</replaceable>
+MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -30,7 +30,7 @@ MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <r
   <para>
    <command>MOVE</command> repositions a cursor without retrieving any data.
    <command>MOVE</command> works exactly like the <command>FETCH</command>
-   command, except it only repositions the cursor and does not return rows.
+   command, except it only positions the cursor and does not return rows.
   </para>
 
   <para>

diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index f096879ae94e5f8f6237d6cfc976bc2c25c63f0e..415d8415c6c280d7ac83ca3094024121225f2310 100644 (file)
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -20,9 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-RESET <replaceable class="PARAMETER">parameter</replaceable>
-</synopsis>
-<synopsis>
+RESET <replaceable class="PARAMETER">name</replaceable>
 RESET ALL
 </synopsis>
  </refsynopsisdiv>
@@ -61,7 +59,7 @@ SET <replaceable class="parameter">parameter</replaceable> TO DEFAULT
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">parameter</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       The name of a run-time parameter. See <xref linkend="sql-set"

diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 084575251f7343061b1075eb8b7ea9c8e0a74d70..e177cc479ed06de5abff8eaf031aa5a433f8686d 100644 (file)
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">variable</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
+SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">name</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
 SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</replaceable> | LOCAL | DEFAULT }
 </synopsis>
  </refsynopsisdiv>
@@ -91,7 +91,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">variable</replaceable></term>
+    <term><replaceable class="PARAMETER">name</replaceable></term>
     <listitem>
      <para>
       Name of a settable run-time parameter.  Available parameters are

diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml
index 2ea1ca4bbc64f2c010003e36f7146f8b15df8dd2..608d37ba996e30ec0e2db980c10e6bcd22618658 100644 (file)
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
@@ -16,7 +16,7 @@
 
  <refsynopsisdiv>
 <synopsis>
-SET CONSTRAINTS { ALL | <replaceable class="parameter">constraint</replaceable> [, ...] } { DEFERRED | IMMEDIATE }
+SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...] } { DEFERRED | IMMEDIATE }
 </synopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index 2ebba9b2a44618e5cdecb95a4edee5005a0d4aba..b47253439ef5a72a406b76b0a6dfe8d1d3bfeacb 100644 (file)
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -21,8 +21,6 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 SHOW <replaceable class="PARAMETER">name</replaceable>
-</synopsis>
-<synopsis>
 SHOW ALL
 </synopsis>
  </refsynopsisdiv>