diff options
36 files changed, 147 insertions, 152 deletions
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index cdc5e7f13e3..fe59392ff1a 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.9 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.10 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,8 +20,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>variable</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>variable</replaceable> +ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } +ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>parameter</replaceable> ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> </synopsis> @@ -70,12 +70,12 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <repl </varlistentry> <varlistentry> - <term><replaceable>variable</replaceable></term> + <term><replaceable>parameter</replaceable></term> <term><replaceable>value</replaceable></term> <listitem> <para> Set the session default for this database of the specified - configuration variable to the given value. If + configuration parameter to the given value. If <replaceable>value</replaceable> is <literal>DEFAULT</literal> or, equivalently, <literal>RESET</literal> is used, the database-specific variable setting is removed and the system-wide @@ -86,7 +86,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <repl <para> See <xref linkend="sql-set" endterm="sql-set-title"> and <xref linkend="runtime-config"> - for more information about allowed variable names + for more information about allowed parameter names and values. </para> </listitem> diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml index 09e3db3ad8b..dc5edc2f32b 100644 --- a/doc/src/sgml/ref/alter_domain.sgml +++ b/doc/src/sgml/ref/alter_domain.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.9 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.10 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -24,15 +24,15 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> - { SET DEFAULT <replaceable class="PARAMETER">value</replaceable> | DROP DEFAULT } -ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> +ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> + { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT } +ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> { SET | DROP } NOT NULL -ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> +ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> ADD <replaceable class="PARAMETER">domain_constraint</replaceable> -ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> +ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> DROP CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ] -ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> +ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable class="PARAMETER">new_owner</replaceable> </synopsis> </refsynopsisdiv> @@ -111,7 +111,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> <para> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER"> domain </replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing domain to @@ -121,7 +121,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER"> domain_constraint </replaceable></term> + <term><replaceable class="PARAMETER">domain_constraint</replaceable></term> <listitem> <para> New domain constraint for the domain. @@ -130,7 +130,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">domain</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER"> constraint_name </replaceable></term> + <term><replaceable class="PARAMETER">constraint_name</replaceable></term> <listitem> <para> Name of an existing constraint to drop. diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index f4b114da4bd..421ad0fc0dd 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.4 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.5 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -24,7 +24,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ] +ALTER SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ] [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ] [ RESTART [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ] </synopsis> @@ -46,7 +46,7 @@ ALTER SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT <para> <variablelist> <varlistentry> - <term><replaceable class="parameter">seqname</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a sequence to be altered. diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 87d1a645775..cf3035e9cff 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.61 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.62 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,33 +20,33 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">type</replaceable> [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] DROP [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> [ RESTRICT | CASCADE ] -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET DEFAULT <replaceable class="PARAMETER">value</replaceable> | DROP DEFAULT } -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] + ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT } +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET | DROP } NOT NULL -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable> -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] SET WITHOUT OIDS -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] RENAME [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> TO <replaceable class="PARAMETER">new_column</replaceable> -ALTER TABLE <replaceable class="PARAMETER">table</replaceable> - RENAME TO <replaceable class="PARAMETER">new_table</replaceable> -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE <replaceable class="PARAMETER">name</replaceable> + RENAME TO <replaceable class="PARAMETER">new_name</replaceable> +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] ADD <replaceable class="PARAMETER">table_constraint</replaceable> -ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] +ALTER TABLE [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] DROP CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ] -ALTER TABLE <replaceable class="PARAMETER">table</replaceable> - OWNER TO <replaceable class="PARAMETER">new_owner</replaceable> -ALTER TABLE <replaceable class="PARAMETER">table</replaceable> - CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable> +ALTER TABLE <replaceable class="PARAMETER">name</replaceable> + OWNER TO <replaceable class="PARAMETER">new_owner</replaceable> +ALTER TABLE <replaceable class="PARAMETER">name</replaceable> + CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable> </synopsis> </refsynopsisdiv> @@ -220,7 +220,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">table</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing table to @@ -264,7 +264,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_table</replaceable></term> + <term><replaceable class="PARAMETER">new_name</replaceable></term> <listitem> <para> New name for the table. diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml index ee7afa87d89..faed13c2e16 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.6 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_trigger.sgml,v 1.7 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,8 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TRIGGER <replaceable class="PARAMETER">trigger</replaceable> ON <replaceable class="PARAMETER">table</replaceable> - RENAME TO <replaceable class="PARAMETER">newname</replaceable> +ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table</replaceable> RENAME TO <replaceable class="PARAMETER">newname</replaceable> </synopsis> </refsynopsisdiv> @@ -45,7 +44,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">trigger</replaceable> ON <replaceab <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">trigger</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name of an existing trigger to alter. diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index 3db6df00528..bfa0636c581 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.30 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.31 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +ALTER USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] where <replaceable class="PARAMETER">option</replaceable> can be: @@ -29,10 +29,10 @@ where <replaceable class="PARAMETER">option</replaceable> can be: | CREATEUSER | NOCREATEUSER | VALID UNTIL '<replaceable class="PARAMETER">abstime</replaceable>' -ALTER USER <replaceable class="PARAMETER">username</replaceable> RENAME TO <replaceable>newname</replaceable> +ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable> -ALTER USER <replaceable class="PARAMETER">username</replaceable> SET <replaceable>variable</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } -ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replaceable>variable</replaceable> +ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } +ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>parameter</replaceable> </synopsis> </refsynopsisdiv> @@ -75,7 +75,7 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">username</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name of the user whose attributes are to be altered. @@ -152,12 +152,12 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea </varlistentry> <varlistentry> - <term><replaceable>variable</replaceable></term> + <term><replaceable>parameter</replaceable></term> <term><replaceable>value</replaceable></term> <listitem> <para> Set this user's session default for the specified configuration - variable to the given value. If + parameter to the given value. If <replaceable>value</replaceable> is <literal>DEFAULT</literal> or, equivalently, <literal>RESET</literal> is used, the user-specific variable setting is removed and the user will @@ -166,9 +166,9 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea </para> <para> - See <xref linkend="sql-set" endterm="sql-set-title"> and <xref linkend="runtime-config"> - for more information about allowed variable names - and values. + See <xref linkend="sql-set" endterm="sql-set-title"> and <xref + linkend="runtime-config"> for more information about allowed + parameter names and values. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml index c3ea5ab8cfe..b958b6a62d4 100644 --- a/doc/src/sgml/ref/close.sgml +++ b/doc/src/sgml/ref/close.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.18 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.19 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CLOSE <replaceable class="PARAMETER">cursor</replaceable> +CLOSE <replaceable class="PARAMETER">name</replaceable> </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ CLOSE <replaceable class="PARAMETER">cursor</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">cursor</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name of an open cursor to close. diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 5df52ca36b7..1c87091dff1 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.50 2003/09/11 21:42:20 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.51 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>COPY</refname> - <refpurpose>copy data between files and tables</refpurpose> + <refpurpose>copy data between a file and a table</refpurpose> </refnamediv> <indexterm zone="sql-copy"> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] +COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN } [ [ WITH ] [ BINARY ] @@ -28,7 +28,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class=" [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ] [ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ] ] -COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] +COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ] TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT } [ [ WITH ] [ BINARY ] @@ -74,7 +74,7 @@ COPY <replaceable class="parameter">table</replaceable> [ ( <replaceable class=" <variablelist> <varlistentry> - <term><replaceable class="parameter">table</replaceable></term> + <term><replaceable class="parameter">tablename</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing table. @@ -571,12 +571,12 @@ ZW ZIMBABWE still supported: <synopsis> -COPY [ BINARY ] <replaceable class="parameter">table</replaceable> [ WITH OIDS ] +COPY [ BINARY ] <replaceable class="parameter">tablename</replaceable> [ WITH OIDS ] FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN } [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ] [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ] -COPY [ BINARY ] <replaceable class="parameter">table</replaceable> [ WITH OIDS ] +COPY [ BINARY ] <replaceable class="parameter">tablename</replaceable> [ WITH OIDS ] TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT } [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ] [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ] diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml index 08f48fea1dc..6ee06ac4e9b 100644 --- a/doc/src/sgml/ref/create_cast.sgml +++ b/doc/src/sgml/ref/create_cast.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.13 2003/09/09 18:28:52 tgl Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.14 2003/09/22 00:16:57 petere Exp $ --> <refentry id="SQL-CREATECAST"> <refmeta> @@ -8,7 +8,7 @@ <refnamediv> <refname>CREATE CAST</refname> - <refpurpose>define a user-defined cast</refpurpose> + <refpurpose>define a new cast</refpurpose> </refnamediv> <indexterm zone="sql-createcast"> diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml index d48b3eea952..842c5436f27 100644 --- a/doc/src/sgml/ref/create_constraint.sgml +++ b/doc/src/sgml/ref/create_constraint.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.11 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.12 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -22,8 +22,8 @@ PostgreSQL documentation <synopsis> CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable> AFTER <replaceable class="parameter">events</replaceable> ON - <replaceable class="parameter">table</replaceable> <replaceable class="parameter">constraint</replaceable> <replaceable class="parameter">attributes</replaceable> - FOR EACH ROW EXECUTE PROCEDURE <replaceable class="parameter">func</replaceable> ( <replaceable class="parameter">args</replaceable> ) + <replaceable class="parameter">tablename</replaceable> <replaceable class="parameter">constraint</replaceable> <replaceable class="parameter">attributes</replaceable> + FOR EACH ROW EXECUTE PROCEDURE <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">args</replaceable> ) </synopsis> </refsynopsisdiv> @@ -62,7 +62,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table</replaceable></term> + <term><replaceable class="PARAMETER">tablename</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of the table in which @@ -90,7 +90,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">func</replaceable>(<replaceable class="PARAMETER">args</replaceable>)</term> + <term><replaceable class="PARAMETER">funcname</replaceable>(<replaceable class="PARAMETER">args</replaceable>)</term> <listitem> <para> The function to call as part of the trigger processing. diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml index 441b80ef76c..cea5a2fa9e1 100644 --- a/doc/src/sgml/ref/create_conversion.sgml +++ b/doc/src/sgml/ref/create_conversion.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.12 2003/09/09 18:28:52 tgl Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.13 2003/09/22 00:16:57 petere Exp $ --> <refentry id="SQL-CREATECONVERSION"> <refmeta> @@ -8,7 +8,7 @@ <refnamediv> <refname>CREATE CONVERSION</refname> - <refpurpose>define a user-defined conversion</refpurpose> + <refpurpose>define a new conversion</refpurpose> </refnamediv> <indexterm zone="sql-createconversion"> diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml index 7a71e4a5982..2da02173b0b 100644 --- a/doc/src/sgml/ref/create_domain.sgml +++ b/doc/src/sgml/ref/create_domain.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.15 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.16 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,8 +20,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE DOMAIN <replaceable class="parameter">domainname</replaceable> [AS] <replaceable class="parameter">data_type</replaceable> - [ DEFAULT <replaceable>default_expr</> ] +CREATE DOMAIN <replaceable class="parameter">name</replaceable> [AS] <replaceable class="parameter">data_type</replaceable> + [ DEFAULT <replaceable>expression</> ] [ <replaceable class="PARAMETER">constraint</replaceable> [ ... ] ] where <replaceable class="PARAMETER">constraint</replaceable> is: @@ -60,7 +60,7 @@ where <replaceable class="PARAMETER">constraint</replaceable> is: <variablelist> <varlistentry> - <term><replaceable class="parameter">domainname</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a domain to be created. @@ -79,7 +79,7 @@ where <replaceable class="PARAMETER">constraint</replaceable> is: </varlistentry> <varlistentry> - <term><literal>DEFAULT <replaceable>default_expr</replaceable></literal></term> + <term><literal>DEFAULT <replaceable>expression</replaceable></literal></term> <listitem> <para> diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 28140997f5a..f2f97fd5e8f 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.42 2003/09/11 21:42:20 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.43 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable> ON <replaceable class="parameter">table</replaceable> [ USING <replaceable class="parameter">method</replaceable> ] +CREATE [ UNIQUE ] INDEX <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table</replaceable> [ USING <replaceable class="parameter">method</replaceable> ] ( { <replaceable class="parameter">column</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="parameter">predicate</replaceable> ] </synopsis> @@ -113,7 +113,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="parameter">index_name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the index to be created. No schema name can be included diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml index 1629ba77e47..c938eece445 100644 --- a/doc/src/sgml/ref/create_language.sgml +++ b/doc/src/sgml/ref/create_language.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.36 2003/09/12 23:04:45 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.37 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">langname</replaceable> +CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">name</replaceable> HANDLER <replaceable class="parameter">call_handler</replaceable> [ VALIDATOR <replaceable>valfunction</replaceable> ] </synopsis> </refsynopsisdiv> @@ -83,7 +83,7 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">langna </varlistentry> <varlistentry> - <term><replaceable class="parameter">langname</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index 2ecf1cd4f29..d63f68d6d33 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.10 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.11 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>CREATE OPERATOR CLASS</refname> - <refpurpose>define a new operator class for indexes</refpurpose> + <refpurpose>define a new operator class</refpurpose> </refnamediv> <indexterm zone="sql-createopclass"> @@ -22,7 +22,7 @@ PostgreSQL documentation <synopsis> CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAULT ] FOR TYPE <replaceable class="parameter">data_type</replaceable> USING <replaceable class="parameter">index_method</replaceable> AS { OPERATOR <replaceable class="parameter">strategy_number</replaceable> <replaceable class="parameter">operator_name</replaceable> [ ( <replaceable class="parameter">op_type</replaceable>, <replaceable class="parameter">op_type</replaceable> ) ] [ RECHECK ] - | FUNCTION <replaceable class="parameter">support_number</replaceable> <replaceable class="parameter">func_name</replaceable> ( <replaceable class="parameter">argument_types</replaceable> ) + | FUNCTION <replaceable class="parameter">support_number</replaceable> <replaceable class="parameter">funcname</replaceable> ( <replaceable class="parameter">argument_type</replaceable> [, ...] ) | STORAGE <replaceable class="parameter">storage_type</replaceable> } [, ... ] </synopsis> @@ -167,7 +167,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL </varlistentry> <varlistentry> - <term><replaceable class="parameter">func_name</replaceable></term> + <term><replaceable class="parameter">funcname</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a function that is an diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml index d806bdd9d6d..c64d8712f1f 100644 --- a/doc/src/sgml/ref/create_operator.sgml +++ b/doc/src/sgml/ref/create_operator.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.38 2003/09/09 18:28:52 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.39 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> CREATE OPERATOR <replaceable>name</replaceable> ( - PROCEDURE = <replaceable class="parameter">func_name</replaceable> + PROCEDURE = <replaceable class="parameter">funcname</replaceable> [, LEFTARG = <replaceable class="parameter">lefttype</replaceable> ] [, RIGHTARG = <replaceable class="parameter">righttype</replaceable> ] [, COMMUTATOR = <replaceable class="parameter">com_op</replaceable> ] [, NEGATOR = <replaceable class="parameter">neg_op</replaceable> ] [, RESTRICT = <replaceable class="parameter">res_proc</replaceable> ] [, JOIN = <replaceable class="parameter">join_proc</replaceable> ] @@ -89,7 +89,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </para> <para> - The <replaceable class="parameter">func_name</replaceable> + The <replaceable class="parameter">funcname</replaceable> procedure must have been previously defined using <command>CREATE FUNCTION</command> and must be defined to accept the correct number of arguments (either one or two) of the indicated types. @@ -121,7 +121,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( </varlistentry> <varlistentry> - <term><replaceable class="parameter">func_name</replaceable></term> + <term><replaceable class="parameter">funcname</replaceable></term> <listitem> <para> The function used to implement this operator. diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml index dc4b2e776b9..49422063e23 100644 --- a/doc/src/sgml/ref/create_sequence.sgml +++ b/doc/src/sgml/ref/create_sequence.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.36 2003/09/20 20:12:05 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.37 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ] +CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ BY ] <replaceable class="parameter">increment</replaceable> ] [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ] [ START [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ] </synopsis> @@ -33,7 +33,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep <command>CREATE SEQUENCE</command> creates a new sequence number generator. This involves creating and initializing a new special single-row table with the name <replaceable - class="parameter">seqname</replaceable>. The generator will be + class="parameter">name</replaceable>. The generator will be owned by the user issuing the command. </para> @@ -59,7 +59,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE <replaceable class="parameter">seqname</rep Although you cannot update a sequence directly, you can use a query like <programlisting> -SELECT * FROM <replaceable>seqname</replaceable>; +SELECT * FROM <replaceable>name</replaceable>; </programlisting> to examine the parameters and current state of a sequence. In particular, @@ -88,7 +88,7 @@ SELECT * FROM <replaceable>seqname</replaceable>; </varlistentry> <varlistentry> - <term><replaceable class="parameter">seqname</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the sequence to be created. diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index af75dd9841e..7bbc7d99276 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.36 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.37 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -22,7 +22,7 @@ PostgreSQL documentation <synopsis> CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTER } { <replaceable class="PARAMETER">event</replaceable> [ OR ... ] } ON <replaceable class="PARAMETER">table</replaceable> [ FOR [ EACH ] { ROW | STATEMENT } ] - EXECUTE PROCEDURE <replaceable class="PARAMETER">func</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> ) + EXECUTE PROCEDURE <replaceable class="PARAMETER">funcname</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> ) </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index f287c12b4b5..00a158ce51d 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.45 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.46 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,10 +20,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE TYPE <replaceable class="parameter">typename</replaceable> AS +CREATE TYPE <replaceable class="parameter">name</replaceable> AS ( <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [, ... ] ) -CREATE TYPE <replaceable class="parameter">typename</replaceable> ( +CREATE TYPE <replaceable class="parameter">name</replaceable> ( INPUT = <replaceable class="parameter">input_function</replaceable>, OUTPUT = <replaceable class="parameter">output_function</replaceable> [ , RECEIVE = <replaceable class="parameter">receive_function</replaceable> ] @@ -274,7 +274,7 @@ CREATE TYPE <replaceable class="parameter">typename</replaceable> ( <variablelist> <varlistentry> - <term><replaceable class="parameter">typename</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a type to be created. diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index 209d67d6ee4..a9321feada8 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_user.sgml,v 1.29 2003/09/11 17:31:45 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_user.sgml,v 1.30 2003/09/22 00:16:57 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE USER <replaceable class="PARAMETER">username</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] where <replaceable class="PARAMETER">option</replaceable> can be: @@ -51,7 +51,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be: <variablelist> <varlistentry> - <term><replaceable class="parameter">username</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the user. diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml index a1884b5ee0b..cda20fd65ef 100644 --- a/doc/src/sgml/ref/declare.sgml +++ b/doc/src/sgml/ref/declare.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.28 2003/09/12 00:12:47 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.29 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] +DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable> [ FOR { READ ONLY | UPDATE [ OF <replaceable class="parameter">column</replaceable> [, ...] ] } ] </synopsis> @@ -83,7 +83,7 @@ DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INS <variablelist> <varlistentry> - <term><replaceable class="parameter">cursorname</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the cursor to be created. diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml index 4ec2d9de1b5..8b3bb91e88c 100644 --- a/doc/src/sgml/ref/drop_aggregate.sgml +++ b/doc/src/sgml/ref/drop_aggregate.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.25 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.26 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP AGGREGATE</refname> - <refpurpose>remove a user-defined aggregate function</refpurpose> + <refpurpose>remove an aggregate function</refpurpose> </refnamediv> <indexterm zone="sql-dropaggregate"> diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml index 0c352ad2bcc..16cdedae136 100644 --- a/doc/src/sgml/ref/drop_cast.sgml +++ b/doc/src/sgml/ref/drop_cast.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.4 2003/08/31 17:32:22 petere Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.5 2003/09/22 00:16:58 petere Exp $ --> <refentry id="SQL-DROPCAST"> <refmeta> @@ -8,7 +8,7 @@ <refnamediv> <refname>DROP CAST</refname> - <refpurpose>remove a user-defined cast</refpurpose> + <refpurpose>remove a cast</refpurpose> </refnamediv> <indexterm zone="sql-dropcast"> diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml index 9cb416b2d50..07018c56f53 100644 --- a/doc/src/sgml/ref/drop_conversion.sgml +++ b/doc/src/sgml/ref/drop_conversion.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.6 2003/08/31 17:32:22 petere Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.7 2003/09/22 00:16:58 petere Exp $ --> <refentry id="SQL-DROPCONVERSION"> <refmeta> @@ -8,7 +8,7 @@ <refnamediv> <refname>DROP CONVERSION</refname> - <refpurpose>remove a user-defined conversion</refpurpose> + <refpurpose>remove a conversion</refpurpose> </refnamediv> <indexterm zone="sql-dropconversion"> @@ -17,7 +17,7 @@ <refsynopsisdiv> <synopsis> -DROP CONVERSION <replaceable>conversion_name</replaceable> [ CASCADE | RESTRICT ] +DROP CONVERSION <replaceable>name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -35,7 +35,7 @@ DROP CONVERSION <replaceable>conversion_name</replaceable> [ CASCADE | RESTRICT <variablelist> <varlistentry> - <term><replaceable>conversion_name</replaceable></term> + <term><replaceable>name</replaceable></term> <listitem> <para> diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml index e108bfcbbc7..e87f7e2752a 100644 --- a/doc/src/sgml/ref/drop_domain.sgml +++ b/doc/src/sgml/ref/drop_domain.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.12 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.13 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP DOMAIN <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -38,7 +38,7 @@ DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...] [ C <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">domainname</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an existing domain. diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml index ec68f162c29..935d65b4a27 100644 --- a/doc/src/sgml/ref/drop_function.sgml +++ b/doc/src/sgml/ref/drop_function.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.27 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.28 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP FUNCTION</refname> - <refpurpose>remove a user-defined function</refpurpose> + <refpurpose>remove a function</refpurpose> </refnamediv> <indexterm zone="sql-dropfunction"> diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml index 4a997ac715d..b78e8c6c560 100644 --- a/doc/src/sgml/ref/drop_language.sgml +++ b/doc/src/sgml/ref/drop_language.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.19 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.20 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP LANGUAGE</refname> - <refpurpose>remove a user-defined procedural language</refpurpose> + <refpurpose>remove a procedural language</refpurpose> </refnamediv> <indexterm zone="sql-droplanguage"> diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml index 85f02cd4738..bbfaf284bdf 100644 --- a/doc/src/sgml/ref/drop_opclass.sgml +++ b/doc/src/sgml/ref/drop_opclass.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.6 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.7 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP OPERATOR CLASS</refname> - <refpurpose>remove a user-defined operator class</refpurpose> + <refpurpose>remove an operator class</refpurpose> </refnamediv> <indexterm zone="sql-dropopclass"> diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index 2b3267b3367..cb75b4e0896 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.21 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.22 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP OPERATOR</refname> - <refpurpose>remove a user-defined operator</refpurpose> + <refpurpose>remove an operator</refpurpose> </refnamediv> <indexterm zone="sql-dropoperator"> diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml index c8aa06c73a1..1c7edfca979 100644 --- a/doc/src/sgml/ref/drop_type.sgml +++ b/doc/src/sgml/ref/drop_type.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.23 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.24 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>DROP TYPE</refname> - <refpurpose>remove a user-defined data type</refpurpose> + <refpurpose>remove a data type</refpurpose> </refnamediv> <indexterm zone="sql-droptype"> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP TYPE <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -38,7 +38,7 @@ DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...] [ CASCAD <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">typename</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the data type to remove. diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index 5f3639d4c7f..798fa5c068c 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/fetch.sgml,v 1.33 2003/09/12 00:12:47 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/fetch.sgml,v 1.34 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor</replaceable> +FETCH [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable> where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of: @@ -270,7 +270,7 @@ where <replaceable class="PARAMETER">direction</replaceable> can be empty or one </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cursor</replaceable></term> + <term><replaceable class="PARAMETER">cursorname</replaceable></term> <listitem> <para> An open cursor's name. diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml index c13cdc9ead3..5afaf06e84e 100644 --- a/doc/src/sgml/ref/move.sgml +++ b/doc/src/sgml/ref/move.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/move.sgml,v 1.24 2003/09/12 00:12:47 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/move.sgml,v 1.25 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -11,7 +11,7 @@ PostgreSQL documentation <refnamediv> <refname>MOVE</refname> - <refpurpose>reposition a cursor</refpurpose> + <refpurpose>position a cursor</refpurpose> </refnamediv> <indexterm zone="sql-move"> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor</replaceable> +MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursorname</replaceable> </synopsis> </refsynopsisdiv> @@ -30,7 +30,7 @@ MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <r <para> <command>MOVE</command> repositions a cursor without retrieving any data. <command>MOVE</command> works exactly like the <command>FETCH</command> - command, except it only repositions the cursor and does not return rows. + command, except it only positions the cursor and does not return rows. </para> <para> diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml index 6f8fc85883d..3a72d086ae9 100644 --- a/doc/src/sgml/ref/reset.sgml +++ b/doc/src/sgml/ref/reset.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.23 2003/09/11 17:31:45 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.24 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -20,9 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -RESET <replaceable class="PARAMETER">parameter</replaceable> -</synopsis> -<synopsis> +RESET <replaceable class="PARAMETER">name</replaceable> RESET ALL </synopsis> </refsynopsisdiv> @@ -61,7 +59,7 @@ SET <replaceable class="parameter">parameter</replaceable> TO DEFAULT <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">parameter</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> The name of a run-time parameter. See <xref linkend="sql-set" diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml index 1bdb3d0ebb4..16d91aca5c8 100644 --- a/doc/src/sgml/ref/set.sgml +++ b/doc/src/sgml/ref/set.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.82 2003/09/12 00:12:47 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.83 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -20,7 +20,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">variable</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT } +SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">name</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT } SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</replaceable> | LOCAL | DEFAULT } </synopsis> </refsynopsisdiv> @@ -91,7 +91,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">variable</replaceable></term> + <term><replaceable class="PARAMETER">name</replaceable></term> <listitem> <para> Name of a settable run-time parameter. Available parameters are diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml index dda66538095..4055bb944ff 100644 --- a/doc/src/sgml/ref/set_constraints.sgml +++ b/doc/src/sgml/ref/set_constraints.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_constraints.sgml,v 1.8 2003/09/11 21:42:20 momjian Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_constraints.sgml,v 1.9 2003/09/22 00:16:58 petere Exp $ --> <refentry id="SQL-SET-CONSTRAINTS"> <refmeta> <refentrytitle id="SQL-SET-CONSTRAINTS-title">SET CONSTRAINTS</refentrytitle> @@ -16,7 +16,7 @@ <refsynopsisdiv> <synopsis> -SET CONSTRAINTS { ALL | <replaceable class="parameter">constraint</replaceable> [, ...] } { DEFERRED | IMMEDIATE } +SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...] } { DEFERRED | IMMEDIATE } </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml index 3acaead1eb8..428831449c6 100644 --- a/doc/src/sgml/ref/show.sgml +++ b/doc/src/sgml/ref/show.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.32 2003/09/09 18:28:53 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.33 2003/09/22 00:16:58 petere Exp $ PostgreSQL documentation --> @@ -21,8 +21,6 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> SHOW <replaceable class="PARAMETER">name</replaceable> -</synopsis> -<synopsis> SHOW ALL </synopsis> </refsynopsisdiv> |