From 4db20b22e826b4585d5d627584acd7380b9d27cd Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 19 Sep 2009 10:23:27 +0000 Subject: [PATCH] Make the placeholder naming in the synopses of the SQL help more consistent --- doc/src/sgml/ref/alter_conversion.sgml | 8 ++--- doc/src/sgml/ref/alter_database.sgml | 4 +-- doc/src/sgml/ref/alter_group.sgml | 12 +++---- doc/src/sgml/ref/alter_language.sgml | 4 +-- doc/src/sgml/ref/alter_opclass.sgml | 8 ++--- doc/src/sgml/ref/alter_operator.sgml | 8 ++--- doc/src/sgml/ref/alter_opfamily.sgml | 14 ++++---- doc/src/sgml/ref/alter_role.sgml | 4 +-- doc/src/sgml/ref/alter_schema.sgml | 8 ++--- doc/src/sgml/ref/alter_server.sgml | 8 ++--- doc/src/sgml/ref/alter_tablespace.sgml | 8 ++--- doc/src/sgml/ref/alter_trigger.sgml | 4 +-- doc/src/sgml/ref/alter_tsconfig.sgml | 8 ++--- doc/src/sgml/ref/alter_tsdictionary.sgml | 8 ++--- doc/src/sgml/ref/alter_tsparser.sgml | 4 +-- doc/src/sgml/ref/alter_tstemplate.sgml | 4 +-- doc/src/sgml/ref/alter_user.sgml | 2 +- doc/src/sgml/ref/alter_user_mapping.sgml | 8 ++--- doc/src/sgml/ref/cluster.sgml | 16 ++++----- doc/src/sgml/ref/comment.sgml | 14 ++++---- doc/src/sgml/ref/copy.sgml | 10 +++--- doc/src/sgml/ref/create_cast.sgml | 14 ++++---- doc/src/sgml/ref/create_constraint.sgml | 4 +-- doc/src/sgml/ref/create_conversion.sgml | 4 +-- doc/src/sgml/ref/create_database.sgml | 4 +-- doc/src/sgml/ref/create_function.sgml | 22 ++++++------ doc/src/sgml/ref/create_group.sgml | 10 +++--- doc/src/sgml/ref/create_opclass.sgml | 6 ++-- doc/src/sgml/ref/create_operator.sgml | 12 +++---- doc/src/sgml/ref/create_role.sgml | 22 ++++++------ doc/src/sgml/ref/create_schema.sgml | 8 ++--- doc/src/sgml/ref/create_server.sgml | 12 +++---- doc/src/sgml/ref/create_tablespace.sgml | 8 ++--- doc/src/sgml/ref/create_trigger.sgml | 6 ++-- doc/src/sgml/ref/create_user.sgml | 10 +++--- doc/src/sgml/ref/create_user_mapping.sgml | 8 ++--- doc/src/sgml/ref/delete.sgml | 6 ++-- doc/src/sgml/ref/drop_cast.sgml | 6 ++-- doc/src/sgml/ref/drop_operator.sgml | 6 ++-- doc/src/sgml/ref/drop_rule.sgml | 4 +-- doc/src/sgml/ref/drop_server.sgml | 4 +-- doc/src/sgml/ref/drop_tablespace.sgml | 4 +-- doc/src/sgml/ref/drop_user_mapping.sgml | 6 ++-- doc/src/sgml/ref/fetch.sgml | 4 +-- doc/src/sgml/ref/grant.sgml | 42 +++++++++++------------ doc/src/sgml/ref/move.sgml | 2 +- doc/src/sgml/ref/prepare.sgml | 4 +-- doc/src/sgml/ref/revoke.sgml | 42 +++++++++++------------ doc/src/sgml/ref/set_role.sgml | 6 ++-- doc/src/sgml/ref/set_session_auth.sgml | 6 ++-- doc/src/sgml/ref/update.sgml | 10 +++--- 51 files changed, 233 insertions(+), 233 deletions(-) diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml index 02f781ccf9..1960b1df52 100644 --- a/doc/src/sgml/ref/alter_conversion.sgml +++ b/doc/src/sgml/ref/alter_conversion.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -ALTER CONVERSION name RENAME TO newname -ALTER CONVERSION name OWNER TO newowner +ALTER CONVERSION name RENAME TO new_name +ALTER CONVERSION name OWNER TO new_owner @@ -59,7 +59,7 @@ ALTER CONVERSION name OWNER TO newowner< - newname + new_name The new name of the conversion. @@ -68,7 +68,7 @@ ALTER CONVERSION name OWNER TO newowner< - newowner + new_owner 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 b0fe48057f..5d2b906929 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -27,7 +27,7 @@ ALTER DATABASE name [ [ WITH ] connlimit -ALTER DATABASE name RENAME TO newname +ALTER DATABASE name RENAME TO new_name ALTER DATABASE name OWNER TO new_owner @@ -117,7 +117,7 @@ ALTER DATABASE name RESET ALL - newname + new_name 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 58a9a6cb12..457b048674 100644 --- a/doc/src/sgml/ref/alter_group.sgml +++ b/doc/src/sgml/ref/alter_group.sgml @@ -21,10 +21,10 @@ PostgreSQL documentation -ALTER GROUP groupname ADD USER username [, ... ] -ALTER GROUP groupname DROP USER username [, ... ] +ALTER GROUP group_name ADD USER user_name [, ... ] +ALTER GROUP group_name DROP USER user_name [, ... ] -ALTER GROUP groupname RENAME TO newname +ALTER GROUP group_name RENAME TO new_name @@ -60,7 +60,7 @@ ALTER GROUP groupname RENAME TO - groupname + group_name The name of the group (role) to modify. @@ -69,7 +69,7 @@ ALTER GROUP groupname RENAME TO - username + user_name Users (roles) that are to be added to or removed from the group. @@ -80,7 +80,7 @@ ALTER GROUP groupname RENAME TO - newname + new_name 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 5053a32fc8..940d98386c 100644 --- a/doc/src/sgml/ref/alter_language.sgml +++ b/doc/src/sgml/ref/alter_language.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname +ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO new_name ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner @@ -51,7 +51,7 @@ ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO - newname + new_name 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 ba35b25322..5dcddf0bdc 100644 --- a/doc/src/sgml/ref/alter_opclass.sgml +++ b/doc/src/sgml/ref/alter_opclass.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -ALTER OPERATOR CLASS name USING index_method RENAME TO newname -ALTER OPERATOR CLASS name USING index_method OWNER TO newowner +ALTER OPERATOR CLASS name USING index_method RENAME TO new_name +ALTER OPERATOR CLASS name USING index_method OWNER TO new_owner @@ -69,7 +69,7 @@ ALTER OPERATOR CLASS name USING newname + new_name The new name of the operator class. @@ -78,7 +78,7 @@ ALTER OPERATOR CLASS name USING newowner + new_owner 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 a6eeb1551f..acaece4141 100644 --- a/doc/src/sgml/ref/alter_operator.sgml +++ b/doc/src/sgml/ref/alter_operator.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO newowner +ALTER OPERATOR name ( { left_type | NONE } , { right_type | NONE } ) OWNER TO new_owner @@ -58,7 +58,7 @@ ALTER OPERATOR name ( { lefttype - lefttype + left_type The data type of the operator's left operand; write @@ -68,7 +68,7 @@ ALTER OPERATOR name ( { lefttype - righttype + right_type The data type of the operator's right operand; write @@ -78,7 +78,7 @@ ALTER OPERATOR name ( { lefttype - newowner + new_owner 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 d5c526d46f..bba04e6cfb 100644 --- a/doc/src/sgml/ref/alter_opfamily.sgml +++ b/doc/src/sgml/ref/alter_opfamily.sgml @@ -23,14 +23,14 @@ PostgreSQL documentation ALTER OPERATOR FAMILY name USING index_method ADD { OPERATOR strategy_number operator_name ( op_type, op_type ) - | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname ( argument_type [, ...] ) + | FUNCTION support_number [ ( op_type [ , op_type ] ) ] function_name ( argument_type [, ...] ) } [, ... ] ALTER OPERATOR FAMILY name USING index_method DROP { OPERATOR strategy_number ( op_type [ , op_type ] ) | FUNCTION support_number ( op_type [ , op_type ] ) } [, ... ] -ALTER OPERATOR FAMILY name USING index_method RENAME TO newname -ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner +ALTER OPERATOR FAMILY name USING index_method RENAME TO new_name +ALTER OPERATOR FAMILY name USING index_method OWNER TO new_owner @@ -166,7 +166,7 @@ ALTER OPERATOR FAMILY name USING funcname + function_name The name (optionally schema-qualified) of a function that is an @@ -176,7 +176,7 @@ ALTER OPERATOR FAMILY name USING argument_types + argument_type The parameter data type(s) of the function. @@ -185,7 +185,7 @@ ALTER OPERATOR FAMILY name USING newname + new_name The new name of the operator family. @@ -194,7 +194,7 @@ ALTER OPERATOR FAMILY name USING newowner + new_owner 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 7b299746da..67352c2edf 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -35,7 +35,7 @@ ALTER ROLE name [ [ WITH ] password' | VALID UNTIL 'timestamp' -ALTER ROLE name RENAME TO newname +ALTER ROLE name RENAME TO new_name ALTER ROLE name SET configuration_parameter { TO | = } { value | DEFAULT } ALTER ROLE name SET configuration_parameter FROM CURRENT @@ -137,7 +137,7 @@ ALTER ROLE name RESET ALL - newname + new_name 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 2458d19974..fbfdd22798 100644 --- a/doc/src/sgml/ref/alter_schema.sgml +++ b/doc/src/sgml/ref/alter_schema.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -ALTER SCHEMA name RENAME TO newname -ALTER SCHEMA name OWNER TO newowner +ALTER SCHEMA name RENAME TO new_name +ALTER SCHEMA name OWNER TO new_owner @@ -58,7 +58,7 @@ ALTER SCHEMA name OWNER TO newowner - newname + new_name The new name of the schema. The new name cannot @@ -69,7 +69,7 @@ ALTER SCHEMA name OWNER TO newowner - newowner + new_owner 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 fc5c64caa3..2068f556d0 100644 --- a/doc/src/sgml/ref/alter_server.sgml +++ b/doc/src/sgml/ref/alter_server.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation -ALTER SERVER servername [ VERSION 'newversion' ] +ALTER SERVER server_name [ VERSION 'new_version' ] [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ] -ALTER SERVER servername OWNER TO new_owner +ALTER SERVER server_name OWNER TO new_owner @@ -52,7 +52,7 @@ ALTER SERVER servername OWNER TO - servername + server_name The name of an existing server. @@ -61,7 +61,7 @@ ALTER SERVER servername OWNER TO - serverversion + new_version New server version. diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml index 1b86a70c42..6cd6e2f551 100644 --- a/doc/src/sgml/ref/alter_tablespace.sgml +++ b/doc/src/sgml/ref/alter_tablespace.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -ALTER TABLESPACE name RENAME TO newname -ALTER TABLESPACE name OWNER TO newowner +ALTER TABLESPACE name RENAME TO new_name +ALTER TABLESPACE name OWNER TO new_owner @@ -56,7 +56,7 @@ ALTER TABLESPACE name OWNER TO newowner< - newname + new_name The new name of the tablespace. The new name cannot @@ -67,7 +67,7 @@ ALTER TABLESPACE name OWNER TO newowner< - newowner + new_owner 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 2e9253ec90..52794ffd4e 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -ALTER TRIGGER name ON table RENAME TO newname +ALTER TRIGGER name ON table RENAME TO new_name @@ -63,7 +63,7 @@ ALTER TRIGGER name ON - newname + new_name 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 bea14564d9..ac7d57c16e 100644 --- a/doc/src/sgml/ref/alter_tsconfig.sgml +++ b/doc/src/sgml/ref/alter_tsconfig.sgml @@ -31,8 +31,8 @@ ALTER TEXT SEARCH CONFIGURATION name ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH new_dictionary ALTER TEXT SEARCH CONFIGURATION name DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ] -ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname -ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner +ALTER TEXT SEARCH CONFIGURATION name RENAME TO new_name +ALTER TEXT SEARCH CONFIGURATION name OWNER TO new_owner @@ -107,7 +107,7 @@ ALTER TEXT SEARCH CONFIGURATION name OWNER TO - newname + new_name The new name of the text search configuration. @@ -116,7 +116,7 @@ ALTER TEXT SEARCH CONFIGURATION name OWNER TO - newowner + new_owner 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 903d7e3234..11280adf2e 100644 --- a/doc/src/sgml/ref/alter_tsdictionary.sgml +++ b/doc/src/sgml/ref/alter_tsdictionary.sgml @@ -24,8 +24,8 @@ PostgreSQL documentation ALTER TEXT SEARCH DICTIONARY name ( option [ = value ] [, ... ] ) -ALTER TEXT SEARCH DICTIONARY name RENAME TO newname -ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner +ALTER TEXT SEARCH DICTIONARY name RENAME TO new_name +ALTER TEXT SEARCH DICTIONARY name OWNER TO new_owner @@ -80,7 +80,7 @@ ALTER TEXT SEARCH DICTIONARY name OWNER TO - newname + new_name The new name of the text search dictionary. @@ -89,7 +89,7 @@ ALTER TEXT SEARCH DICTIONARY name OWNER TO - newowner + new_owner 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 fcaf11b568..159fc7a415 100644 --- a/doc/src/sgml/ref/alter_tsparser.sgml +++ b/doc/src/sgml/ref/alter_tsparser.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -ALTER TEXT SEARCH PARSER name RENAME TO newname +ALTER TEXT SEARCH PARSER name RENAME TO new_name @@ -53,7 +53,7 @@ ALTER TEXT SEARCH PARSER name RENAME TO - newname + new_name 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 f768711ca8..086c6b9932 100644 --- a/doc/src/sgml/ref/alter_tstemplate.sgml +++ b/doc/src/sgml/ref/alter_tstemplate.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -ALTER TEXT SEARCH TEMPLATE name RENAME TO newname +ALTER TEXT SEARCH TEMPLATE name RENAME TO new_name @@ -53,7 +53,7 @@ ALTER TEXT SEARCH TEMPLATE name RENAME TO - newname + new_name 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 5e8830b8ca..dedf1b365c 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -35,7 +35,7 @@ ALTER USER name [ [ WITH ] password' | VALID UNTIL 'timestamp' -ALTER USER name RENAME TO newname +ALTER USER name RENAME TO new_name ALTER USER name SET configuration_parameter { TO | = } { value | DEFAULT } ALTER USER name SET configuration_parameter FROM CURRENT diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml index 56bbb55794..0cd726eff5 100644 --- a/doc/src/sgml/ref/alter_user_mapping.sgml +++ b/doc/src/sgml/ref/alter_user_mapping.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC } - SERVER servername +ALTER USER MAPPING FOR { user_name | USER | CURRENT_USER | PUBLIC } + SERVER server_name OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) @@ -48,7 +48,7 @@ ALTER USER MAPPING FOR { username | - username + user_name User name of the mapping. CURRENT_USER @@ -60,7 +60,7 @@ ALTER USER MAPPING FOR { username | - servername + server_name Server name of the user mapping. diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index a067725aaa..96f5e0d2b8 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -CLUSTER [VERBOSE] tablename [ USING indexname ] +CLUSTER [VERBOSE] table_name [ USING index_name ] CLUSTER [VERBOSE] @@ -32,11 +32,11 @@ CLUSTER [VERBOSE] CLUSTER instructs PostgreSQL to cluster the table specified - by tablename + by table_name based on the index specified by - indexname. The index must + index_name. The index must already have been defined on - tablename. + table_name. @@ -54,7 +54,7 @@ CLUSTER [VERBOSE] When a table is clustered, PostgreSQL remembers which index it was clustered by. The form - CLUSTER tablename + CLUSTER table_name reclusters the table using the same index as before. @@ -79,7 +79,7 @@ CLUSTER [VERBOSE] - tablename + table_name The name (possibly schema-qualified) of a table. @@ -88,7 +88,7 @@ CLUSTER [VERBOSE] - indexname + index_name The name of an index. @@ -215,7 +215,7 @@ CLUSTER; The syntax -CLUSTER indexname ON tablename +CLUSTER index_name ON table_name is also supported for compatibility with pre-8.3 PostgreSQL versions. diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index 59d52e40e0..c1f6dee5c5 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -26,15 +26,15 @@ COMMENT ON TABLE object_name | COLUMN table_name.column_name | AGGREGATE agg_name (agg_type [, ...] ) | - CAST (sourcetype AS targettype) | + CAST (source_type AS target_type) | CONSTRAINT constraint_name ON table_name | CONVERSION object_name | DATABASE object_name | DOMAIN object_name | - FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) | + FUNCTION function_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) | INDEX object_name | LARGE OBJECT large_object_oid | - OPERATOR op (leftoperand_type, rightoperand_type) | + OPERATOR operator_name (left_type, right_type) | OPERATOR CLASS object_name USING index_method | OPERATOR FAMILY object_name USING index_method | [ PROCEDURAL ] LANGUAGE object_name | @@ -50,7 +50,7 @@ COMMENT ON TRIGGER trigger_name ON table_name | TYPE object_name | VIEW object_name -} IS 'text' +} IS 'text' @@ -89,7 +89,7 @@ COMMENT ON table_name.column_name agg_name constraint_name - func_name + function_name op rule_name trigger_name @@ -115,7 +115,7 @@ COMMENT ON - sourcetype + source_type The name of the source data type of the cast. @@ -124,7 +124,7 @@ COMMENT ON - targettype + target_type 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 ea14a3d737..1dc6eca4f7 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -22,7 +22,7 @@ PostgreSQL documentation -COPY tablename [ ( column [, ...] ) ] +COPY table_name [ ( column [, ...] ) ] FROM { 'filename' | STDIN } [ [ WITH ] [ BINARY ] @@ -34,7 +34,7 @@ COPY tablename [ ( escape' ] [ FORCE NOT NULL column [, ...] ] -COPY { tablename [ ( column [, ...] ) ] | ( query ) } +COPY { table_name [ ( column [, ...] ) ] | ( query ) } TO { 'filename' | STDOUT } [ [ WITH ] [ BINARY ] @@ -85,7 +85,7 @@ COPY { tablename [ ( - tablename + table_name The name (optionally schema-qualified) of an existing table. @@ -822,12 +822,12 @@ ZW ZIMBABWE version 7.3 and is still supported: -COPY [ BINARY ] tablename [ WITH OIDS ] +COPY [ BINARY ] table_name [ WITH OIDS ] FROM { 'filename' | STDIN } [ [USING] DELIMITERS 'delimiter' ] [ WITH NULL AS 'null string' ] -COPY [ BINARY ] tablename [ WITH OIDS ] +COPY [ BINARY ] table_name [ WITH OIDS ] TO { 'filename' | STDOUT } [ [USING] DELIMITERS 'delimiter' ] [ WITH NULL AS 'null string' ] diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml index b7932f5ab4..9416323d9d 100644 --- a/doc/src/sgml/ref/create_cast.sgml +++ b/doc/src/sgml/ref/create_cast.sgml @@ -18,15 +18,15 @@ -CREATE CAST (sourcetype AS targettype) - WITH FUNCTION funcname (argtypes) +CREATE CAST (source_type AS target_type) + WITH FUNCTION function_name (argument_type [, ...]) [ AS ASSIGNMENT | AS IMPLICIT ] -CREATE CAST (sourcetype AS targettype) +CREATE CAST (source_type AS target_type) WITHOUT FUNCTION [ AS ASSIGNMENT | AS IMPLICIT ] -CREATE CAST (sourcetype AS targettype) +CREATE CAST (source_type AS target_type) WITH INOUT [ AS ASSIGNMENT | AS IMPLICIT ] @@ -168,7 +168,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; - sourcetype + source_type @@ -178,7 +178,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; - targettype + target_type @@ -188,7 +188,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0; - funcname(argtypes) + function_name(argument_type [, ...]) diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml index 51647d9172..7e039c2126 100644 --- a/doc/src/sgml/ref/create_constraint.sgml +++ b/doc/src/sgml/ref/create_constraint.sgml @@ -27,7 +27,7 @@ CREATE CONSTRAINT TRIGGER name [ FROM referenced_table_name ] { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } } FOR EACH ROW - EXECUTE PROCEDURE funcname ( arguments ) + EXECUTE PROCEDURE function_name ( arguments ) @@ -110,7 +110,7 @@ CREATE CONSTRAINT TRIGGER name - funcname + function_name The function to call when the trigger is fired. See CREATE [ DEFAULT ] CONVERSION name - FOR source_encoding TO dest_encoding FROM funcname + FOR source_encoding TO dest_encoding FROM function_name @@ -93,7 +93,7 @@ CREATE [ DEFAULT ] CONVERSION name - funcname + function_name diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index 7fc21e249e..10cb312c35 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -22,7 +22,7 @@ PostgreSQL documentation CREATE DATABASE name - [ [ WITH ] [ OWNER [=] dbowner ] + [ [ WITH ] [ OWNER [=] user_name ] [ TEMPLATE [=] template ] [ ENCODING [=] encoding ] [ LC_COLLATE [=] lc_collate ] @@ -81,7 +81,7 @@ CREATE DATABASE name - dbowner + use_name 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 09083d66ec..76358a8985 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -21,10 +21,10 @@ $PostgreSQL$ CREATE [ OR REPLACE ] FUNCTION - name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] [, ...] ] ) + name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } default_expr ] [, ...] ] ) [ RETURNS rettype - | RETURNS TABLE ( colname coltype [, ...] ) ] - { LANGUAGE langname + | RETURNS TABLE ( column_name column_type [, ...] ) ] + { LANGUAGE lang_name | WINDOW | IMMUTABLE | STABLE | VOLATILE | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT @@ -147,8 +147,8 @@ CREATE [ OR REPLACE ] FUNCTION The type of a column is referenced by writing tablename.columnname%TYPE. + class="parameter">table_name.column_name%TYPE. Using this feature can sometimes help make a function independent of changes to the definition of a table. @@ -156,7 +156,7 @@ CREATE [ OR REPLACE ] FUNCTION - defexpr + default_expr @@ -198,14 +198,14 @@ CREATE [ OR REPLACE ] FUNCTION The type of a column is referenced by writing tablename.columnname%TYPE. + class="parameter">table_name.column_name%TYPE. - colname + column_name @@ -218,7 +218,7 @@ CREATE [ OR REPLACE ] FUNCTION - coltype + column_type @@ -229,7 +229,7 @@ CREATE [ OR REPLACE ] FUNCTION - langname + lang_name diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml index ad28eded05..ad7908381d 100644 --- a/doc/src/sgml/ref/create_group.sgml +++ b/doc/src/sgml/ref/create_group.sgml @@ -33,11 +33,11 @@ CREATE GROUP name [ [ WITH ] password' | VALID UNTIL 'timestamp' - | IN ROLE rolename [, ...] - | IN GROUP rolename [, ...] - | ROLE rolename [, ...] - | ADMIN rolename [, ...] - | USER rolename [, ...] + | IN ROLE role_name [, ...] + | IN GROUP role_name [, ...] + | ROLE role_name [, ...] + | ADMIN role_name [, ...] + | USER role_name [, ...] | SYSID uid diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index db0b6d2c8d..0077259d7e 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -24,7 +24,7 @@ PostgreSQL documentation CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type USING index_method [ FAMILY family_name ] AS { OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] - | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname ( argument_type [, ...] ) + | FUNCTION support_number [ ( op_type [ , op_type ] ) ] function_name ( argument_type [, ...] ) | STORAGE storage_type } [, ... ] @@ -191,7 +191,7 @@ CREATE OPERATOR CLASS name [ DEFAUL - funcname + function_name The name (optionally schema-qualified) of a function that is an @@ -201,7 +201,7 @@ CREATE OPERATOR CLASS name [ DEFAUL - argument_types + argument_type 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 01ac248b66..06fe1f6276 100644 --- a/doc/src/sgml/ref/create_operator.sgml +++ b/doc/src/sgml/ref/create_operator.sgml @@ -22,8 +22,8 @@ PostgreSQL documentation CREATE OPERATOR name ( - PROCEDURE = funcname - [, LEFTARG = lefttype ] [, RIGHTARG = righttype ] + PROCEDURE = function_name + [, LEFTARG = left_type ] [, RIGHTARG = right_type ] [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ] [, RESTRICT = res_proc ] [, JOIN = join_proc ] [, HASHES ] [, MERGES ] @@ -88,7 +88,7 @@ CREATE OPERATOR name ( - The funcname + The function_name procedure must have been previously defined using CREATE FUNCTION 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 name ( - funcname + function_name The function used to implement this operator. @@ -129,7 +129,7 @@ CREATE OPERATOR name ( - lefttype + left_type The data type of the operator's left operand, if any. @@ -139,7 +139,7 @@ CREATE OPERATOR name ( - righttype + right_type 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 82f5464c58..ac3e52235c 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -34,11 +34,11 @@ CREATE ROLE name [ [ WITH ] connlimit | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' | VALID UNTIL 'timestamp' - | IN ROLE rolename [, ...] - | IN GROUP rolename [, ...] - | ROLE rolename [, ...] - | ADMIN rolename [, ...] - | USER rolename [, ...] + | IN ROLE role_name [, ...] + | IN GROUP role_name [, ...] + | ROLE role_name [, ...] + | ADMIN role_name [, ...] + | USER role_name [, ...] | SYSID uid @@ -237,7 +237,7 @@ CREATE ROLE name [ [ WITH ] - IN ROLE rolename + IN ROLE role_name The IN ROLE clause lists one or more existing @@ -249,7 +249,7 @@ CREATE ROLE name [ [ WITH ] - IN GROUP rolename + IN GROUP role_name IN GROUP is an obsolete spelling of @@ -259,7 +259,7 @@ CREATE ROLE name [ [ WITH ] - ROLE rolename + ROLE role_name The ROLE clause lists one or more existing @@ -270,7 +270,7 @@ CREATE ROLE name [ [ WITH ] - ADMIN rolename + ADMIN role_name The ADMIN clause is like ROLE, @@ -282,7 +282,7 @@ CREATE ROLE name [ [ WITH ] - USER rolename + USER role_name The USER clause is an obsolete spelling of @@ -432,7 +432,7 @@ CREATE ROLE admin WITH CREATEDB CREATEROLE; The CREATE ROLE statement is in the SQL standard, but the standard only requires the syntax -CREATE ROLE name [ WITH ADMIN rolename ] +CREATE ROLE name [ WITH ADMIN role_name ] Multiple initial administrators, and all the other options of CREATE ROLE, are diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml index de4487d1ea..5546e3a0d8 100644 --- a/doc/src/sgml/ref/create_schema.sgml +++ b/doc/src/sgml/ref/create_schema.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element [ ... ] ] -CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ] +CREATE SCHEMA schema_name [ AUTHORIZATION user_name ] [ schema_element [ ... ] ] +CREATE SCHEMA AUTHORIZATION user_name [ schema_element [ ... ] ] @@ -62,7 +62,7 @@ CREATE SCHEMA AUTHORIZATION username - schemaname + schema_name The name of a schema to be created. If this is omitted, the user name @@ -74,7 +74,7 @@ CREATE SCHEMA AUTHORIZATION username - username + user_name 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 39f8bf0d94..874d08f083 100644 --- a/doc/src/sgml/ref/create_server.sgml +++ b/doc/src/sgml/ref/create_server.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION 'serverversion' ] - FOREIGN DATA WRAPPER fdwname +CREATE SERVER server_name [ TYPE 'server_type' ] [ VERSION 'server_version' ] + FOREIGN DATA WRAPPER fdw_name [ OPTIONS ( option 'value' [, ... ] ) ] @@ -57,7 +57,7 @@ CREATE SERVER servername [ TYPE 'se - servername + server_name The name of the foreign server to be created. @@ -66,7 +66,7 @@ CREATE SERVER servername [ TYPE 'se - servertype + server_type Optional server type. @@ -75,7 +75,7 @@ CREATE SERVER servername [ TYPE 'se - serverversion + server_version Optional server version. @@ -84,7 +84,7 @@ CREATE SERVER servername [ TYPE 'se - fdwname + fdw_name 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 8428157cca..6037db7405 100644 --- a/doc/src/sgml/ref/create_tablespace.sgml +++ b/doc/src/sgml/ref/create_tablespace.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory' +CREATE TABLESPACE tablespace_name [ OWNER user_name ] LOCATION 'directory' @@ -42,7 +42,7 @@ CREATE TABLESPACE tablespacename [ A user with appropriate privileges can pass - tablespacename to + tablespace_name to CREATE DATABASE, CREATE TABLE, CREATE INDEX or ADD CONSTRAINT to have the data files for these objects stored within the specified tablespace. @@ -54,7 +54,7 @@ CREATE TABLESPACE tablespacename [ - tablespacename + tablespace_name The name of a tablespace to be created. The name cannot @@ -65,7 +65,7 @@ CREATE TABLESPACE tablespacename [ - username + user_name 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 947c1a7c7b..6185a7defc 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] } ON table [ FOR [ EACH ] { ROW | STATEMENT } ] - EXECUTE PROCEDURE funcname ( arguments ) + EXECUTE PROCEDURE function_name ( arguments ) @@ -34,7 +34,7 @@ CREATE TRIGGER name { BEFORE | AFTE CREATE TRIGGER creates a new trigger. The trigger will be associated with the specified table and will execute the specified function funcname when certain events occur. + class="parameter">function_name when certain events occur. @@ -150,7 +150,7 @@ CREATE TRIGGER name { BEFORE | AFTE - funcname + function_name 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 5587663910..9577faf27e 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -34,11 +34,11 @@ CREATE USER name [ [ WITH ] connlimit | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' | VALID UNTIL 'timestamp' - | IN ROLE rolename [, ...] - | IN GROUP rolename [, ...] - | ROLE rolename [, ...] - | ADMIN rolename [, ...] - | USER rolename [, ...] + | IN ROLE role_name [, ...] + | IN GROUP role_name [, ...] + | ROLE role_name [, ...] + | ADMIN role_name [, ...] + | USER role_name [, ...] | SYSID uid diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml index 25e57e150c..062412d352 100644 --- a/doc/src/sgml/ref/create_user_mapping.sgml +++ b/doc/src/sgml/ref/create_user_mapping.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation -CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC } - SERVER servername +CREATE USER MAPPING FOR { user_name | USER | CURRENT_USER | PUBLIC } + SERVER server_name [ OPTIONS ( option 'value' [ , ... ] ) ] @@ -51,7 +51,7 @@ CREATE USER MAPPING FOR { username - username + user_name The name of an existing user that is mapped to foreign server. @@ -64,7 +64,7 @@ CREATE USER MAPPING FOR { username - servername + server_name 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 d39bece87e..039b3566d6 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -22,7 +22,7 @@ PostgreSQL documentation DELETE FROM [ ONLY ] table [ [ AS ] alias ] - [ USING usinglist ] + [ USING using_list ] [ WHERE condition | WHERE CURRENT OF cursor_name ] [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ] @@ -116,7 +116,7 @@ DELETE FROM [ ONLY ] table [ [ AS ] - usinglist + using_list A list of table expressions, allowing columns from other tables @@ -125,7 +125,7 @@ DELETE FROM [ ONLY ] table [ [ AS ] linkend="sql-from" endterm="sql-from-title"> of a SELECT statement; for example, an alias for the table name can be specified. Do not repeat the target table - in the usinglist, + in the using_list, unless you wish to set up a self-join. diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml index 3f08ba6500..221b92853d 100644 --- a/doc/src/sgml/ref/drop_cast.sgml +++ b/doc/src/sgml/ref/drop_cast.sgml @@ -18,7 +18,7 @@ -DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ] +DROP CAST [ IF EXISTS ] (source_type AS target_type) [ CASCADE | RESTRICT ] @@ -52,7 +52,7 @@ DROP CAST [ IF EXISTS ] (sourcetype AS t - sourcetype + source_type @@ -62,7 +62,7 @@ DROP CAST [ IF EXISTS ] (sourcetype AS t - targettype + target_type diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index 05ac292c96..1b8baeb32f 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE | RESTRICT ] +DROP OPERATOR [ IF EXISTS ] name ( { left_type | NONE } , { right_type | NONE } ) [ CASCADE | RESTRICT ] @@ -60,7 +60,7 @@ DROP OPERATOR [ IF EXISTS ] name ( - lefttype + left_type The data type of the operator's left operand; write @@ -70,7 +70,7 @@ DROP OPERATOR [ IF EXISTS ] name ( - righttype + right_type 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 3e60e612a7..f6f2605f94 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ] +DROP RULE [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ] @@ -58,7 +58,7 @@ DROP RULE [ IF EXISTS ] name ON - relation + table 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 9b77959dc9..76f4c7f4ac 100644 --- a/doc/src/sgml/ref/drop_server.sgml +++ b/doc/src/sgml/ref/drop_server.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ] +DROP SERVER [ IF EXISTS ] server_name [ CASCADE | RESTRICT ] @@ -50,7 +50,7 @@ DROP SERVER [ IF EXISTS ] servername - servername + server_name 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 6fbb6fc1e6..f9b0c2337e 100644 --- a/doc/src/sgml/ref/drop_tablespace.sgml +++ b/doc/src/sgml/ref/drop_tablespace.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -DROP TABLESPACE [ IF EXISTS ] tablespacename +DROP TABLESPACE [ IF EXISTS ] tablespace_name @@ -60,7 +60,7 @@ DROP TABLESPACE [ IF EXISTS ] tablespacename - tablespacename + tablespace_name 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 4b032ad66a..a93d4e6897 100644 --- a/doc/src/sgml/ref/drop_user_mapping.sgml +++ b/doc/src/sgml/ref/drop_user_mapping.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | PUBLIC } SERVER servername +DROP USER MAPPING [ IF EXISTS ] FOR { user_name | USER | CURRENT_USER | PUBLIC } SERVER server_name @@ -56,7 +56,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { username - username + user_name User name of the mapping. CURRENT_USER @@ -68,7 +68,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { username - servername + server_name Server name of the user mapping. diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index 9751cac3e4..0ffbf8370a 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation -FETCH [ direction { FROM | IN } ] cursorname +FETCH [ direction { FROM | IN } ] cursor_name where direction can be empty or one of: @@ -285,7 +285,7 @@ FETCH [ direction { FROM | IN } ] < - cursorname + cursor_name An open cursor's name. diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 30c44ace73..8aaedb3008 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -23,48 +23,48 @@ PostgreSQL documentation GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [,...] | ALL [ PRIVILEGES ] } - ON [ TABLE ] tablename [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON [ TABLE ] table_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] ) [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) } - ON [ TABLE ] tablename [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON [ TABLE ] table_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { USAGE | SELECT | UPDATE } [,...] | ALL [ PRIVILEGES ] } - ON SEQUENCE sequencename [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON SEQUENCE sequence_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] } - ON DATABASE dbname [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON DATABASE database_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN DATA WRAPPER fdwname [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FOREIGN DATA WRAPPER fdw_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN SERVER servername [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FOREIGN SERVER server_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { EXECUTE | ALL [ PRIVILEGES ] } - ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON FUNCTION function_name ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON LANGUAGE langname [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON LANGUAGE lang_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] } - ON SCHEMA schemaname [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON SCHEMA schema_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { CREATE | ALL [ PRIVILEGES ] } - ON TABLESPACE tablespacename [, ...] - TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] + ON TABLESPACE tablespace_name [, ...] + TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ] -GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ] +GRANT role_name [, ...] TO role_name [, ...] [ WITH ADMIN OPTION ] diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml index b3ccf8a17c..e073ad86b1 100644 --- a/doc/src/sgml/ref/move.sgml +++ b/doc/src/sgml/ref/move.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation -MOVE [ direction { FROM | IN } ] cursorname +MOVE [ direction { FROM | IN } ] cursor_name diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index 0d3150d265..b2e6eeb4e6 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation -PREPARE name [ ( datatype [, ...] ) ] AS statement +PREPARE name [ ( data_type [, ...] ) ] AS statement @@ -99,7 +99,7 @@ PREPARE name [ ( - datatype + data_type 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 8d625801fd..dc0805d80b 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -24,68 +24,68 @@ PostgreSQL documentation REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [,...] | ALL [ PRIVILEGES ] } - ON [ TABLE ] tablename [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON [ TABLE ] table_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] ) [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) } - ON [ TABLE ] tablename [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON [ TABLE ] table_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { USAGE | SELECT | UPDATE } [,...] | ALL [ PRIVILEGES ] } - ON SEQUENCE sequencename [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON SEQUENCE sequence_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] } - ON DATABASE dbname [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON DATABASE database_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN DATA WRAPPER fdwname [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON FOREIGN DATA WRAPPER fdw_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN SERVER servername [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON FOREIGN SERVER server_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { EXECUTE | ALL [ PRIVILEGES ] } - ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON FUNCTION function_name ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } - ON LANGUAGE langname [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON LANGUAGE lang_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] } - ON SCHEMA schemaname [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON SCHEMA schema_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { CREATE | ALL [ PRIVILEGES ] } - ON TABLESPACE tablespacename [, ...] - FROM { [ GROUP ] rolename | PUBLIC } [, ...] + ON TABLESPACE tablespace_name [, ...] + FROM { [ GROUP ] role_name | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ ADMIN OPTION FOR ] - role [, ...] FROM rolename [, ...] + role_name [, ...] FROM role_name [, ...] [ CASCADE | RESTRICT ] diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 7fc130771e..a55c34343c 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -SET [ SESSION | LOCAL ] ROLE rolename +SET [ SESSION | LOCAL ] ROLE role_name SET [ SESSION | LOCAL ] ROLE NONE RESET ROLE @@ -33,7 +33,7 @@ RESET ROLE This command sets the current user identifier of the current SQL session to be rolename. The role name can be + class="parameter">role_name. The role name can be written as either an identifier or a string literal. After 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 - The specified rolename + The specified role_name 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.) diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml index 427a1808e9..61a16391d6 100644 --- a/doc/src/sgml/ref/set_session_auth.sgml +++ b/doc/src/sgml/ref/set_session_auth.sgml @@ -17,7 +17,7 @@ -SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username +SET [ SESSION | LOCAL ] SESSION AUTHORIZATION user_name SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT RESET SESSION AUTHORIZATION @@ -29,7 +29,7 @@ RESET SESSION AUTHORIZATION This command sets the session user identifier and the current user identifier of the current SQL session to be username. The user name can be + class="parameter">user_name. 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; The SQL standard allows some other expressions to appear in place - of the literal username, but these options + of the literal user_name, but these options are not important in practice. PostgreSQL allows identifier syntax ("username"), 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 fdac3bc42b..cf9d8d457f 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -24,7 +24,7 @@ PostgreSQL documentation UPDATE [ ONLY ] table [ [ AS ] alias ] SET { column = { expression | DEFAULT } | ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } [, ...] - [ FROM fromlist ] + [ FROM from_list ] [ WHERE condition | WHERE CURRENT OF cursor_name ] [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ] @@ -136,7 +136,7 @@ UPDATE [ ONLY ] table [ [ AS ] - fromlist + from_list A list of table expressions, allowing columns from other tables @@ -145,8 +145,8 @@ UPDATE [ ONLY ] table [ [ AS ] of a SELECT statement. Note that the target table must not appear in the - fromlist, unless you intend a self-join (in which - case it must appear with an alias in the fromlist). + from_list, unless you intend a self-join (in which + case it must appear with an alias in the from_list). @@ -234,7 +234,7 @@ UPDATE count When a FROM clause is present, what essentially happens is that the target table is joined to the tables mentioned in the - fromlist, and each output row of the join + from_list, and each output row of the join represents an update operation for the target table. When using FROM you should ensure that the join produces at most one output row for each row to be modified. In -- 2.30.2