diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-09-19 10:23:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-09-19 10:23:27 +0000 |
| commit | f7e508a759b9a763096a1ff485dc3e6517e3522e (patch) | |
| tree | f2ae2546cd4370f3b142a137bdbabd5deb361c83 | |
| parent | 7ef5ffdeaf466ed4f5a642cc06c6779a40681538 (diff) | |
| download | postgresql-f7e508a759b9a763096a1ff485dc3e6517e3522e.tar.gz postgresql-f7e508a759b9a763096a1ff485dc3e6517e3522e.zip | |
Make the placeholder naming in the synopses of the SQL help more consistent
51 files changed, 284 insertions, 284 deletions
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml index 8c46b5992d9..4be65d30a7a 100644 --- a/doc/src/sgml/ref/alter_conversion.sgml +++ b/doc/src/sgml/ref/alter_conversion.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.9 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.10 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER CONVERSION <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER CONVERSION <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER CONVERSION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER CONVERSION <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -59,7 +59,7 @@ ALTER CONVERSION <replaceable>name</replaceable> OWNER TO <replaceable>newowner< </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the conversion. @@ -68,7 +68,7 @@ ALTER CONVERSION <replaceable>name</replaceable> OWNER TO <replaceable>newowner< </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the conversion. diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 9a28adc8468..a30e39718ad 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.23 2009/09/18 05:00:41 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.24 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -27,7 +27,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <rep CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>new_owner</replaceable> @@ -117,7 +117,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL </varlistentry> <varlistentry> - <term><replaceable>newname</replaceable></term> + <term><replaceable>new_name</replaceable></term> <listitem> <para> The new name of the database. diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml index 798d0121476..2d4d3e90159 100644 --- a/doc/src/sgml/ref/alter_group.sgml +++ b/doc/src/sgml/ref/alter_group.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.18 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_group.sgml,v 1.19 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,10 +21,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> ADD USER <replaceable class="PARAMETER">username</replaceable> [, ... ] -ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> DROP USER <replaceable class="PARAMETER">username</replaceable> [, ... ] +ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> ADD USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ] +ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> DROP USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ] -ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -60,7 +60,7 @@ ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> RENAME TO <re <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">groupname</replaceable></term> + <term><replaceable class="PARAMETER">group_name</replaceable></term> <listitem> <para> The name of the group (role) to modify. @@ -69,7 +69,7 @@ ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> RENAME TO <re </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">username</replaceable></term> + <term><replaceable class="PARAMETER">user_name</replaceable></term> <listitem> <para> Users (roles) that are to be added to or removed from the group. @@ -80,7 +80,7 @@ ALTER GROUP <replaceable class="PARAMETER">groupname</replaceable> RENAME TO <re </varlistentry> <varlistentry> - <term><replaceable>newname</replaceable></term> + <term><replaceable>new_name</replaceable></term> <listitem> <para> The new name of the group. diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgml index 04e0b470237..94c9222c1f0 100644 --- a/doc/src/sgml/ref/alter_language.sgml +++ b/doc/src/sgml/ref/alter_language.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_language.sgml,v 1.8 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_language.sgml,v 1.9 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO <replacea </varlistentry> <varlistentry> - <term><replaceable>newname</replaceable></term> + <term><replaceable>new_name</replaceable></term> <listitem> <para> The new name of the language diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgml index c15cd57195c..fbdc051b80e 100644 --- a/doc/src/sgml/ref/alter_opclass.sgml +++ b/doc/src/sgml/ref/alter_opclass.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opclass.sgml,v 1.9 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opclass.sgml,v 1.10 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -69,7 +69,7 @@ ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="p </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the operator class. @@ -78,7 +78,7 @@ ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="p </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the operator class. diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml index 4a11661a09a..9e6e8aff479 100644 --- a/doc/src/sgml/ref/alter_operator.sgml +++ b/doc/src/sgml/ref/alter_operator.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_operator.sgml,v 1.4 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_operator.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>lefttype</replaceable> | NONE } , { <replaceable>righttype</replaceable> | NONE } ) OWNER TO <replaceable>newowner</replaceable> +ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</replaceable> | NONE } , { <replaceable>right_type</replaceable> | NONE } ) OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -58,7 +58,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>lefttype</replac </varlistentry> <varlistentry> - <term><replaceable class="parameter">lefttype</replaceable></term> + <term><replaceable class="parameter">left_type</replaceable></term> <listitem> <para> The data type of the operator's left operand; write @@ -68,7 +68,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>lefttype</replac </varlistentry> <varlistentry> - <term><replaceable class="parameter">righttype</replaceable></term> + <term><replaceable class="parameter">right_type</replaceable></term> <listitem> <para> The data type of the operator's right operand; write @@ -78,7 +78,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>lefttype</replac </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the operator. diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml index 582f367bfd1..6e28b8540a8 100644 --- a/doc/src/sgml/ref/alter_opfamily.sgml +++ b/doc/src/sgml/ref/alter_opfamily.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.5 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.6 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -23,14 +23,14 @@ PostgreSQL documentation <synopsis> ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> ADD { 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> ) - | FUNCTION <replaceable class="parameter">support_number</replaceable> [ ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) ] <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] ) + | FUNCTION <replaceable class="parameter">support_number</replaceable> [ ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) ] <replaceable class="parameter">function_name</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] ) } [, ... ] ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> DROP { OPERATOR <replaceable class="parameter">strategy_number</replaceable> ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) | FUNCTION <replaceable class="parameter">support_number</replaceable> ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) } [, ... ] -ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="parameter">index_method</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -166,7 +166,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class=" </varlistentry> <varlistentry> - <term><replaceable class="parameter">funcname</replaceable></term> + <term><replaceable class="parameter">function_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a function that is an @@ -176,7 +176,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class=" </varlistentry> <varlistentry> - <term><replaceable class="parameter">argument_types</replaceable></term> + <term><replaceable class="parameter">argument_type</replaceable></term> <listitem> <para> The parameter data type(s) of the function. @@ -185,7 +185,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class=" </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the operator family. @@ -194,7 +194,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class=" </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the operator family. diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index 5b8a832a487..9be5812463d 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.13 2009/09/18 05:00:41 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.14 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -35,7 +35,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replace | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' -ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> ALTER ROLE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } ALTER ROLE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT @@ -137,7 +137,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RESET ALL </varlistentry> <varlistentry> - <term><replaceable>newname</replaceable></term> + <term><replaceable>new_name</replaceable></term> <listitem> <para> The new name of the role. diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgml index 3f3ea6e5668..122b0746097 100644 --- a/doc/src/sgml/ref/alter_schema.sgml +++ b/doc/src/sgml/ref/alter_schema.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_schema.sgml,v 1.10 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_schema.sgml,v 1.11 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER SCHEMA <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER SCHEMA <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER SCHEMA <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER SCHEMA <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -58,7 +58,7 @@ ALTER SCHEMA <replaceable>name</replaceable> OWNER TO <replaceable>newowner</rep </varlistentry> <varlistentry> - <term><replaceable>newname</replaceable></term> + <term><replaceable>new_name</replaceable></term> <listitem> <para> The new name of the schema. The new name cannot @@ -69,7 +69,7 @@ ALTER SCHEMA <replaceable>name</replaceable> OWNER TO <replaceable>newowner</rep </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the schema. diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml index 7798d6dff41..1bce7fb4de8 100644 --- a/doc/src/sgml/ref/alter_server.sgml +++ b/doc/src/sgml/ref/alter_server.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_server.sgml,v 1.2 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_server.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER SERVER <replaceable class="parameter">servername</replaceable> [ VERSION 'newversion' ] +ALTER SERVER <replaceable class="parameter">server_name</replaceable> [ VERSION '<replaceable class="parameter">new_version</replaceable>' ] [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] ) ] -ALTER SERVER <replaceable class="PARAMETER">servername</replaceable> OWNER TO <replaceable>new_owner</replaceable> +ALTER SERVER <replaceable class="PARAMETER">server_name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -52,7 +52,7 @@ ALTER SERVER <replaceable class="PARAMETER">servername</replaceable> OWNER TO <r <variablelist> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The name of an existing server. @@ -61,7 +61,7 @@ ALTER SERVER <replaceable class="PARAMETER">servername</replaceable> OWNER TO <r </varlistentry> <varlistentry> - <term><replaceable class="parameter">serverversion</replaceable></term> + <term><replaceable class="parameter">new_version</replaceable></term> <listitem> <para> New server version. diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml index 482db18bb22..8c5341dd084 100644 --- a/doc/src/sgml/ref/alter_tablespace.sgml +++ b/doc/src/sgml/ref/alter_tablespace.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tablespace.sgml,v 1.4 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tablespace.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -56,7 +56,7 @@ ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO <replaceable>newowner< </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the tablespace. The new name cannot @@ -67,7 +67,7 @@ ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO <replaceable>newowner< </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the tablespace. diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml index 5328aae0da0..6406595c549 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.11 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.12 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TRIGGER <replaceable class="PARAMETER">name</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">new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -63,7 +63,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">newname</replaceable></term> + <term><replaceable class="PARAMETER">new_name</replaceable></term> <listitem> <para> The new name for the trigger. diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml index 900152f3687..cf31eab5aca 100644 --- a/doc/src/sgml/ref/alter_tsconfig.sgml +++ b/doc/src/sgml/ref/alter_tsconfig.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.4 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -31,8 +31,8 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> ALTER MAPPING FOR <replaceable class="parameter">token_type</replaceable> [, ... ] REPLACE <replaceable class="parameter">old_dictionary</replaceable> WITH <replaceable class="parameter">new_dictionary</replaceable> ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> DROP MAPPING [ IF EXISTS ] FOR <replaceable class="parameter">token_type</replaceable> [, ... ] -ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -107,7 +107,7 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replac </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the text search configuration. @@ -116,7 +116,7 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replac </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the text search configuration. diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml index bf510d28508..7c55f5f993e 100644 --- a/doc/src/sgml/ref/alter_tsdictionary.sgml +++ b/doc/src/sgml/ref/alter_tsdictionary.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsdictionary.sgml,v 1.4 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsdictionary.sgml,v 1.5 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -24,8 +24,8 @@ PostgreSQL documentation ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> ( <replaceable class="parameter">option</replaceable> [ = <replaceable class="parameter">value</replaceable> ] [, ... ] ) -ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable> +ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO <replaceable>new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -80,7 +80,7 @@ ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO <replaceab </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the text search dictionary. @@ -89,7 +89,7 @@ ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO <replaceab </varlistentry> <varlistentry> - <term><replaceable class="parameter">newowner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The new owner of the text search dictionary. diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml index f1a63cdc6e4..a47e893c2e0 100644 --- a/doc/src/sgml/ref/alter_tsparser.sgml +++ b/doc/src/sgml/ref/alter_tsparser.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsparser.sgml,v 1.2 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsparser.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -53,7 +53,7 @@ ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable> </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the text search parser. diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml index b03a8d74a2a..16c76339fd3 100644 --- a/doc/src/sgml/ref/alter_tstemplate.sgml +++ b/doc/src/sgml/ref/alter_tstemplate.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tstemplate.sgml,v 1.2 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tstemplate.sgml,v 1.3 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -53,7 +53,7 @@ ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceabl </varlistentry> <varlistentry> - <term><replaceable class="parameter">newname</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the text search template. diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index 386441fe8cc..3d22e75050b 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.46 2009/09/18 05:00:41 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.47 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -35,7 +35,7 @@ ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replace | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' -ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml index af20945dd2d..c98ea7709fa 100644 --- a/doc/src/sgml/ref/alter_user_mapping.sgml +++ b/doc/src/sgml/ref/alter_user_mapping.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user_mapping.sgml,v 1.3 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user_mapping.sgml,v 1.4 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER USER MAPPING FOR { <replaceable class="parameter">username</replaceable> | USER | CURRENT_USER | PUBLIC } - SERVER <replaceable class="parameter">servername</replaceable> +ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } + SERVER <replaceable class="parameter">server_name</replaceable> OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] ) </synopsis> </refsynopsisdiv> @@ -48,7 +48,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">username</replaceable> | <variablelist> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> User name of the mapping. <literal>CURRENT_USER</> @@ -60,7 +60,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">username</replaceable> | </varlistentry> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> Server name of the user mapping. diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index ce3087b0df1..9d186aeb3c1 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.46 2008/11/24 08:46:03 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.47 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CLUSTER [VERBOSE] <replaceable class="PARAMETER">tablename</replaceable> [ USING <replaceable class="PARAMETER">indexname</replaceable> ] +CLUSTER [VERBOSE] <replaceable class="PARAMETER">table_name</replaceable> [ USING <replaceable class="PARAMETER">index_name</replaceable> ] CLUSTER [VERBOSE] </synopsis> </refsynopsisdiv> @@ -32,11 +32,11 @@ CLUSTER [VERBOSE] <para> <command>CLUSTER</command> instructs <productname>PostgreSQL</productname> to cluster the table specified - by <replaceable class="parameter">tablename</replaceable> + by <replaceable class="parameter">table_name</replaceable> based on the index specified by - <replaceable class="parameter">indexname</replaceable>. The index must + <replaceable class="parameter">index_name</replaceable>. The index must already have been defined on - <replaceable class="parameter">tablename</replaceable>. + <replaceable class="parameter">table_name</replaceable>. </para> <para> @@ -54,7 +54,7 @@ CLUSTER [VERBOSE] <para> When a table is clustered, <productname>PostgreSQL</productname> remembers which index it was clustered by. The form - <command>CLUSTER <replaceable class="parameter">tablename</replaceable></command> + <command>CLUSTER <replaceable class="parameter">table_name</replaceable></command> reclusters the table using the same index as before. </para> @@ -79,7 +79,7 @@ CLUSTER [VERBOSE] <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">tablename</replaceable></term> + <term><replaceable class="PARAMETER">table_name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of a table. @@ -88,7 +88,7 @@ CLUSTER [VERBOSE] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">indexname</replaceable></term> + <term><replaceable class="PARAMETER">index_name</replaceable></term> <listitem> <para> The name of an index. @@ -215,7 +215,7 @@ CLUSTER; <para> The syntax <synopsis> -CLUSTER <replaceable class="PARAMETER">indexname</replaceable> ON <replaceable class="PARAMETER">tablename</replaceable> +CLUSTER <replaceable class="PARAMETER">index_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> </synopsis> is also supported for compatibility with pre-8.3 <productname>PostgreSQL</> versions. diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index 7bbfd019069..730ad7cf82c 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.38 2008/11/14 10:22:45 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.39 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -26,15 +26,15 @@ COMMENT ON TABLE <replaceable class="PARAMETER">object_name</replaceable> | COLUMN <replaceable class="PARAMETER">table_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> | AGGREGATE <replaceable class="PARAMETER">agg_name</replaceable> (<replaceable class="PARAMETER">agg_type</replaceable> [, ...] ) | - CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) | + CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) | CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | CONVERSION <replaceable class="PARAMETER">object_name</replaceable> | DATABASE <replaceable class="PARAMETER">object_name</replaceable> | DOMAIN <replaceable class="PARAMETER">object_name</replaceable> | - FUNCTION <replaceable class="PARAMETER">func_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) | + FUNCTION <replaceable class="PARAMETER">function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) | INDEX <replaceable class="PARAMETER">object_name</replaceable> | LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> | - OPERATOR <replaceable class="PARAMETER">op</replaceable> (<replaceable class="PARAMETER">leftoperand_type</replaceable>, <replaceable class="PARAMETER">rightoperand_type</replaceable>) | + OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) | OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> | @@ -50,7 +50,7 @@ COMMENT ON TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | TYPE <replaceable class="PARAMETER">object_name</replaceable> | VIEW <replaceable class="PARAMETER">object_name</replaceable> -} IS <replaceable class="PARAMETER">'text'</replaceable> +} IS '<replaceable class="PARAMETER">text</replaceable>' </synopsis> </refsynopsisdiv> @@ -89,7 +89,7 @@ COMMENT ON <term><replaceable class="parameter">table_name.column_name</replaceable></term> <term><replaceable class="parameter">agg_name</replaceable></term> <term><replaceable class="parameter">constraint_name</replaceable></term> - <term><replaceable class="parameter">func_name</replaceable></term> + <term><replaceable class="parameter">function_name</replaceable></term> <term><replaceable class="parameter">op</replaceable></term> <term><replaceable class="parameter">rule_name</replaceable></term> <term><replaceable class="parameter">trigger_name</replaceable></term> @@ -115,7 +115,7 @@ COMMENT ON </varlistentry> <varlistentry> - <term><replaceable>sourcetype</replaceable></term> + <term><replaceable>source_type</replaceable></term> <listitem> <para> The name of the source data type of the cast. @@ -124,7 +124,7 @@ COMMENT ON </varlistentry> <varlistentry> - <term><replaceable>targettype</replaceable></term> + <term><replaceable>target_type</replaceable></term> <listitem> <para> The name of the target data type of the cast. diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index b0e05188381..0e8cb5567bb 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.90 2009/09/18 20:01:13 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.91 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -22,7 +22,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] +COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN } [ [ WITH ] [ BINARY ] @@ -34,7 +34,7 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla [ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ] [ FORCE NOT NULL <replaceable class="parameter">column</replaceable> [, ...] ] -COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) } +COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) } TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT } [ [ WITH ] [ BINARY ] @@ -85,7 +85,7 @@ COPY { <replaceable class="parameter">tablename</replaceable> [ ( <replaceable c <variablelist> <varlistentry> - <term><replaceable class="parameter">tablename</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an existing table. @@ -822,12 +822,12 @@ ZW ZIMBABWE version 7.3 and is still supported: <synopsis> -COPY [ BINARY ] <replaceable class="parameter">tablename</replaceable> [ WITH OIDS ] +COPY [ BINARY ] <replaceable class="parameter">table_name</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">tablename</replaceable> [ WITH OIDS ] +COPY [ BINARY ] <replaceable class="parameter">table_name</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 d91d7d57bb2..16a7cef40f9 100644 --- a/doc/src/sgml/ref/create_cast.sgml +++ b/doc/src/sgml/ref/create_cast.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.31 2008/11/14 10:22:45 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.32 2009/09/19 10:23:26 petere Exp $ --> <refentry id="SQL-CREATECAST"> <refmeta> @@ -18,15 +18,15 @@ <refsynopsisdiv> <synopsis> -CREATE CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) - WITH FUNCTION <replaceable>funcname</replaceable> (<replaceable>argtypes</replaceable>) +CREATE CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) + WITH FUNCTION <replaceable>function_name</replaceable> (<replaceable>argument_type</replaceable> [, ...]) [ AS ASSIGNMENT | AS IMPLICIT ] -CREATE CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) +CREATE CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) WITHOUT FUNCTION [ AS ASSIGNMENT | AS IMPLICIT ] -CREATE CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) +CREATE CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) WITH INOUT [ AS ASSIGNMENT | AS IMPLICIT ] </synopsis> @@ -168,7 +168,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; <variablelist> <varlistentry> - <term><replaceable>sourcetype</replaceable></term> + <term><replaceable>source_type</replaceable></term> <listitem> <para> @@ -178,7 +178,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; </varlistentry> <varlistentry> - <term><replaceable>targettype</replaceable></term> + <term><replaceable>target_type</replaceable></term> <listitem> <para> @@ -188,7 +188,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; </varlistentry> <varlistentry> - <term><replaceable>funcname</replaceable>(<replaceable>argtypes</replaceable>)</term> + <term><replaceable>function_name</replaceable>(<replaceable>argument_type</replaceable> [, ...])</term> <listitem> <para> diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml index 981d20c018d..dbf4d679f2c 100644 --- a/doc/src/sgml/ref/create_constraint.sgml +++ b/doc/src/sgml/ref/create_constraint.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.19 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.20 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -27,7 +27,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable> [ FROM <replaceable class="parameter">referenced_table_name</replaceable> ] { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } } FOR EACH ROW - EXECUTE PROCEDURE <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">arguments</replaceable> ) + EXECUTE PROCEDURE <replaceable class="parameter">function_name</replaceable> ( <replaceable class="parameter">arguments</replaceable> ) </synopsis> </refsynopsisdiv> @@ -110,7 +110,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">funcname</replaceable></term> + <term><replaceable class="PARAMETER">function_name</replaceable></term> <listitem> <para> The function to call when the trigger is fired. See <xref diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml index 1cdc83bbd0e..9a8cee7de19 100644 --- a/doc/src/sgml/ref/create_conversion.sgml +++ b/doc/src/sgml/ref/create_conversion.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.21 2008/11/14 10:22:46 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.22 2009/09/19 10:23:26 petere Exp $ --> <refentry id="SQL-CREATECONVERSION"> <refmeta> @@ -19,7 +19,7 @@ <refsynopsisdiv> <synopsis> CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable> - FOR <replaceable>source_encoding</replaceable> TO <replaceable>dest_encoding</replaceable> FROM <replaceable>funcname</replaceable> + FOR <replaceable>source_encoding</replaceable> TO <replaceable>dest_encoding</replaceable> FROM <replaceable>function_name</replaceable> </synopsis> </refsynopsisdiv> @@ -93,7 +93,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable> </varlistentry> <varlistentry> - <term><replaceable>funcname</replaceable></term> + <term><replaceable>function_name</replaceable></term> <listitem> <para> diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index 786a63b7020..ff4c74e4732 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.52 2009/05/06 16:15:21 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.53 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -22,7 +22,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> - [ [ WITH ] [ OWNER [=] <replaceable class="parameter">dbowner</replaceable> ] + [ [ WITH ] [ OWNER [=] <replaceable class="parameter">user_name</replaceable> ] [ TEMPLATE [=] <replaceable class="parameter">template</replaceable> ] [ ENCODING [=] <replaceable class="parameter">encoding</replaceable> ] [ LC_COLLATE [=] <replaceable class="parameter">lc_collate</replaceable> ] @@ -81,7 +81,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="parameter">dbowner</replaceable></term> + <term><replaceable class="parameter">use_name</replaceable></term> <listitem> <para> The name of the database user who will own the new database, diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index 5ebf170bdb6..5b5cda3a817 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.85 2009/09/03 22:11:07 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.86 2009/09/19 10:23:26 petere Exp $ --> <refentry id="SQL-CREATEFUNCTION"> @@ -21,10 +21,10 @@ $PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.85 2009/09/03 22:11 <refsynopsisdiv> <synopsis> CREATE [ OR REPLACE ] FUNCTION - <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [ { DEFAULT | = } <replaceable class="parameter">defexpr</replaceable> ] [, ...] ] ) + <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [ { DEFAULT | = } <replaceable class="parameter">default_expr</replaceable> ] [, ...] ] ) [ RETURNS <replaceable class="parameter">rettype</replaceable> - | RETURNS TABLE ( <replaceable class="parameter">colname</replaceable> <replaceable class="parameter">coltype</replaceable> [, ...] ) ] - { LANGUAGE <replaceable class="parameter">langname</replaceable> + | RETURNS TABLE ( <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">column_type</replaceable> [, ...] ) ] + { LANGUAGE <replaceable class="parameter">lang_name</replaceable> | WINDOW | IMMUTABLE | STABLE | VOLATILE | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT @@ -147,8 +147,8 @@ CREATE [ OR REPLACE ] FUNCTION <para> The type of a column is referenced by writing <literal><replaceable - class="parameter">tablename</replaceable>.<replaceable - class="parameter">columnname</replaceable>%TYPE</literal>. + class="parameter">table_name</replaceable>.<replaceable + class="parameter">column_name</replaceable>%TYPE</literal>. Using this feature can sometimes help make a function independent of changes to the definition of a table. </para> @@ -156,7 +156,7 @@ CREATE [ OR REPLACE ] FUNCTION </varlistentry> <varlistentry> - <term><replaceable class="parameter">defexpr</replaceable></term> + <term><replaceable class="parameter">default_expr</replaceable></term> <listitem> <para> @@ -198,14 +198,14 @@ CREATE [ OR REPLACE ] FUNCTION <para> The type of a column is referenced by writing <literal><replaceable - class="parameter">tablename</replaceable>.<replaceable - class="parameter">columnname</replaceable>%TYPE</literal>. + class="parameter">table_name</replaceable>.<replaceable + class="parameter">column_name</replaceable>%TYPE</literal>. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="parameter">colname</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> @@ -218,7 +218,7 @@ CREATE [ OR REPLACE ] FUNCTION </varlistentry> <varlistentry> - <term><replaceable class="parameter">coltype</replaceable></term> + <term><replaceable class="parameter">column_type</replaceable></term> <listitem> <para> @@ -229,7 +229,7 @@ CREATE [ OR REPLACE ] FUNCTION </varlistentry> <varlistentry> - <term><replaceable class="parameter">langname</replaceable></term> + <term><replaceable class="parameter">lang_name</replaceable></term> <listitem> <para> diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml index b45fa6eeb20..80ba1f49af3 100644 --- a/doc/src/sgml/ref/create_group.sgml +++ b/doc/src/sgml/ref/create_group.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_group.sgml,v 1.20 2009/09/18 05:00:41 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_group.sgml,v 1.21 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -33,11 +33,11 @@ CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <repla | LOGIN | NOLOGIN | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | USER <replaceable class="PARAMETER">rolename</replaceable> [, ...] + | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] | SYSID <replaceable class="PARAMETER">uid</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index c9cc7b2c0cc..44e1f1f21fd 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.23 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.24 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -24,7 +24,7 @@ PostgreSQL documentation CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAULT ] FOR TYPE <replaceable class="parameter">data_type</replaceable> USING <replaceable class="parameter">index_method</replaceable> [ FAMILY <replaceable class="parameter">family_name</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> ) ] - | FUNCTION <replaceable class="parameter">support_number</replaceable> [ ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) ] <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] ) + | FUNCTION <replaceable class="parameter">support_number</replaceable> [ ( <replaceable class="parameter">op_type</replaceable> [ , <replaceable class="parameter">op_type</replaceable> ] ) ] <replaceable class="parameter">function_name</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] ) | STORAGE <replaceable class="parameter">storage_type</replaceable> } [, ... ] </synopsis> @@ -191,7 +191,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL </varlistentry> <varlistentry> - <term><replaceable class="parameter">funcname</replaceable></term> + <term><replaceable class="parameter">function_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a function that is an @@ -201,7 +201,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL </varlistentry> <varlistentry> - <term><replaceable class="parameter">argument_types</replaceable></term> + <term><replaceable class="parameter">argument_type</replaceable></term> <listitem> <para> The parameter data type(s) of the function. diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml index d45e2c3045e..7c0b545e894 100644 --- a/doc/src/sgml/ref/create_operator.sgml +++ b/doc/src/sgml/ref/create_operator.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.50 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.51 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -22,8 +22,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> CREATE OPERATOR <replaceable>name</replaceable> ( - PROCEDURE = <replaceable class="parameter">funcname</replaceable> - [, LEFTARG = <replaceable class="parameter">lefttype</replaceable> ] [, RIGHTARG = <replaceable class="parameter">righttype</replaceable> ] + PROCEDURE = <replaceable class="parameter">function_name</replaceable> + [, LEFTARG = <replaceable class="parameter">left_type</replaceable> ] [, RIGHTARG = <replaceable class="parameter">right_type</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> ] [, HASHES ] [, MERGES ] @@ -88,7 +88,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </para> <para> - The <replaceable class="parameter">funcname</replaceable> + The <replaceable class="parameter">function_name</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. @@ -120,7 +120,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">funcname</replaceable></term> + <term><replaceable class="parameter">function_name</replaceable></term> <listitem> <para> The function used to implement this operator. @@ -129,7 +129,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">lefttype</replaceable></term> + <term><replaceable class="parameter">left_type</replaceable></term> <listitem> <para> The data type of the operator's left operand, if any. @@ -139,7 +139,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">righttype</replaceable></term> + <term><replaceable class="parameter">right_type</replaceable></term> <listitem> <para> The data type of the operator's right operand, if any. diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index d65456b4a14..60e7d7c862d 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.12 2009/09/18 05:00:41 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.13 2009/09/19 10:23:26 petere Exp $ PostgreSQL documentation --> @@ -34,11 +34,11 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | USER <replaceable class="PARAMETER">rolename</replaceable> [, ...] + | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] | SYSID <replaceable class="PARAMETER">uid</replaceable> </synopsis> </refsynopsisdiv> @@ -237,7 +237,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac </varlistentry> <varlistentry> - <term><literal>IN ROLE</> <replaceable class="parameter">rolename</replaceable></term> + <term><literal>IN ROLE</> <replaceable class="parameter">role_name</replaceable></term> <listitem> <para> The <literal>IN ROLE</literal> clause lists one or more existing @@ -249,7 +249,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac </varlistentry> <varlistentry> - <term><literal>IN GROUP</> <replaceable class="parameter">rolename</replaceable></term> + <term><literal>IN GROUP</> <replaceable class="parameter">role_name</replaceable></term> <listitem> <para> <literal>IN GROUP</literal> is an obsolete spelling of @@ -259,7 +259,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac </varlistentry> <varlistentry> - <term><literal>ROLE</> <replaceable class="parameter">rolename</replaceable></term> + <term><literal>ROLE</> <replaceable class="parameter">role_name</replaceable></term> <listitem> <para> The <literal>ROLE</literal> clause lists one or more existing @@ -270,7 +270,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac </varlistentry> <varlistentry> - <term><literal>ADMIN</> <replaceable class="parameter">rolename</replaceable></term> + <term><literal>ADMIN</> <replaceable class="parameter">role_name</replaceable></term> <listitem> <para> The <literal>ADMIN</literal> clause is like <literal>ROLE</literal>, @@ -282,7 +282,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac </varlistentry> <varlistentry> - <term><literal>USER</> <replaceable class="parameter">rolename</replaceable></term> + <term><literal>USER</> <replaceable class="parameter">role_name</replaceable></term> <listitem> <para> The <literal>USER</literal> clause is an obsolete spelling of @@ -432,7 +432,7 @@ CREATE ROLE admin WITH CREATEDB CREATEROLE; The <command>CREATE ROLE</command> statement is in the SQL standard, but the standard only requires the syntax <synopsis> -CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable class="PARAMETER">rolename</> ] +CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable class="PARAMETER">role_name</> ] </synopsis> Multiple initial administrators, and all the other options of <command>CREATE ROLE</command>, are diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml index 14cfa8a8f0c..b92fa0f93f4 100644 --- a/doc/src/sgml/ref/create_schema.sgml +++ b/doc/src/sgml/ref/create_schema.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.20 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.21 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE SCHEMA <replaceable class="parameter">schemaname</replaceable> [ AUTHORIZATION <replaceable class="parameter">username</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] -CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] +CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">user_name</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] +CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">user_name</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] </synopsis> </refsynopsisdiv> @@ -62,7 +62,7 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable <variablelist> <varlistentry> - <term><replaceable class="parameter">schemaname</replaceable></term> + <term><replaceable class="parameter">schema_name</replaceable></term> <listitem> <para> The name of a schema to be created. If this is omitted, the user name @@ -74,7 +74,7 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable </varlistentry> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> The name of the user who will own the schema. If omitted, diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml index f72703d7709..06c20ea87fc 100644 --- a/doc/src/sgml/ref/create_server.sgml +++ b/doc/src/sgml/ref/create_server.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_server.sgml,v 1.5 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_server.sgml,v 1.6 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE SERVER <replaceable class="parameter">servername</replaceable> [ TYPE 'servertype' ] [ VERSION 'serverversion' ] - FOREIGN DATA WRAPPER <replaceable class="parameter">fdwname</replaceable> +CREATE SERVER <replaceable class="parameter">server_name</replaceable> [ TYPE '<replaceable class="parameter">server_type</replaceable>' ] [ VERSION '<replaceable class="parameter">server_version</replaceable>' ] + FOREIGN DATA WRAPPER <replaceable class="parameter">fdw_name</replaceable> [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] </synopsis> </refsynopsisdiv> @@ -57,7 +57,7 @@ CREATE SERVER <replaceable class="parameter">servername</replaceable> [ TYPE 'se <variablelist> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The name of the foreign server to be created. @@ -66,7 +66,7 @@ CREATE SERVER <replaceable class="parameter">servername</replaceable> [ TYPE 'se </varlistentry> <varlistentry> - <term><replaceable class="parameter">servertype</replaceable></term> + <term><replaceable class="parameter">server_type</replaceable></term> <listitem> <para> Optional server type. @@ -75,7 +75,7 @@ CREATE SERVER <replaceable class="parameter">servername</replaceable> [ TYPE 'se </varlistentry> <varlistentry> - <term><replaceable class="parameter">serverversion</replaceable></term> + <term><replaceable class="parameter">server_version</replaceable></term> <listitem> <para> Optional server version. @@ -84,7 +84,7 @@ CREATE SERVER <replaceable class="parameter">servername</replaceable> [ TYPE 'se </varlistentry> <varlistentry> - <term><replaceable class="parameter">fdwname</replaceable></term> + <term><replaceable class="parameter">fdw_name</replaceable></term> <listitem> <para> The name of the foreign-data wrapper that manages the server. diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml index 73322467c64..4e1ae9571c3 100644 --- a/doc/src/sgml/ref/create_tablespace.sgml +++ b/doc/src/sgml/ref/create_tablespace.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_tablespace.sgml,v 1.9 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_tablespace.sgml,v 1.10 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE TABLESPACE <replaceable class="parameter">tablespacename</replaceable> [ OWNER <replaceable class="parameter">username</replaceable> ] LOCATION '<replaceable class="parameter">directory</replaceable>' +CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> [ OWNER <replaceable class="parameter">user_name</replaceable> ] LOCATION '<replaceable class="parameter">directory</replaceable>' </synopsis> </refsynopsisdiv> @@ -42,7 +42,7 @@ CREATE TABLESPACE <replaceable class="parameter">tablespacename</replaceable> [ <para> A user with appropriate privileges can pass - <replaceable class="parameter">tablespacename</> to + <replaceable class="parameter">tablespace_name</> to <command>CREATE DATABASE</>, <command>CREATE TABLE</>, <command>CREATE INDEX</> or <command>ADD CONSTRAINT</> to have the data files for these objects stored within the specified tablespace. @@ -54,7 +54,7 @@ CREATE TABLESPACE <replaceable class="parameter">tablespacename</replaceable> [ <variablelist> <varlistentry> - <term><replaceable class="parameter">tablespacename</replaceable></term> + <term><replaceable class="parameter">tablespace_name</replaceable></term> <listitem> <para> The name of a tablespace to be created. The name cannot @@ -65,7 +65,7 @@ CREATE TABLESPACE <replaceable class="parameter">tablespacename</replaceable> [ </varlistentry> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> The name of the user who will own the tablespace. If omitted, diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index 8d7574319f9..38036ee1683 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.49 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.50 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -23,7 +23,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">funcname</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> ) + EXECUTE PROCEDURE <replaceable class="PARAMETER">function_name</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> ) </synopsis> </refsynopsisdiv> @@ -34,7 +34,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE <command>CREATE TRIGGER</command> creates a new trigger. The trigger will be associated with the specified table and will execute the specified function <replaceable - class="parameter">funcname</replaceable> when certain events occur. + class="parameter">function_name</replaceable> when certain events occur. </para> <para> @@ -150,7 +150,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE </varlistentry> <varlistentry> - <term><replaceable class="parameter">funcname</replaceable></term> + <term><replaceable class="parameter">function_name</replaceable></term> <listitem> <para> A user-supplied function that is declared as taking no arguments diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index 7530ead7bea..5b155823ff8 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.42 2009/09/18 05:00:42 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.43 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -34,11 +34,11 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">rolename</replaceable> [, ...] - | USER <replaceable class="PARAMETER">rolename</replaceable> [, ...] + | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] + | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] | SYSID <replaceable class="PARAMETER">uid</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml index faea45a1427..f1113907f4d 100644 --- a/doc/src/sgml/ref/create_user_mapping.sgml +++ b/doc/src/sgml/ref/create_user_mapping.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_user_mapping.sgml,v 1.6 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_user_mapping.sgml,v 1.7 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE USER MAPPING FOR { <replaceable class="parameter">username</replaceable> | USER | CURRENT_USER | PUBLIC } - SERVER <replaceable class="parameter">servername</replaceable> +CREATE USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } + SERVER <replaceable class="parameter">server_name</replaceable> [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [ , ... ] ) ] </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ CREATE USER MAPPING FOR { <replaceable class="parameter">username</replaceable> <variablelist> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> The name of an existing user that is mapped to foreign server. @@ -64,7 +64,7 @@ CREATE USER MAPPING FOR { <replaceable class="parameter">username</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The name of an existing server for which the user mapping is diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index 62e4555614f..6b175b943bb 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.35 2008/11/16 17:34:28 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.36 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -22,7 +22,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <replaceable class="parameter">alias</replaceable> ] - [ USING <replaceable class="PARAMETER">usinglist</replaceable> ] + [ USING <replaceable class="PARAMETER">using_list</replaceable> ] [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ] [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ] </synopsis> @@ -116,7 +116,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">usinglist</replaceable></term> + <term><replaceable class="PARAMETER">using_list</replaceable></term> <listitem> <para> A list of table expressions, allowing columns from other tables @@ -125,7 +125,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] linkend="sql-from" endterm="sql-from-title"> of a <command>SELECT</command> statement; for example, an alias for the table name can be specified. Do not repeat the target table - in the <replaceable class="PARAMETER">usinglist</replaceable>, + in the <replaceable class="PARAMETER">using_list</replaceable>, unless you wish to set up a self-join. </para> </listitem> diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml index 8422e1708ef..cc99fe850c7 100644 --- a/doc/src/sgml/ref/drop_cast.sgml +++ b/doc/src/sgml/ref/drop_cast.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.9 2008/11/14 10:22:46 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.10 2009/09/19 10:23:27 petere Exp $ --> <refentry id="SQL-DROPCAST"> <refmeta> @@ -18,7 +18,7 @@ <refsynopsisdiv> <synopsis> -DROP CAST [ IF EXISTS ] (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) [ CASCADE | RESTRICT ] +DROP CAST [ IF EXISTS ] (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -52,7 +52,7 @@ DROP CAST [ IF EXISTS ] (<replaceable>sourcetype</replaceable> AS <replaceable>t </varlistentry> <varlistentry> - <term><replaceable>sourcetype</replaceable></term> + <term><replaceable>source_type</replaceable></term> <listitem> <para> @@ -62,7 +62,7 @@ DROP CAST [ IF EXISTS ] (<replaceable>sourcetype</replaceable> AS <replaceable>t </varlistentry> <varlistentry> - <term><replaceable>targettype</replaceable></term> + <term><replaceable>target_type</replaceable></term> <listitem> <para> diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index c489bcb085c..8007d8820d8 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.28 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.29 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( { <replaceable class="PARAMETER">lefttype</replaceable> | NONE } , { <replaceable class="PARAMETER">righttype</replaceable> | NONE } ) [ CASCADE | RESTRICT ] +DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( { <replaceable class="PARAMETER">left_type</replaceable> | NONE } , { <replaceable class="PARAMETER">right_type</replaceable> | NONE } ) [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -60,7 +60,7 @@ DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">lefttype</replaceable></term> + <term><replaceable class="parameter">left_type</replaceable></term> <listitem> <para> The data type of the operator's left operand; write @@ -70,7 +70,7 @@ DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">righttype</replaceable></term> + <term><replaceable class="parameter">right_type</replaceable></term> <listitem> <para> The data type of the operator's right operand; write diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml index 9e3f8894dec..a902e866361 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.23 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.24 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">relation</replaceable> [ CASCADE | RESTRICT ] +DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -58,7 +58,7 @@ DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <re </varlistentry> <varlistentry> - <term><replaceable class="parameter">relation</replaceable></term> + <term><replaceable class="parameter">table</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table or view that diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml index c68ec08919a..2e79391b11b 100644 --- a/doc/src/sgml/ref/drop_server.sgml +++ b/doc/src/sgml/ref/drop_server.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/drop_server.sgml,v 1.2 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/drop_server.sgml,v 1.3 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP SERVER [ IF EXISTS ] <replaceable class="parameter">servername</replaceable> [ CASCADE | RESTRICT ] +DROP SERVER [ IF EXISTS ] <replaceable class="parameter">server_name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -50,7 +50,7 @@ DROP SERVER [ IF EXISTS ] <replaceable class="parameter">servername</replaceable </varlistentry> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The name of an existing server. diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml index 105e79f0de4..0d0f2ea981f 100644 --- a/doc/src/sgml/ref/drop_tablespace.sgml +++ b/doc/src/sgml/ref/drop_tablespace.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.8 2008/11/14 10:22:46 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.9 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespacename</replaceable> +DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespace_name</replaceable> </synopsis> </refsynopsisdiv> @@ -60,7 +60,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespacename</rep </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">tablespacename</replaceable></term> + <term><replaceable class="PARAMETER">tablespace_name</replaceable></term> <listitem> <para> The name of a tablespace. diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml index 601cb2d494b..8e8ed1d1035 100644 --- a/doc/src/sgml/ref/drop_user_mapping.sgml +++ b/doc/src/sgml/ref/drop_user_mapping.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user_mapping.sgml,v 1.3 2009/06/19 15:28:25 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user_mapping.sgml,v 1.4 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">username</replaceable> | USER | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">servername</replaceable> +DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable> </synopsis> </refsynopsisdiv> @@ -56,7 +56,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">username</r </varlistentry> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> User name of the mapping. <literal>CURRENT_USER</> @@ -68,7 +68,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">username</r </varlistentry> <varlistentry> - <term><replaceable class="parameter">servername</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> Server name of the user mapping. diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index ca81bcf5574..af4218b7618 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.44 2009/09/18 05:00:42 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.45 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable> +FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor_name</replaceable> <phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase> @@ -285,7 +285,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] < </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cursorname</replaceable></term> + <term><replaceable class="PARAMETER">cursor_name</replaceable></term> <listitem> <para> An open cursor's name. diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 55f87006bf4..4dddde27b91 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.76 2009/09/18 05:00:42 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.77 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -23,48 +23,48 @@ PostgreSQL documentation <synopsis> GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [,...] | ALL [ PRIVILEGES ] } - ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) [,...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) } - ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { USAGE | SELECT | UPDATE } [,...] | ALL [ PRIVILEGES ] } - ON SEQUENCE <replaceable class="PARAMETER">sequencename</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] } - ON DATABASE <replaceable>dbname</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON DATABASE <replaceable>database_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN DATA WRAPPER <replaceable>fdwname</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN SERVER <replaceable>servername</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { EXECUTE | ALL [ PRIVILEGES ] } - ON FUNCTION <replaceable>funcname</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FUNCTION <replaceable>function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON LANGUAGE <replaceable>langname</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON LANGUAGE <replaceable>lang_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] } - ON SCHEMA <replaceable>schemaname</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON SCHEMA <replaceable>schema_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { CREATE | ALL [ PRIVILEGES ] } - ON TABLESPACE <replaceable>tablespacename</replaceable> [, ...] - TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...] + TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] -GRANT <replaceable class="PARAMETER">role</replaceable> [, ...] TO <replaceable class="PARAMETER">rolename</replaceable> [, ...] [ WITH ADMIN OPTION ] +GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replaceable class="PARAMETER">role_name</replaceable> [, ...] [ WITH ADMIN OPTION ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml index 2e27e48364f..fdff72847b4 100644 --- a/doc/src/sgml/ref/move.sgml +++ b/doc/src/sgml/ref/move.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/move.sgml,v 1.32 2009/06/22 07:12:50 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/move.sgml,v 1.33 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable> +MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor_name</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index 37e8a043afe..3061da5e6d2 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.24 2008/11/14 10:22:47 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.25 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">datatype</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable> +PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">data_type</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable> </synopsis> </refsynopsisdiv> @@ -99,7 +99,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">datatype</replaceable></term> + <term><replaceable class="PARAMETER">data_type</replaceable></term> <listitem> <para> The data type of a parameter to the prepared statement. If the diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml index 0f967770c11..f46c9174aa0 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.51 2009/01/22 20:15:59 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.52 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -24,68 +24,68 @@ PostgreSQL documentation REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [,...] | ALL [ PRIVILEGES ] } - ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) [,...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) } - ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { USAGE | SELECT | UPDATE } [,...] | ALL [ PRIVILEGES ] } - ON SEQUENCE <replaceable class="PARAMETER">sequencename</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] } - ON DATABASE <replaceable>dbname</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON DATABASE <replaceable>database_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN DATA WRAPPER <replaceable>fdwname</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN SERVER <replaceable>servername</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { EXECUTE | ALL [ PRIVILEGES ] } - ON FUNCTION <replaceable>funcname</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON FUNCTION <replaceable>function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON LANGUAGE <replaceable>langname</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON LANGUAGE <replaceable>lang_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] } - ON SCHEMA <replaceable>schemaname</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON SCHEMA <replaceable>schema_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { CREATE | ALL [ PRIVILEGES ] } - ON TABLESPACE <replaceable>tablespacename</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] + ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ ADMIN OPTION FOR ] - <replaceable class="PARAMETER">role</replaceable> [, ...] FROM <replaceable class="PARAMETER">rolename</replaceable> [, ...] + <replaceable class="PARAMETER">role_name</replaceable> [, ...] FROM <replaceable class="PARAMETER">role_name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 87cc9dadd64..1079de91130 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.7 2009/03/28 03:26:02 momjian Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.8 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -SET [ SESSION | LOCAL ] ROLE <replaceable class="parameter">rolename</replaceable> +SET [ SESSION | LOCAL ] ROLE <replaceable class="parameter">role_name</replaceable> SET [ SESSION | LOCAL ] ROLE NONE RESET ROLE </synopsis> @@ -33,7 +33,7 @@ RESET ROLE <para> This command sets the current user identifier of the current SQL session to be <replaceable - class="parameter">rolename</replaceable>. The role name can be + class="parameter">role_name</replaceable>. The role name can be written as either an identifier or a string literal. After <command>SET ROLE</>, permissions checking for SQL commands is carried out as though the named role were the one that had logged @@ -41,7 +41,7 @@ RESET ROLE </para> <para> - The specified <replaceable class="parameter">rolename</replaceable> + The specified <replaceable class="parameter">role_name</replaceable> must be a role that the current session user is a member of. (If the session user is a superuser, any role can be selected.) </para> diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml index 87710298014..736baf90117 100644 --- a/doc/src/sgml/ref/set_session_auth.sgml +++ b/doc/src/sgml/ref/set_session_auth.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.18 2008/11/14 10:22:47 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.19 2009/09/19 10:23:27 petere Exp $ --> <refentry id="SQL-SET-SESSION-AUTHORIZATION"> <refmeta> <refentrytitle id="sql-set-session-authorization-title">SET SESSION AUTHORIZATION</refentrytitle> @@ -17,7 +17,7 @@ <refsynopsisdiv> <synopsis> -SET [ SESSION | LOCAL ] SESSION AUTHORIZATION <replaceable class="parameter">username</replaceable> +SET [ SESSION | LOCAL ] SESSION AUTHORIZATION <replaceable class="parameter">user_name</replaceable> SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT RESET SESSION AUTHORIZATION </synopsis> @@ -29,7 +29,7 @@ RESET SESSION AUTHORIZATION <para> This command sets the session user identifier and the current user identifier of the current SQL session to be <replaceable - class="parameter">username</replaceable>. The user name can be + class="parameter">user_name</replaceable>. The user name can be written as either an identifier or a string literal. Using this command, it is possible, for example, to temporarily become an unprivileged user and later switch back to being a superuser. @@ -99,7 +99,7 @@ SELECT SESSION_USER, CURRENT_USER; <para> The SQL standard allows some other expressions to appear in place - of the literal <replaceable>username</replaceable>, but these options + of the literal <replaceable>user_name</replaceable>, but these options are not important in practice. <productname>PostgreSQL</productname> allows identifier syntax (<literal>"username"</literal>), which SQL does not. SQL does not allow this command during a transaction; diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml index 8f32c83dc44..4ed6458f654 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.49 2009/01/22 20:16:00 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.50 2009/09/19 10:23:27 petere Exp $ PostgreSQL documentation --> @@ -24,7 +24,7 @@ PostgreSQL documentation UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <replaceable class="parameter">alias</replaceable> ] SET { <replaceable class="PARAMETER">column</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } | ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) = ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) } [, ...] - [ FROM <replaceable class="PARAMETER">fromlist</replaceable> ] + [ FROM <replaceable class="PARAMETER">from_list</replaceable> ] [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ] [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ] </synopsis> @@ -136,7 +136,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">fromlist</replaceable></term> + <term><replaceable class="PARAMETER">from_list</replaceable></term> <listitem> <para> A list of table expressions, allowing columns from other tables @@ -145,8 +145,8 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep specified in the <xref linkend="sql-from" endterm="sql-from-title"> of a <command>SELECT</command> statement. Note that the target table must not appear in the - <replaceable>fromlist</>, unless you intend a self-join (in which - case it must appear with an alias in the <replaceable>fromlist</>). + <replaceable>from_list</>, unless you intend a self-join (in which + case it must appear with an alias in the <replaceable>from_list</>). </para> </listitem> </varlistentry> @@ -234,7 +234,7 @@ UPDATE <replaceable class="parameter">count</replaceable> <para> When a <literal>FROM</> clause is present, what essentially happens is that the target table is joined to the tables mentioned in the - <replaceable>fromlist</replaceable>, and each output row of the join + <replaceable>from_list</replaceable>, and each output row of the join represents an update operation for the target table. When using <literal>FROM</> you should ensure that the join produces at most one output row for each row to be modified. In |