diff options
120 files changed, 1110 insertions, 1110 deletions
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index c88b0c2fb35..716a101838a 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -507,7 +507,7 @@ EXEC SQL COMMIT; </varlistentry> <varlistentry> - <term><literal>EXEC SQL PREPARE TRANSACTION </literal><replaceable class="PARAMETER">transaction_id</></term> + <term><literal>EXEC SQL PREPARE TRANSACTION </literal><replaceable class="parameter">transaction_id</></term> <listitem> <para> Prepare the current transaction for two-phase commit. @@ -516,7 +516,7 @@ EXEC SQL COMMIT; </varlistentry> <varlistentry> - <term><literal>EXEC SQL COMMIT PREPARED </literal><replaceable class="PARAMETER">transaction_id</></term> + <term><literal>EXEC SQL COMMIT PREPARED </literal><replaceable class="parameter">transaction_id</></term> <listitem> <para> Commit a transaction that is in prepared state. @@ -525,7 +525,7 @@ EXEC SQL COMMIT; </varlistentry> <varlistentry> - <term><literal>EXEC SQL ROLLBACK PREPARED </literal><replaceable class="PARAMETER">transaction_id</></term> + <term><literal>EXEC SQL ROLLBACK PREPARED </literal><replaceable class="parameter">transaction_id</></term> <listitem> <para> Roll back a transaction that is in prepared state. @@ -6264,7 +6264,7 @@ c++ test_cpp.o test_mod.o -lecpg -o test_cpp <refsynopsisdiv> <synopsis> -ALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable> +ALLOCATE DESCRIPTOR <replaceable class="parameter">name</replaceable> </synopsis> </refsynopsisdiv> @@ -6288,7 +6288,7 @@ ALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> A name of SQL descriptor, case sensitive. This can be an SQL @@ -6356,10 +6356,10 @@ DATABASE <replaceable>connection_target</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">connection_target</replaceable></term> + <term><replaceable class="parameter">connection_target</replaceable></term> <listitem> <para> - <replaceable class="PARAMETER">connection_target</replaceable> + <replaceable class="parameter">connection_target</replaceable> specifies the target server of the connection on one of several forms. @@ -6416,7 +6416,7 @@ DATABASE <replaceable>connection_target</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">connection_object</replaceable></term> + <term><replaceable class="parameter">connection_object</replaceable></term> <listitem> <para> An optional identifier for the connection, so that it can be @@ -6427,7 +6427,7 @@ DATABASE <replaceable>connection_target</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">connection_user</replaceable></term> + <term><replaceable class="parameter">connection_user</replaceable></term> <listitem> <para> The user name for the database connection. @@ -6553,7 +6553,7 @@ EXEC SQL END DECLARE SECTION; <refsynopsisdiv> <synopsis> -DEALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable> +DEALLOCATE DESCRIPTOR <replaceable class="parameter">name</replaceable> </synopsis> </refsynopsisdiv> @@ -6571,7 +6571,7 @@ DEALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the descriptor which is going to be deallocated. @@ -6619,8 +6619,8 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc; <refsynopsisdiv> <synopsis> -DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="PARAMETER">prepared_name</replaceable> -DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="PARAMETER">query</replaceable> +DECLARE <replaceable class="parameter">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">prepared_name</replaceable> +DECLARE <replaceable class="parameter">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable> </synopsis> </refsynopsisdiv> @@ -6645,7 +6645,7 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">cursor_name</replaceable></term> + <term><replaceable class="parameter">cursor_name</replaceable></term> <listitem> <para> A cursor name, case sensitive. This can be an SQL identifier @@ -6655,7 +6655,7 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">prepared_name</replaceable></term> + <term><replaceable class="parameter">prepared_name</replaceable></term> <listitem> <para> The name of a prepared query, either as an SQL identifier or a @@ -6730,9 +6730,9 @@ EXEC SQL DECLARE cur1 CURSOR FOR stmt1; <refsynopsisdiv> <synopsis> -DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> USING [ SQL ] DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> -DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> INTO [ SQL ] DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> -DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> INTO <replaceable class="PARAMETER">sqlda_name</replaceable> +DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> USING [ SQL ] DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> +DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> INTO [ SQL ] DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> +DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> INTO <replaceable class="parameter">sqlda_name</replaceable> </synopsis> </refsynopsisdiv> @@ -6751,7 +6751,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">prepared_name</replaceable></term> + <term><replaceable class="parameter">prepared_name</replaceable></term> <listitem> <para> The name of a prepared statement. This can be an SQL @@ -6761,7 +6761,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_name</replaceable></term> + <term><replaceable class="parameter">descriptor_name</replaceable></term> <listitem> <para> A descriptor name. It is case sensitive. It can be an SQL @@ -6771,7 +6771,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">sqlda_name</replaceable></term> + <term><replaceable class="parameter">sqlda_name</replaceable></term> <listitem> <para> The name of an SQLDA variable. @@ -6819,7 +6819,7 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc; <refsynopsisdiv> <synopsis> -DISCONNECT <replaceable class="PARAMETER">connection_name</replaceable> +DISCONNECT <replaceable class="parameter">connection_name</replaceable> DISCONNECT [ CURRENT ] DISCONNECT DEFAULT DISCONNECT ALL @@ -6840,7 +6840,7 @@ DISCONNECT ALL <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">connection_name</replaceable></term> + <term><replaceable class="parameter">connection_name</replaceable></term> <listitem> <para> A database connection name established by @@ -6929,7 +6929,7 @@ main(void) <refsynopsisdiv> <synopsis> -EXECUTE IMMEDIATE <replaceable class="PARAMETER">string</replaceable> +EXECUTE IMMEDIATE <replaceable class="parameter">string</replaceable> </synopsis> </refsynopsisdiv> @@ -6948,7 +6948,7 @@ EXECUTE IMMEDIATE <replaceable class="PARAMETER">string</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">string</replaceable></term> + <term><replaceable class="parameter">string</replaceable></term> <listitem> <para> A literal C string or a host variable containing the SQL @@ -6990,8 +6990,8 @@ EXEC SQL EXECUTE IMMEDIATE :command; <refsynopsisdiv> <synopsis> -GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> <replaceable class="PARAMETER">:cvariable</replaceable> = <replaceable class="PARAMETER">descriptor_header_item</replaceable> [, ... ] -GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALUE <replaceable class="PARAMETER">column_number</replaceable> <replaceable class="PARAMETER">:cvariable</replaceable> = <replaceable class="PARAMETER">descriptor_item</replaceable> [, ... ] +GET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> <replaceable class="parameter">:cvariable</replaceable> = <replaceable class="parameter">descriptor_header_item</replaceable> [, ... ] +GET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> VALUE <replaceable class="parameter">column_number</replaceable> <replaceable class="parameter">:cvariable</replaceable> = <replaceable class="parameter">descriptor_item</replaceable> [, ... ] </synopsis> </refsynopsisdiv> @@ -7022,7 +7022,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_name</replaceable></term> + <term><replaceable class="parameter">descriptor_name</replaceable></term> <listitem> <para> A descriptor name. @@ -7031,7 +7031,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_header_item</replaceable></term> + <term><replaceable class="parameter">descriptor_header_item</replaceable></term> <listitem> <para> A token identifying which header information item to retrieve. @@ -7042,7 +7042,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_number</replaceable></term> + <term><replaceable class="parameter">column_number</replaceable></term> <listitem> <para> The number of the column about which information is to be @@ -7052,7 +7052,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_item</replaceable></term> + <term><replaceable class="parameter">descriptor_item</replaceable></term> <listitem> <para> A token identifying which item of information about a column @@ -7063,7 +7063,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cvariable</replaceable></term> + <term><replaceable class="parameter">cvariable</replaceable></term> <listitem> <para> A host variable that will receive the data retrieved from the @@ -7178,9 +7178,9 @@ d_data = testdb <refsynopsisdiv> <synopsis> -OPEN <replaceable class="PARAMETER">cursor_name</replaceable> -OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING <replaceable class="PARAMETER">value</replaceable> [, ... ] -OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> +OPEN <replaceable class="parameter">cursor_name</replaceable> +OPEN <replaceable class="parameter">cursor_name</replaceable> USING <replaceable class="parameter">value</replaceable> [, ... ] +OPEN <replaceable class="parameter">cursor_name</replaceable> USING SQL DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> </synopsis> </refsynopsisdiv> @@ -7202,7 +7202,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">cursor_name</replaceable></term> + <term><replaceable class="parameter">cursor_name</replaceable></term> <listitem> <para> The name of the cursor to be opened. This can be an SQL @@ -7212,7 +7212,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">value</replaceable></term> + <term><replaceable class="parameter">value</replaceable></term> <listitem> <para> A value to be bound to a placeholder in the cursor. This can @@ -7223,7 +7223,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_name</replaceable></term> + <term><replaceable class="parameter">descriptor_name</replaceable></term> <listitem> <para> The name of a descriptor containing values to be bound to the @@ -7272,7 +7272,7 @@ EXEC SQL OPEN :curname1; <refsynopsisdiv> <synopsis> -PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable class="PARAMETER">string</replaceable> +PREPARE <replaceable class="parameter">name</replaceable> FROM <replaceable class="parameter">string</replaceable> </synopsis> </refsynopsisdiv> @@ -7293,7 +7293,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable clas <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">prepared_name</replaceable></term> + <term><replaceable class="parameter">prepared_name</replaceable></term> <listitem> <para> An identifier for the prepared query. @@ -7302,7 +7302,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable clas </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">string</replaceable></term> + <term><replaceable class="parameter">string</replaceable></term> <listitem> <para> A literal C string or a host variable containing a preparable @@ -7385,7 +7385,7 @@ SET AUTOCOMMIT { = | TO } { ON | OFF } <refsynopsisdiv> <synopsis> -SET CONNECTION [ TO | = ] <replaceable class="PARAMETER">connection_name</replaceable> +SET CONNECTION [ TO | = ] <replaceable class="parameter">connection_name</replaceable> </synopsis> </refsynopsisdiv> @@ -7404,7 +7404,7 @@ SET CONNECTION [ TO | = ] <replaceable class="PARAMETER">connection_name</replac <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">connection_name</replaceable></term> + <term><replaceable class="parameter">connection_name</replaceable></term> <listitem> <para> A database connection name established by @@ -7459,8 +7459,8 @@ EXEC SQL SET CONNECTION = con1; <refsynopsisdiv> <synopsis> -SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> <replaceable class="PARAMETER">descriptor_header_item</replaceable> = <replaceable>value</replaceable> [, ... ] -SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALUE <replaceable class="PARAMETER">number</replaceable> <replaceable class="PARAMETER">descriptor_item</replaceable> = <replaceable>value</replaceable> [, ...] +SET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> <replaceable class="parameter">descriptor_header_item</replaceable> = <replaceable>value</replaceable> [, ... ] +SET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> VALUE <replaceable class="parameter">number</replaceable> <replaceable class="parameter">descriptor_item</replaceable> = <replaceable>value</replaceable> [, ...] </synopsis> </refsynopsisdiv> @@ -7486,7 +7486,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_name</replaceable></term> + <term><replaceable class="parameter">descriptor_name</replaceable></term> <listitem> <para> A descriptor name. @@ -7495,7 +7495,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_header_item</replaceable></term> + <term><replaceable class="parameter">descriptor_header_item</replaceable></term> <listitem> <para> A token identifying which header information item to set. @@ -7506,7 +7506,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">number</replaceable></term> + <term><replaceable class="parameter">number</replaceable></term> <listitem> <para> The number of the descriptor item to set. The count starts at @@ -7516,7 +7516,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">descriptor_item</replaceable></term> + <term><replaceable class="parameter">descriptor_item</replaceable></term> <listitem> <para> A token identifying which item of information to set in the @@ -7527,7 +7527,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">value</replaceable></term> + <term><replaceable class="parameter">value</replaceable></term> <listitem> <para> A value to store into the descriptor item. This can be an SQL @@ -7575,7 +7575,7 @@ EXEC SQL SET DESCRIPTOR indesc VALUE 2 INDICATOR = :val2null, DATA = :val2; <refsynopsisdiv> <synopsis> -TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable class="PARAMETER">ctype</replaceable> +TYPE <replaceable class="parameter">type_name</replaceable> IS <replaceable class="parameter">ctype</replaceable> </synopsis> </refsynopsisdiv> @@ -7599,7 +7599,7 @@ TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable clas <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">type_name</replaceable></term> + <term><replaceable class="parameter">type_name</replaceable></term> <listitem> <para> The name for the new type. It must be a valid C type name. @@ -7608,7 +7608,7 @@ TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable clas </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">ctype</replaceable></term> + <term><replaceable class="parameter">ctype</replaceable></term> <listitem> <para> A C type specification. @@ -7732,7 +7732,7 @@ VAR <replaceable>varname</replaceable> IS <replaceable>ctype</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">varname</replaceable></term> + <term><replaceable class="parameter">varname</replaceable></term> <listitem> <para> A C variable name. @@ -7741,7 +7741,7 @@ VAR <replaceable>varname</replaceable> IS <replaceable>ctype</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">ctype</replaceable></term> + <term><replaceable class="parameter">ctype</replaceable></term> <listitem> <para> A C type specification. @@ -7779,7 +7779,7 @@ EXEC SQL VAR a IS int; <refsynopsisdiv> <synopsis> -WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="PARAMETER">action</replaceable> +WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="parameter">action</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 1839bddceb5..b52407822dd 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -9491,7 +9491,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>plainto_tsquery</primary> </indexterm> - <literal><function>plainto_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal> + <literal><function>plainto_tsquery(<optional> <replaceable class="parameter">config</> <type>regconfig</> , </optional> <replaceable class="parameter">query</> <type>text</type>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>produce <type>tsquery</> ignoring punctuation</entry> @@ -9503,7 +9503,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>phraseto_tsquery</primary> </indexterm> - <literal><function>phraseto_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal> + <literal><function>phraseto_tsquery(<optional> <replaceable class="parameter">config</> <type>regconfig</> , </optional> <replaceable class="parameter">query</> <type>text</type>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>produce <type>tsquery</> that searches for a phrase, @@ -9516,7 +9516,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>querytree</primary> </indexterm> - <literal><function>querytree(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>)</function></literal> + <literal><function>querytree(<replaceable class="parameter">query</replaceable> <type>tsquery</>)</function></literal> </entry> <entry><type>text</type></entry> <entry>get indexable part of a <type>tsquery</></entry> @@ -9528,10 +9528,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>setweight</primary> </indexterm> - <literal><function>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>)</function></literal> + <literal><function>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">weight</replaceable> <type>"char"</>)</function></literal> </entry> <entry><type>tsvector</type></entry> - <entry>assign <replaceable class="PARAMETER">weight</replaceable> to each element of <replaceable class="PARAMETER">vector</replaceable></entry> + <entry>assign <replaceable class="parameter">weight</replaceable> to each element of <replaceable class="parameter">vector</replaceable></entry> <entry><literal>setweight('fat:2,4 cat:3 rat:5B'::tsvector, 'A')</literal></entry> <entry><literal>'cat':3A 'fat':2A,4A 'rat':5A</literal></entry> </row> @@ -9541,10 +9541,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <primary>setweight</primary> <secondary>setweight for specific lexeme(s)</secondary> </indexterm> - <literal><function>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>, <replaceable class="PARAMETER">lexemes</replaceable> <type>text[]</>)</function></literal> + <literal><function>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">weight</replaceable> <type>"char"</>, <replaceable class="parameter">lexemes</replaceable> <type>text[]</>)</function></literal> </entry> <entry><type>tsvector</type></entry> - <entry>assign <replaceable class="PARAMETER">weight</replaceable> to elements of <replaceable class="PARAMETER">vector</replaceable> that are listed in <replaceable class="PARAMETER">lexemes</replaceable></entry> + <entry>assign <replaceable class="parameter">weight</replaceable> to elements of <replaceable class="parameter">vector</replaceable> that are listed in <replaceable class="parameter">lexemes</replaceable></entry> <entry><literal>setweight('fat:2,4 cat:3 rat:5B'::tsvector, 'A', '{cat,rat}')</literal></entry> <entry><literal>'cat':3A 'fat':2,4 'rat':5A</literal></entry> </row> @@ -9565,7 +9565,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>to_tsquery</primary> </indexterm> - <literal><function>to_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal> + <literal><function>to_tsquery(<optional> <replaceable class="parameter">config</> <type>regconfig</> , </optional> <replaceable class="parameter">query</> <type>text</type>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>normalize words and convert to <type>tsquery</></entry> @@ -9577,7 +9577,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>to_tsvector</primary> </indexterm> - <literal><function>to_tsvector(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">document</> <type>text</type>)</function></literal> + <literal><function>to_tsvector(<optional> <replaceable class="parameter">config</> <type>regconfig</> , </optional> <replaceable class="parameter">document</> <type>text</type>)</function></literal> </entry> <entry><type>tsvector</type></entry> <entry>reduce document text to <type>tsvector</></entry> @@ -9586,7 +9586,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple </row> <row> <entry> - <literal><function>to_tsvector(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">document</> <type>json(b)</type>)</function></literal> + <literal><function>to_tsvector(<optional> <replaceable class="parameter">config</> <type>regconfig</> , </optional> <replaceable class="parameter">document</> <type>json(b)</type>)</function></literal> </entry> <entry><type>tsvector</type></entry> <entry> @@ -9601,20 +9601,20 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_delete</primary> </indexterm> - <literal><function>ts_delete(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">lexeme</replaceable> <type>text</>)</function></literal> + <literal><function>ts_delete(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">lexeme</replaceable> <type>text</>)</function></literal> </entry> <entry><type>tsvector</type></entry> - <entry>remove given <replaceable class="PARAMETER">lexeme</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry> + <entry>remove given <replaceable class="parameter">lexeme</replaceable> from <replaceable class="parameter">vector</replaceable></entry> <entry><literal>ts_delete('fat:2,4 cat:3 rat:5A'::tsvector, 'fat')</literal></entry> <entry><literal>'cat':3 'rat':5A</literal></entry> </row> <row> <entry> <!-- previous indexterm entry covers this too --> - <literal><function>ts_delete(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">lexemes</replaceable> <type>text[]</>)</function></literal> + <literal><function>ts_delete(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">lexemes</replaceable> <type>text[]</>)</function></literal> </entry> <entry><type>tsvector</type></entry> - <entry>remove any occurrence of lexemes in <replaceable class="PARAMETER">lexemes</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry> + <entry>remove any occurrence of lexemes in <replaceable class="parameter">lexemes</replaceable> from <replaceable class="parameter">vector</replaceable></entry> <entry><literal>ts_delete('fat:2,4 cat:3 rat:5A'::tsvector, ARRAY['fat','rat'])</literal></entry> <entry><literal>'cat':3</literal></entry> </row> @@ -9623,10 +9623,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_filter</primary> </indexterm> - <literal><function>ts_filter(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weights</replaceable> <type>"char"[]</>)</function></literal> + <literal><function>ts_filter(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">weights</replaceable> <type>"char"[]</>)</function></literal> </entry> <entry><type>tsvector</type></entry> - <entry>select only elements with given <replaceable class="PARAMETER">weights</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry> + <entry>select only elements with given <replaceable class="parameter">weights</replaceable> from <replaceable class="parameter">vector</replaceable></entry> <entry><literal>ts_filter('fat:2,4 cat:3b rat:5A'::tsvector, '{a,b}')</literal></entry> <entry><literal>'cat':3B 'rat':5A</literal></entry> </row> @@ -9635,7 +9635,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_headline</primary> </indexterm> - <literal><function>ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>)</function></literal> + <literal><function>ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>text</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">options</replaceable> <type>text</> </optional>)</function></literal> </entry> <entry><type>text</type></entry> <entry>display a query match</entry> @@ -9644,7 +9644,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple </row> <row> <entry> - <literal><function>ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>json(b)</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>)</function></literal> + <literal><function>ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>json(b)</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">options</replaceable> <type>text</> </optional>)</function></literal> </entry> <entry><type>text</type></entry> <entry>display a query match</entry> @@ -9656,7 +9656,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_rank</primary> </indexterm> - <literal><function>ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>)</function></literal> + <literal><function>ts_rank(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</> </optional>)</function></literal> </entry> <entry><type>float4</type></entry> <entry>rank document for query</entry> @@ -9668,7 +9668,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_rank_cd</primary> </indexterm> - <literal><function>ts_rank_cd(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>)</function></literal> + <literal><function>ts_rank_cd(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</> </optional>)</function></literal> </entry> <entry><type>float4</type></entry> <entry>rank document for query using cover density</entry> @@ -9680,7 +9680,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_rewrite</primary> </indexterm> - <literal><function>ts_rewrite(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">target</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">substitute</replaceable> <type>tsquery</>)</function></literal> + <literal><function>ts_rewrite(<replaceable class="parameter">query</replaceable> <type>tsquery</>, <replaceable class="parameter">target</replaceable> <type>tsquery</>, <replaceable class="parameter">substitute</replaceable> <type>tsquery</>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>replace <replaceable>target</> with <replaceable>substitute</> @@ -9689,7 +9689,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <entry><literal>'b' & ( 'foo' | 'bar' )</literal></entry> </row> <row> - <entry><literal><function>ts_rewrite(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">select</replaceable> <type>text</>)</function></literal></entry> + <entry><literal><function>ts_rewrite(<replaceable class="parameter">query</replaceable> <type>tsquery</>, <replaceable class="parameter">select</replaceable> <type>text</>)</function></literal></entry> <entry><type>tsquery</type></entry> <entry>replace using targets and substitutes from a <command>SELECT</> command</entry> <entry><literal>SELECT ts_rewrite('a & b'::tsquery, 'SELECT t,s FROM aliases')</literal></entry> @@ -9700,7 +9700,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>tsquery_phrase</primary> </indexterm> - <literal><function>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</>)</function></literal> + <literal><function>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</>, <replaceable class="parameter">query2</replaceable> <type>tsquery</>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>make query that searches for <replaceable>query1</> followed @@ -9711,7 +9711,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple </row> <row> <entry> - <literal><function>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">distance</replaceable> <type>integer</>)</function></literal> + <literal><function>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</>, <replaceable class="parameter">query2</replaceable> <type>tsquery</>, <replaceable class="parameter">distance</replaceable> <type>integer</>)</function></literal> </entry> <entry><type>tsquery</type></entry> <entry>make query that searches for <replaceable>query1</> followed by @@ -9761,7 +9761,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <primary>unnest</primary> <secondary>for tsvector</secondary> </indexterm> - <literal><function>unnest(<type>tsvector</>, OUT <replaceable class="PARAMETER">lexeme</> <type>text</>, OUT <replaceable class="PARAMETER">positions</> <type>smallint[]</>, OUT <replaceable class="PARAMETER">weights</> <type>text</>)</function></literal> + <literal><function>unnest(<type>tsvector</>, OUT <replaceable class="parameter">lexeme</> <type>text</>, OUT <replaceable class="parameter">positions</> <type>smallint[]</>, OUT <replaceable class="parameter">weights</> <type>text</>)</function></literal> </entry> <entry><type>setof record</type></entry> <entry>expand a <type>tsvector</type> to a set of rows</entry> @@ -9807,7 +9807,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_debug</primary> </indexterm> - <literal><function>ts_debug(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>, OUT <replaceable class="PARAMETER">token</> <type>text</>, OUT <replaceable class="PARAMETER">dictionaries</> <type>regdictionary[]</>, OUT <replaceable class="PARAMETER">dictionary</> <type>regdictionary</>, OUT <replaceable class="PARAMETER">lexemes</> <type>text[]</>)</function></literal> + <literal><function>ts_debug(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>text</>, OUT <replaceable class="parameter">alias</> <type>text</>, OUT <replaceable class="parameter">description</> <type>text</>, OUT <replaceable class="parameter">token</> <type>text</>, OUT <replaceable class="parameter">dictionaries</> <type>regdictionary[]</>, OUT <replaceable class="parameter">dictionary</> <type>regdictionary</>, OUT <replaceable class="parameter">lexemes</> <type>text[]</>)</function></literal> </entry> <entry><type>setof record</type></entry> <entry>test a configuration</entry> @@ -9819,7 +9819,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_lexize</primary> </indexterm> - <literal><function>ts_lexize(<replaceable class="PARAMETER">dict</replaceable> <type>regdictionary</>, <replaceable class="PARAMETER">token</replaceable> <type>text</>)</function></literal> + <literal><function>ts_lexize(<replaceable class="parameter">dict</replaceable> <type>regdictionary</>, <replaceable class="parameter">token</replaceable> <type>text</>)</function></literal> </entry> <entry><type>text[]</type></entry> <entry>test a dictionary</entry> @@ -9831,7 +9831,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_parse</primary> </indexterm> - <literal><function>ts_parse(<replaceable class="PARAMETER">parser_name</replaceable> <type>text</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>)</function></literal> + <literal><function>ts_parse(<replaceable class="parameter">parser_name</replaceable> <type>text</>, <replaceable class="parameter">document</replaceable> <type>text</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">token</> <type>text</>)</function></literal> </entry> <entry><type>setof record</type></entry> <entry>test a parser</entry> @@ -9839,7 +9839,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <entry><literal>(1,foo) ...</literal></entry> </row> <row> - <entry><literal><function>ts_parse(<replaceable class="PARAMETER">parser_oid</replaceable> <type>oid</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>)</function></literal></entry> + <entry><literal><function>ts_parse(<replaceable class="parameter">parser_oid</replaceable> <type>oid</>, <replaceable class="parameter">document</replaceable> <type>text</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">token</> <type>text</>)</function></literal></entry> <entry><type>setof record</type></entry> <entry>test a parser</entry> <entry><literal>ts_parse(3722, 'foo - bar')</literal></entry> @@ -9850,7 +9850,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_token_type</primary> </indexterm> - <literal><function>ts_token_type(<replaceable class="PARAMETER">parser_name</> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>)</function></literal> + <literal><function>ts_token_type(<replaceable class="parameter">parser_name</> <type>text</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">alias</> <type>text</>, OUT <replaceable class="parameter">description</> <type>text</>)</function></literal> </entry> <entry><type>setof record</type></entry> <entry>get token types defined by parser</entry> @@ -9858,7 +9858,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <entry><literal>(1,asciiword,"Word, all ASCII") ...</literal></entry> </row> <row> - <entry><literal><function>ts_token_type(<replaceable class="PARAMETER">parser_oid</> <type>oid</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>)</function></literal></entry> + <entry><literal><function>ts_token_type(<replaceable class="parameter">parser_oid</> <type>oid</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">alias</> <type>text</>, OUT <replaceable class="parameter">description</> <type>text</>)</function></literal></entry> <entry><type>setof record</type></entry> <entry>get token types defined by parser</entry> <entry><literal>ts_token_type(3722)</literal></entry> @@ -9869,7 +9869,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple <indexterm> <primary>ts_stat</primary> </indexterm> - <literal><function>ts_stat(<replaceable class="PARAMETER">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="PARAMETER">weights</replaceable> <type>text</>, </optional> OUT <replaceable class="PARAMETER">word</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">ndoc</replaceable> <type>integer</>, OUT <replaceable class="PARAMETER">nentry</replaceable> <type>integer</>)</function></literal> + <literal><function>ts_stat(<replaceable class="parameter">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="parameter">weights</replaceable> <type>text</>, </optional> OUT <replaceable class="parameter">word</replaceable> <type>text</>, OUT <replaceable class="parameter">ndoc</replaceable> <type>integer</>, OUT <replaceable class="parameter">nentry</replaceable> <type>integer</>)</function></literal> </entry> <entry><type>setof record</type></entry> <entry>get statistics of a <type>tsvector</> column</entry> diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 0588da2912c..11a4bf4e418 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -1854,7 +1854,7 @@ SELECT <replaceable>select_list</replaceable> that can be used in a query without having to actually create and populate a table on-disk. The syntax is <synopsis> -VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ...] +VALUES ( <replaceable class="parameter">expression</replaceable> [, ...] ) [, ...] </synopsis> Each parenthesized list of expressions generates a row in the table. The lists must all have the same number of elements (i.e., the number diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 9ab86127afa..59639d37291 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -21,24 +21,24 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +ALTER DATABASE <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> - ALLOW_CONNECTIONS <replaceable class="PARAMETER">allowconn</replaceable> - CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> - IS_TEMPLATE <replaceable class="PARAMETER">istemplate</replaceable> + ALLOW_CONNECTIONS <replaceable class="parameter">allowconn</replaceable> + CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable> + IS_TEMPLATE <replaceable class="parameter">istemplate</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER DATABASE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER DATABASE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> +ALTER DATABASE <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>configuration_parameter</replaceable> -ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL +ALTER DATABASE <replaceable class="parameter">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } +ALTER DATABASE <replaceable class="parameter">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT +ALTER DATABASE <replaceable class="parameter">name</replaceable> RESET <replaceable>configuration_parameter</replaceable> +ALTER DATABASE <replaceable class="parameter">name</replaceable> RESET ALL </synopsis> </refsynopsisdiv> @@ -102,7 +102,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the database whose attributes are to be altered. diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml index e3363f868a4..09eabda68ac 100644 --- a/doc/src/sgml/ref/alter_default_privileges.sgml +++ b/doc/src/sgml/ref/alter_default_privileges.sgml @@ -31,55 +31,55 @@ ALTER DEFAULT PRIVILEGES GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [, ...] | ALL [ PRIVILEGES ] } ON TABLES - TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { { USAGE | SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } ON SEQUENCES - TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { EXECUTE | ALL [ PRIVILEGES ] } ON FUNCTIONS - TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON TYPES - TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | CREATE | ALL [ PRIVILEGES ] } ON SCHEMAS - TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] + TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ] REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [, ...] | ALL [ PRIVILEGES ] } ON TABLES - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { USAGE | SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } ON SEQUENCES - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { EXECUTE | ALL [ PRIVILEGES ] } ON FUNCTIONS - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON TYPES - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | CREATE | ALL [ PRIVILEGES ] } ON SCHEMAS - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml index 95a822aef62..827a1c7d20e 100644 --- a/doc/src/sgml/ref/alter_domain.sgml +++ b/doc/src/sgml/ref/alter_domain.sgml @@ -23,24 +23,24 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT } -ALTER DOMAIN <replaceable class="PARAMETER">name</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">name</replaceable> - ADD <replaceable class="PARAMETER">domain_constraint</replaceable> [ NOT VALID ] -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - DROP CONSTRAINT [ IF EXISTS ] <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ] -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - RENAME CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> TO <replaceable class="PARAMETER">new_constraint_name</replaceable> -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> - SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable> +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + ADD <replaceable class="parameter">domain_constraint</replaceable> [ NOT VALID ] +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + DROP CONSTRAINT [ IF EXISTS ] <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ] +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + RENAME CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> TO <replaceable class="parameter">new_constraint_name</replaceable> +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER DOMAIN <replaceable class="parameter">name</replaceable> + SET SCHEMA <replaceable class="parameter">new_schema</replaceable> </synopsis> </refsynopsisdiv> @@ -76,7 +76,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>ADD <replaceable class="PARAMETER">domain_constraint</replaceable> [ NOT VALID ]</literal></term> + <term><literal>ADD <replaceable class="parameter">domain_constraint</replaceable> [ NOT VALID ]</literal></term> <listitem> <para> This form adds a new constraint to a domain using the same syntax as @@ -171,7 +171,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> <para> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing domain to @@ -181,7 +181,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</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. @@ -190,7 +190,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</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 or rename. @@ -199,7 +199,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">NOT VALID</replaceable></term> + <term><replaceable class="parameter">NOT VALID</replaceable></term> <listitem> <para> Do not verify existing column data for constraint validity. @@ -230,7 +230,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name for the domain. @@ -239,7 +239,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_constraint_name</replaceable></term> + <term><replaceable class="parameter">new_constraint_name</replaceable></term> <listitem> <para> The new name for the constraint. @@ -248,7 +248,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the domain. @@ -257,7 +257,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_schema</replaceable></term> + <term><replaceable class="parameter">new_schema</replaceable></term> <listitem> <para> The new schema for the domain. diff --git a/doc/src/sgml/ref/alter_event_trigger.sgml b/doc/src/sgml/ref/alter_event_trigger.sgml index 9d6c64ad529..38b971fb08a 100644 --- a/doc/src/sgml/ref/alter_event_trigger.sgml +++ b/doc/src/sgml/ref/alter_event_trigger.sgml @@ -21,10 +21,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> DISABLE -ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> ENABLE [ REPLICA | ALWAYS ] -ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> +ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> DISABLE +ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> ENABLE [ REPLICA | ALWAYS ] +ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -46,7 +46,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an existing trigger to alter. @@ -55,7 +55,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the event trigger. @@ -64,7 +64,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name of the event trigger. diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml index a7c0927d1c9..ae84e98e49a 100644 --- a/doc/src/sgml/ref/alter_extension.sgml +++ b/doc/src/sgml/ref/alter_extension.sgml @@ -23,39 +23,39 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> UPDATE [ TO <replaceable class="PARAMETER">new_version</replaceable> ] -ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable> -ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> ADD <replaceable class="PARAMETER">member_object</replaceable> -ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replaceable class="PARAMETER">member_object</replaceable> +ALTER EXTENSION <replaceable class="parameter">name</replaceable> UPDATE [ TO <replaceable class="parameter">new_version</replaceable> ] +ALTER EXTENSION <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> +ALTER EXTENSION <replaceable class="parameter">name</replaceable> ADD <replaceable class="parameter">member_object</replaceable> +ALTER EXTENSION <replaceable class="parameter">name</replaceable> DROP <replaceable class="parameter">member_object</replaceable> -<phrase>where <replaceable class="PARAMETER">member_object</replaceable> is:</phrase> +<phrase>where <replaceable class="parameter">member_object</replaceable> is:</phrase> - ACCESS METHOD <replaceable class="PARAMETER">object_name</replaceable> | - AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | + ACCESS METHOD <replaceable class="parameter">object_name</replaceable> | + AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) | - COLLATION <replaceable class="PARAMETER">object_name</replaceable> | - CONVERSION <replaceable class="PARAMETER">object_name</replaceable> | - DOMAIN <replaceable class="PARAMETER">object_name</replaceable> | - EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> | - FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> | - FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> | - FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | - MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> | - OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) | - OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | - OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | - [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> | - SCHEMA <replaceable class="PARAMETER">object_name</replaceable> | - SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> | - SERVER <replaceable class="PARAMETER">object_name</replaceable> | - TABLE <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> | + COLLATION <replaceable class="parameter">object_name</replaceable> | + CONVERSION <replaceable class="parameter">object_name</replaceable> | + DOMAIN <replaceable class="parameter">object_name</replaceable> | + EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> | + FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> | + FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> | + FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | + MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> | + OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) | + OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | + OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | + [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> | + SCHEMA <replaceable class="parameter">object_name</replaceable> | + SEQUENCE <replaceable class="parameter">object_name</replaceable> | + SERVER <replaceable class="parameter">object_name</replaceable> | + TABLE <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> | TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> | - TYPE <replaceable class="PARAMETER">object_name</replaceable> | - VIEW <replaceable class="PARAMETER">object_name</replaceable> + TYPE <replaceable class="parameter">object_name</replaceable> | + VIEW <replaceable class="parameter">object_name</replaceable> <phrase>and <replaceable>aggregate_signature</replaceable> is:</phrase> @@ -96,7 +96,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea </varlistentry> <varlistentry> - <term><literal>ADD <replaceable class="PARAMETER">member_object</replaceable></literal></term> + <term><literal>ADD <replaceable class="parameter">member_object</replaceable></literal></term> <listitem> <para> This form adds an existing object to the extension. This is mainly @@ -108,7 +108,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea </varlistentry> <varlistentry> - <term><literal>DROP <replaceable class="PARAMETER">member_object</replaceable></literal></term> + <term><literal>DROP <replaceable class="parameter">member_object</replaceable></literal></term> <listitem> <para> This form removes a member object from the extension. This is mainly @@ -136,7 +136,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea <para> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an installed extension. @@ -145,7 +145,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_version</replaceable></term> + <term><replaceable class="parameter">new_version</replaceable></term> <listitem> <para> The desired new version of the extension. This can be written as @@ -157,7 +157,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_schema</replaceable></term> + <term><replaceable class="parameter">new_schema</replaceable></term> <listitem> <para> The new schema for the extension. diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml index 3f5fb0f77ea..9c5b84fe64d 100644 --- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml @@ -24,7 +24,7 @@ PostgreSQL documentation ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> [ HANDLER <replaceable class="parameter">handler_function</replaceable> | NO HANDLER ] [ VALIDATOR <replaceable class="parameter">validator_function</replaceable> | NO VALIDATOR ] - [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ]) ] + [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ]) ] ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> @@ -113,7 +113,7 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN </varlistentry> <varlistentry> - <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term> + <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term> <listitem> <para> Change options for the foreign-data @@ -127,7 +127,7 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the foreign-data wrapper. diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml index b1692842b26..cb4e7044fbd 100644 --- a/doc/src/sgml/ref/alter_foreign_table.sgml +++ b/doc/src/sgml/ref/alter_foreign_table.sgml @@ -21,41 +21,41 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] - <replaceable class="PARAMETER">action</replaceable> [, ... ] -ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] - RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable> -ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable> - -<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase> - - ADD [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] - DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> [ RESTRICT | CASCADE ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET | DROP } NOT NULL - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ]) - ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ] - VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> - DROP CONSTRAINT [ IF EXISTS ] <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ] - DISABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ] - ENABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ] - ENABLE REPLICA TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> - ENABLE ALWAYS TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> +ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] + <replaceable class="parameter">action</replaceable> [, ... ] +ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] + RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable> +ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + SET SCHEMA <replaceable class="parameter">new_schema</replaceable> + +<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase> + + ADD [ COLUMN ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] + DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="parameter">column_name</replaceable> [ RESTRICT | CASCADE ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET | DROP } NOT NULL + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ]) + ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ] + VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> + DROP CONSTRAINT [ IF EXISTS ] <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ] + DISABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ] + ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ] + ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable> + ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable> SET WITH OIDS SET WITHOUT OIDS - INHERIT <replaceable class="PARAMETER">parent_table</replaceable> - NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable> - OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } - OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ]) + INHERIT <replaceable class="parameter">parent_table</replaceable> + NO INHERIT <replaceable class="parameter">parent_table</replaceable> + OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } + OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ]) </synopsis> </refsynopsisdiv> @@ -142,8 +142,8 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><literal>SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term> - <term><literal>RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )</literal></term> + <term><literal>SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term> + <term><literal>RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )</literal></term> <listitem> <para> This form sets or resets per-attribute options. @@ -169,7 +169,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term> + <term><literal>ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]</literal></term> <listitem> <para> This form adds a new constraint to a foreign table, using the same @@ -256,7 +256,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><literal>INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term> + <term><literal>INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term> <listitem> <para> This form adds the target foreign table as a new child of the specified @@ -268,7 +268,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><literal>NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term> + <term><literal>NO INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term> <listitem> <para> This form removes the target foreign table from the list of children of @@ -288,7 +288,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term> + <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term> <listitem> <para> Change options for the foreign table or one of its columns. @@ -358,7 +358,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing foreign table to @@ -372,7 +372,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> Name of a new or existing column. @@ -381,7 +381,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_column_name</replaceable></term> + <term><replaceable class="parameter">new_column_name</replaceable></term> <listitem> <para> New name for an existing column. @@ -390,7 +390,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> New name for the table. @@ -399,7 +399,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> Data type of the new column, or new data type for an existing @@ -409,7 +409,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_constraint</replaceable></term> + <term><replaceable class="parameter">table_constraint</replaceable></term> <listitem> <para> New table constraint for the foreign table. @@ -418,7 +418,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </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. @@ -449,7 +449,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">trigger_name</replaceable></term> + <term><replaceable class="parameter">trigger_name</replaceable></term> <listitem> <para> Name of a single trigger to disable or enable. @@ -480,7 +480,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">parent_table</replaceable></term> + <term><replaceable class="parameter">parent_table</replaceable></term> <listitem> <para> A parent table to associate or de-associate with this foreign table. @@ -489,7 +489,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the table. @@ -498,7 +498,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_schema</replaceable></term> + <term><replaceable class="parameter">new_schema</replaceable></term> <listitem> <para> The name of the schema to which the table will be moved. diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml index 168eeb7c526..8d9fec6005a 100644 --- a/doc/src/sgml/ref/alter_function.sgml +++ b/doc/src/sgml/ref/alter_function.sgml @@ -22,7 +22,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] - <replaceable class="PARAMETER">action</replaceable> [ ... ] [ RESTRICT ] + <replaceable class="parameter">action</replaceable> [ ... ] [ RESTRICT ] ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] RENAME TO <replaceable>new_name</replaceable> ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] @@ -32,7 +32,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] DEPENDS ON EXTENSION <replaceable>extension_name</replaceable> -<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase> +<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase> CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT IMMUTABLE | STABLE | VOLATILE | [ NOT ] LEAKPROOF diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml index adf6f7e9323..f7136c773a7 100644 --- a/doc/src/sgml/ref/alter_group.sgml +++ b/doc/src/sgml/ref/alter_group.sgml @@ -21,16 +21,16 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER GROUP <replaceable class="PARAMETER">role_specification</replaceable> ADD USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ] -ALTER GROUP <replaceable class="PARAMETER">role_specification</replaceable> DROP USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ] +ALTER GROUP <replaceable class="parameter">role_specification</replaceable> ADD USER <replaceable class="parameter">user_name</replaceable> [, ... ] +ALTER GROUP <replaceable class="parameter">role_specification</replaceable> DROP USER <replaceable class="parameter">user_name</replaceable> [, ... ] -<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase> - <replaceable class="PARAMETER">role_name</replaceable> + <replaceable class="parameter">role_name</replaceable> | CURRENT_USER | SESSION_USER -ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER GROUP <replaceable class="parameter">group_name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -66,7 +66,7 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">group_name</replaceable></term> + <term><replaceable class="parameter">group_name</replaceable></term> <listitem> <para> The name of the group (role) to modify. @@ -75,7 +75,7 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">user_name</replaceable></term> + <term><replaceable class="parameter">user_name</replaceable></term> <listitem> <para> Users (roles) that are to be added to or removed from the group. diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml index 7d6553d2db1..4c777f86752 100644 --- a/doc/src/sgml/ref/alter_index.sgml +++ b/doc/src/sgml/ref/alter_index.sgml @@ -21,15 +21,15 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> SET TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> -ALTER INDEX <replaceable class="PARAMETER">name</replaceable> DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable> -ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) -ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] ) -ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_number</replaceable> - SET STATISTICS <replaceable class="PARAMETER">integer</replaceable> -ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ] - SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ] +ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> +ALTER INDEX <replaceable class="parameter">name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable> +ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) +ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] ) +ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable> + SET STATISTICS <replaceable class="parameter">integer</replaceable> +ALTER INDEX ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ] + SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ] </synopsis> </refsynopsisdiv> @@ -86,7 +86,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term> + <term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term> <listitem> <para> This form changes one or more index-method-specific storage parameters @@ -102,7 +102,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )</literal></term> + <term><literal>RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )</literal></term> <listitem> <para> This form resets one or more index-method-specific storage parameters to @@ -113,7 +113,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>ALTER [ COLUMN ] <replaceable class="PARAMETER">column_number</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable></literal></term> + <term><literal>ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable></literal></term> <listitem> <para> This form sets the per-column statistics-gathering target for @@ -152,7 +152,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_number</replaceable></term> + <term><replaceable class="parameter">column_number</replaceable></term> <listitem> <para> The ordinal number refers to the ordinal (left-to-right) position @@ -162,7 +162,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing index to @@ -172,7 +172,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name for the index. @@ -181,7 +181,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">tablespace_name</replaceable></term> + <term><replaceable class="parameter">tablespace_name</replaceable></term> <listitem> <para> The tablespace to which the index will be moved. @@ -190,7 +190,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">extension_name</replaceable></term> + <term><replaceable class="parameter">extension_name</replaceable></term> <listitem> <para> The name of the extension that the index is to depend on. @@ -199,7 +199,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">storage_parameter</replaceable></term> + <term><replaceable class="parameter">storage_parameter</replaceable></term> <listitem> <para> The name of an index-method-specific storage parameter. @@ -208,7 +208,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">value</replaceable></term> + <term><replaceable class="parameter">value</replaceable></term> <listitem> <para> The new value for an index-method-specific storage parameter. diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgml index 5748d52db11..5e680f7720c 100644 --- a/doc/src/sgml/ref/alter_large_object.sgml +++ b/doc/src/sgml/ref/alter_large_object.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_materialized_view.sgml b/doc/src/sgml/ref/alter_materialized_view.sgml index b88f5ac00fb..a1cced1581c 100644 --- a/doc/src/sgml/ref/alter_materialized_view.sgml +++ b/doc/src/sgml/ref/alter_materialized_view.sgml @@ -21,30 +21,30 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - <replaceable class="PARAMETER">action</replaceable> [, ... ] -ALTER MATERIALIZED VIEW <replaceable class="PARAMETER">name</replaceable> - DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable> -ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable> +ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + <replaceable class="parameter">action</replaceable> [, ... ] +ALTER MATERIALIZED VIEW <replaceable class="parameter">name</replaceable> + DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable> +ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable> ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> -ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ] - SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ] +ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ] + SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ] -<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase> +<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } - CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } + CLUSTER ON <replaceable class="parameter">index_name</replaceable> SET WITHOUT CLUSTER - SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) - RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] ) - OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } + SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) + RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] ) + OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } </synopsis> </refsynopsisdiv> @@ -98,7 +98,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> Name of a new or existing column. @@ -107,7 +107,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">extension_name</replaceable></term> + <term><replaceable class="parameter">extension_name</replaceable></term> <listitem> <para> The name of the extension that the materialized view is to depend on. @@ -116,7 +116,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_column_name</replaceable></term> + <term><replaceable class="parameter">new_column_name</replaceable></term> <listitem> <para> New name for an existing column. @@ -125,7 +125,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the materialized view. diff --git a/doc/src/sgml/ref/alter_policy.sgml b/doc/src/sgml/ref/alter_policy.sgml index df347d180ea..3eb91556023 100644 --- a/doc/src/sgml/ref/alter_policy.sgml +++ b/doc/src/sgml/ref/alter_policy.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> +ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ] diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml index f064ec5f320..7392e6f3de2 100644 --- a/doc/src/sgml/ref/alter_publication.sgml +++ b/doc/src/sgml/ref/alter_publication.sgml @@ -21,12 +21,12 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> ADD TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...] -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> SET TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...] -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> DROP TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...] -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> ADD TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...] +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...] +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> DROP TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...] +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index ccdd5c107ca..607b25962f0 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER ROLE <replaceable class="PARAMETER">role_specification</replaceable> [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] +ALTER ROLE <replaceable class="parameter">role_specification</replaceable> [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB @@ -32,20 +32,20 @@ ALTER ROLE <replaceable class="PARAMETER">role_specification</replaceable> [ WIT | LOGIN | NOLOGIN | REPLICATION | NOREPLICATION | BYPASSRLS | NOBYPASSRLS - | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> - | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' - | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' + | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable> + | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' + | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>' -ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER ROLE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> -ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } -ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT -ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable> -ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL +ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } +ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT +ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable> +ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET ALL -<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase> - <replaceable class="PARAMETER">role_name</replaceable> + <replaceable class="parameter">role_name</replaceable> | CURRENT_USER | SESSION_USER </synopsis> @@ -125,7 +125,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the role whose attributes are to be altered. diff --git a/doc/src/sgml/ref/alter_rule.sgml b/doc/src/sgml/ref/alter_rule.sgml index 993a0ceb83f..26791b379bd 100644 --- a/doc/src/sgml/ref/alter_rule.sgml +++ b/doc/src/sgml/ref/alter_rule.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> +ALTER RULE <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -44,7 +44,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an existing rule to alter. @@ -53,7 +53,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table or view that the @@ -63,7 +63,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name for the rule. diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index 190c8d64855..c505935fcc2 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -31,7 +31,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ] [ OWNED BY { <replaceable class="parameter">table_name</replaceable>.<replaceable class="parameter">column_name</replaceable> | NONE } ] -ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> </synopsis> @@ -256,7 +256,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the sequence. diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml index e6cf511853f..7f5def30a40 100644 --- a/doc/src/sgml/ref/alter_server.sgml +++ b/doc/src/sgml/ref/alter_server.sgml @@ -22,9 +22,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> ALTER SERVER <replaceable class="parameter">name</replaceable> [ VERSION '<replaceable class="parameter">new_version</replaceable>' ] - [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] ) ] -ALTER SERVER <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> + [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] ) ] +ALTER SERVER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER SERVER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> @@ -71,7 +71,7 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac </varlistentry> <varlistentry> - <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term> + <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term> <listitem> <para> Change options for the @@ -85,7 +85,7 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the foreign server. diff --git a/doc/src/sgml/ref/alter_statistics.sgml b/doc/src/sgml/ref/alter_statistics.sgml index 4f256698529..db4f2f0d523 100644 --- a/doc/src/sgml/ref/alter_statistics.sgml +++ b/doc/src/sgml/ref/alter_statistics.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } ALTER STATISTICS <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> </synopsis> @@ -67,7 +67,7 @@ ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the statistics object. diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml index b1b7765d76c..44c0b350692 100644 --- a/doc/src/sgml/ref/alter_subscription.sgml +++ b/doc/src/sgml/ref/alter_subscription.sgml @@ -21,14 +21,14 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> CONNECTION '<replaceable>conninfo</replaceable>' -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> SET PUBLICATION <replaceable class="PARAMETER">publication_name</replaceable> [, ...] [ WITH ( <replaceable class="PARAMETER">set_publication_option</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ] -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> REFRESH PUBLICATION [ WITH ( <replaceable class="PARAMETER">refresh_option</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ] -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> ENABLE -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> DISABLE -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> CONNECTION '<replaceable>conninfo</replaceable>' +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> SET PUBLICATION <replaceable class="parameter">publication_name</replaceable> [, ...] [ WITH ( <replaceable class="parameter">set_publication_option</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ] +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> REFRESH PUBLICATION [ WITH ( <replaceable class="parameter">refresh_option</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ] +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> ENABLE +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> DISABLE +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_system.sgml b/doc/src/sgml/ref/alter_system.sgml index b234793f3e9..e3a4af4041f 100644 --- a/doc/src/sgml/ref/alter_system.sgml +++ b/doc/src/sgml/ref/alter_system.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER SYSTEM SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT } +ALTER SYSTEM SET <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | '<replaceable class="parameter">value</replaceable>' | DEFAULT } -ALTER SYSTEM RESET <replaceable class="PARAMETER">configuration_parameter</replaceable> +ALTER SYSTEM RESET <replaceable class="parameter">configuration_parameter</replaceable> ALTER SYSTEM RESET ALL </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 0fb385ece7a..0559f80549d 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -21,74 +21,74 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] - <replaceable class="PARAMETER">action</replaceable> [, ... ] -ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] - RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable> -ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] - RENAME CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> TO <replaceable class="PARAMETER">new_constraint_name</replaceable> -ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable> -ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ] - SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ] -ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - ATTACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable> { FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable> | DEFAULT } -ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> - DETACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable> - -<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase> - - ADD [ COLUMN ] [ IF NOT EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] - DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> [ RESTRICT | CASCADE ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ USING <replaceable class="PARAMETER">expression</replaceable> ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET | DROP } NOT NULL - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> ADD GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET GENERATED { ALWAYS | BY DEFAULT } | SET <replaceable>sequence_option</replaceable> | RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] } [...] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP IDENTITY [ IF EXISTS ] - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable> - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] ) - ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } - ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ] - ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable> - ALTER CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] - VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> - DROP CONSTRAINT [ IF EXISTS ] <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ] - DISABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ] - ENABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ] - ENABLE REPLICA TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> - ENABLE ALWAYS TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> - DISABLE RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable> - ENABLE RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable> - ENABLE REPLICA RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable> - ENABLE ALWAYS RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable> +ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] + <replaceable class="parameter">action</replaceable> [, ... ] +ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] + RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable> +ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] + RENAME CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> TO <replaceable class="parameter">new_constraint_name</replaceable> +ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + SET SCHEMA <replaceable class="parameter">new_schema</replaceable> +ALTER TABLE ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ] + SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ] +ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + ATTACH PARTITION <replaceable class="parameter">partition_name</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT } +ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> + DETACH PARTITION <replaceable class="parameter">partition_name</replaceable> + +<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase> + + ADD [ COLUMN ] [ IF NOT EXISTS ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] + DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="parameter">column_name</replaceable> [ RESTRICT | CASCADE ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ USING <replaceable class="parameter">expression</replaceable> ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET | DROP } NOT NULL + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> ADD GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET GENERATED { ALWAYS | BY DEFAULT } | SET <replaceable>sequence_option</replaceable> | RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] } [...] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP IDENTITY [ IF EXISTS ] + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable> + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] ) + ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN } + ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ] + ADD <replaceable class="parameter">table_constraint_using_index</replaceable> + ALTER CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] + VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> + DROP CONSTRAINT [ IF EXISTS ] <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ] + DISABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ] + ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ] + ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable> + ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable> + DISABLE RULE <replaceable class="parameter">rewrite_rule_name</replaceable> + ENABLE RULE <replaceable class="parameter">rewrite_rule_name</replaceable> + ENABLE REPLICA RULE <replaceable class="parameter">rewrite_rule_name</replaceable> + ENABLE ALWAYS RULE <replaceable class="parameter">rewrite_rule_name</replaceable> DISABLE ROW LEVEL SECURITY ENABLE ROW LEVEL SECURITY FORCE ROW LEVEL SECURITY NO FORCE ROW LEVEL SECURITY - CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable> + CLUSTER ON <replaceable class="parameter">index_name</replaceable> SET WITHOUT CLUSTER SET WITH OIDS SET WITHOUT OIDS - SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> + SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> SET { LOGGED | UNLOGGED } - SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) - RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] ) - INHERIT <replaceable class="PARAMETER">parent_table</replaceable> - NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable> - OF <replaceable class="PARAMETER">type_name</replaceable> + SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) + RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] ) + INHERIT <replaceable class="parameter">parent_table</replaceable> + NO INHERIT <replaceable class="parameter">parent_table</replaceable> + OF <replaceable class="parameter">type_name</replaceable> NOT OF - OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } - REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="PARAMETER">index_name</replaceable> | FULL | NOTHING } + OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } + REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="parameter">index_name</replaceable> | FULL | NOTHING } -<phrase>and <replaceable class="PARAMETER">table_constraint_using_index</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">table_constraint_using_index</replaceable> is:</phrase> - [ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] - { UNIQUE | PRIMARY KEY } USING INDEX <replaceable class="PARAMETER">index_name</replaceable> + [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] + { UNIQUE | PRIMARY KEY } USING INDEX <replaceable class="parameter">index_name</replaceable> [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] </synopsis> </refsynopsisdiv> @@ -244,8 +244,8 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term> - <term><literal>RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )</literal></term> + <term><literal>SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term> + <term><literal>RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )</literal></term> <listitem> <para> This form sets or resets per-attribute options. Currently, the only @@ -310,7 +310,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term> + <term><literal>ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]</literal></term> <listitem> <para> This form adds a new constraint to a table using the same syntax as @@ -332,7 +332,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable></literal></term> + <term><literal>ADD <replaceable class="parameter">table_constraint_using_index</replaceable></literal></term> <listitem> <para> This form adds a new <literal>PRIMARY KEY</> or <literal>UNIQUE</> @@ -599,7 +599,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term> + <term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term> <listitem> <para> This form changes one or more storage parameters for the table. See @@ -628,7 +628,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> <para> While <command>CREATE TABLE</> allows <literal>OIDS</> to be specified in the <literal>WITH (<replaceable - class="PARAMETER">storage_parameter</>)</literal> syntax, + class="parameter">storage_parameter</>)</literal> syntax, <command>ALTER TABLE</> does not treat <literal>OIDS</> as a storage parameter. Instead use the <literal>SET WITH OIDS</> and <literal>SET WITHOUT OIDS</> forms to change OID status. @@ -638,7 +638,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )</literal></term> + <term><literal>RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )</literal></term> <listitem> <para> This form resets one or more storage parameters to their @@ -649,7 +649,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term> + <term><literal>INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term> <listitem> <para> This form adds the target table as a new child of the specified parent @@ -677,7 +677,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term> + <term><literal>NO INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term> <listitem> <para> This form removes the target table from the list of children of the @@ -689,7 +689,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>OF <replaceable class="PARAMETER">type_name</replaceable></literal></term> + <term><literal>OF <replaceable class="parameter">type_name</replaceable></literal></term> <listitem> <para> This form links the table to a composite type as though <command>CREATE @@ -765,7 +765,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>ATTACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable> { FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable> | DEFAULT }</literal></term> + <term><literal>ATTACH PARTITION <replaceable class="parameter">partition_name</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }</literal></term> <listitem> <para> This form attaches an existing table (which might itself be partitioned) @@ -777,7 +777,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> <para> A partition using <literal>FOR VALUES</literal> uses same syntax for - <replaceable class="PARAMETER">partition_bound_spec</replaceable> as + <replaceable class="parameter">partition_bound_spec</replaceable> as <xref linkend="sql-createtable">. The partition bound specification must correspond to the partitioning strategy and partition key of the target table. The table to be attached must have all the same columns @@ -828,7 +828,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><literal>DETACH PARTITION</literal> <replaceable class="PARAMETER">partition_name</replaceable></term> + <term><literal>DETACH PARTITION</literal> <replaceable class="parameter">partition_name</replaceable></term> <listitem> <para> This form detaches specified partition of the target table. The detached @@ -886,7 +886,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an existing table to @@ -900,7 +900,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> Name of a new or existing column. @@ -909,7 +909,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_column_name</replaceable></term> + <term><replaceable class="parameter">new_column_name</replaceable></term> <listitem> <para> New name for an existing column. @@ -918,7 +918,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> New name for the table. @@ -927,7 +927,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> Data type of the new column, or new data type for an existing @@ -937,7 +937,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_constraint</replaceable></term> + <term><replaceable class="parameter">table_constraint</replaceable></term> <listitem> <para> New table constraint for the table. @@ -946,7 +946,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">constraint_name</replaceable></term> + <term><replaceable class="parameter">constraint_name</replaceable></term> <listitem> <para> Name of a new or existing constraint. @@ -977,7 +977,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">trigger_name</replaceable></term> + <term><replaceable class="parameter">trigger_name</replaceable></term> <listitem> <para> Name of a single trigger to disable or enable. @@ -1011,7 +1011,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">index_name</replaceable></term> + <term><replaceable class="parameter">index_name</replaceable></term> <listitem> <para> The name of an existing index. @@ -1020,7 +1020,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">storage_parameter</replaceable></term> + <term><replaceable class="parameter">storage_parameter</replaceable></term> <listitem> <para> The name of a table storage parameter. @@ -1029,7 +1029,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">value</replaceable></term> + <term><replaceable class="parameter">value</replaceable></term> <listitem> <para> The new value for a table storage parameter. @@ -1039,7 +1039,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">parent_table</replaceable></term> + <term><replaceable class="parameter">parent_table</replaceable></term> <listitem> <para> A parent table to associate or de-associate with this table. @@ -1048,7 +1048,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the table. @@ -1057,7 +1057,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_tablespace</replaceable></term> + <term><replaceable class="parameter">new_tablespace</replaceable></term> <listitem> <para> The name of the tablespace to which the table will be moved. @@ -1066,7 +1066,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_schema</replaceable></term> + <term><replaceable class="parameter">new_schema</replaceable></term> <listitem> <para> The name of the schema to which the table will be moved. @@ -1075,7 +1075,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">partition_name</replaceable></term> + <term><replaceable class="parameter">partition_name</replaceable></term> <listitem> <para> The name of the table to attach as a new partition or to detach from this table. @@ -1084,7 +1084,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">partition_bound_spec</replaceable></term> + <term><replaceable class="parameter">partition_bound_spec</replaceable></term> <listitem> <para> The partition bound specification for a new partition. Refer to diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml index 2f411050012..4542bd90a21 100644 --- a/doc/src/sgml/ref/alter_tablespace.sgml +++ b/doc/src/sgml/ref/alter_tablespace.sgml @@ -23,8 +23,8 @@ PostgreSQL documentation <synopsis> ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable> ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER TABLESPACE <replaceable>name</replaceable> SET ( <replaceable class="PARAMETER">tablespace_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) -ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="PARAMETER">tablespace_option</replaceable> [, ... ] ) +ALTER TABLESPACE <replaceable>name</replaceable> SET ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) +ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="parameter">tablespace_option</replaceable> [, ... ] ) </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml index 47eef6e5e88..3e48d159e27 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable> +ALTER TRIGGER <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER TRIGGER <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable> </synopsis> </refsynopsisdiv> @@ -48,7 +48,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an existing trigger to alter. @@ -57,7 +57,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name of the table on which this trigger acts. @@ -66,7 +66,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name for the trigger. @@ -75,7 +75,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">extension_name</replaceable></term> + <term><replaceable class="parameter">extension_name</replaceable></term> <listitem> <para> The name of the extension that the trigger is to depend on. diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml index 4027c1b8f7d..6c5201ccb59 100644 --- a/doc/src/sgml/ref/alter_type.sgml +++ b/doc/src/sgml/ref/alter_type.sgml @@ -23,19 +23,19 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> <replaceable class="PARAMETER">action</replaceable> [, ... ] -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> TO <replaceable class="PARAMETER">new_attribute_name</replaceable> [ CASCADE | RESTRICT ] -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable> -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable> -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> ADD VALUE [ IF NOT EXISTS ] <replaceable class="PARAMETER">new_enum_value</replaceable> [ { BEFORE | AFTER } <replaceable class="PARAMETER">neighbor_enum_value</replaceable> ] -ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <replaceable class="PARAMETER">existing_enum_value</replaceable> TO <replaceable class="PARAMETER">new_enum_value</replaceable> - -<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase> - - ADD ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ CASCADE | RESTRICT ] - DROP ATTRIBUTE [ IF EXISTS ] <replaceable class="PARAMETER">attribute_name</replaceable> [ CASCADE | RESTRICT ] - ALTER ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ CASCADE | RESTRICT ] +ALTER TYPE <replaceable class="parameter">name</replaceable> <replaceable class="parameter">action</replaceable> [, ... ] +ALTER TYPE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> TO <replaceable class="parameter">new_attribute_name</replaceable> [ CASCADE | RESTRICT ] +ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> +ALTER TYPE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> +ALTER TYPE <replaceable class="parameter">name</replaceable> ADD VALUE [ IF NOT EXISTS ] <replaceable class="parameter">new_enum_value</replaceable> [ { BEFORE | AFTER } <replaceable class="parameter">neighbor_enum_value</replaceable> ] +ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <replaceable class="parameter">existing_enum_value</replaceable> TO <replaceable class="parameter">new_enum_value</replaceable> + +<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase> + + ADD ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ CASCADE | RESTRICT ] + DROP ATTRIBUTE [ IF EXISTS ] <replaceable class="parameter">attribute_name</replaceable> [ CASCADE | RESTRICT ] + ALTER ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -166,7 +166,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla <para> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of an existing type to @@ -176,7 +176,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_name</replaceable></term> + <term><replaceable class="parameter">new_name</replaceable></term> <listitem> <para> The new name for the type. @@ -185,7 +185,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the type. @@ -194,7 +194,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_schema</replaceable></term> + <term><replaceable class="parameter">new_schema</replaceable></term> <listitem> <para> The new schema for the type. @@ -203,7 +203,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">attribute_name</replaceable></term> + <term><replaceable class="parameter">attribute_name</replaceable></term> <listitem> <para> The name of the attribute to add, alter, or drop. @@ -212,7 +212,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_attribute_name</replaceable></term> + <term><replaceable class="parameter">new_attribute_name</replaceable></term> <listitem> <para> The new name of the attribute to be renamed. @@ -221,7 +221,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> The data type of the attribute to add, or the new type of the @@ -231,7 +231,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_enum_value</replaceable></term> + <term><replaceable class="parameter">new_enum_value</replaceable></term> <listitem> <para> The new value to be added to an enum type's list of values, @@ -242,7 +242,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">neighbor_enum_value</replaceable></term> + <term><replaceable class="parameter">neighbor_enum_value</replaceable></term> <listitem> <para> The existing enum value that the new value should be added immediately @@ -253,7 +253,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">existing_enum_value</replaceable></term> + <term><replaceable class="parameter">existing_enum_value</replaceable></term> <listitem> <para> The existing enum value that should be renamed. diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index c26d264de5c..1a240ff4301 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] +ALTER USER <replaceable class="parameter">role_specification</replaceable> [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB @@ -32,20 +32,20 @@ ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WIT | LOGIN | NOLOGIN | REPLICATION | NOREPLICATION | BYPASSRLS | NOBYPASSRLS - | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> - | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' - | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' + | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable> + | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' + | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>' -ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable> +ALTER USER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable> -ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } -ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT -ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable> -ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL +ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT } +ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT +ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable> +ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET ALL -<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase> - <replaceable class="PARAMETER">role_name</replaceable> + <replaceable class="parameter">role_name</replaceable> | CURRENT_USER | SESSION_USER </synopsis> diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml index 3be54afee55..5cc49210edb 100644 --- a/doc/src/sgml/ref/alter_user_mapping.sgml +++ b/doc/src/sgml/ref/alter_user_mapping.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation <synopsis> ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | SESSION_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable> - OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] ) + OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] ) </synopsis> </refsynopsisdiv> @@ -69,7 +69,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> </varlistentry> <varlistentry> - <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term> + <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term> <listitem> <para> Change options for the user mapping. The new options override diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml index 00f4ecb9b1a..788eda5d58e 100644 --- a/doc/src/sgml/ref/alter_view.sgml +++ b/doc/src/sgml/ref/alter_view.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> -ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT -ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER } +ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable> +ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT +ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER } ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable> ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable> ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] ) @@ -90,7 +90,7 @@ ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_owner</replaceable></term> + <term><replaceable class="parameter">new_owner</replaceable></term> <listitem> <para> The user name of the new owner of the view. diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml index ba429730226..eae7fe92e09 100644 --- a/doc/src/sgml/ref/analyze.sgml +++ b/doc/src/sgml/ref/analyze.sgml @@ -21,11 +21,11 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_and_columns</replaceable> [, ...] ] +ANALYZE [ VERBOSE ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ] -<phrase>where <replaceable class="PARAMETER">table_and_columns</replaceable> is:</phrase> +<phrase>where <replaceable class="parameter">table_and_columns</replaceable> is:</phrase> - <replaceable class="PARAMETER">table_name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] + <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] </synopsis> </refsynopsisdiv> @@ -42,7 +42,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_and_columns</replacea </para> <para> - Without a <replaceable class="PARAMETER">table_and_columns</replaceable> + Without a <replaceable class="parameter">table_and_columns</replaceable> list, <command>ANALYZE</command> processes every table and materialized view in the current database that the current user has permission to analyze. With a list, <command>ANALYZE</command> processes only those table(s). @@ -65,7 +65,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_and_columns</replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of a specific table to @@ -79,7 +79,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_and_columns</replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a specific column to analyze. Defaults to all columns. diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml index aacc667144b..aaa2f89a30f 100644 --- a/doc/src/sgml/ref/close.sgml +++ b/doc/src/sgml/ref/close.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL } +CLOSE { <replaceable class="parameter">name</replaceable> | ALL } </synopsis> </refsynopsisdiv> @@ -57,7 +57,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL } <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</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/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index e6a77095ec3..b55734d35c9 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CLUSTER [VERBOSE] <replaceable class="PARAMETER">table_name</replaceable> [ USING <replaceable class="PARAMETER">index_name</replaceable> ] +CLUSTER [VERBOSE] <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">index_name</replaceable> ] CLUSTER [VERBOSE] </synopsis> </refsynopsisdiv> @@ -82,7 +82,7 @@ CLUSTER [VERBOSE] <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (possibly schema-qualified) of a table. @@ -91,7 +91,7 @@ CLUSTER [VERBOSE] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">index_name</replaceable></term> + <term><replaceable class="parameter">index_name</replaceable></term> <listitem> <para> The name of an index. @@ -210,7 +210,7 @@ CLUSTER; <para> The syntax <synopsis> -CLUSTER <replaceable class="PARAMETER">index_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> +CLUSTER <replaceable class="parameter">index_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> </synopsis> is also supported for compatibility with pre-8.3 <productname>PostgreSQL</> versions. diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index df328117f1d..059d6f41d81 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -23,48 +23,48 @@ PostgreSQL documentation <synopsis> COMMENT ON { - ACCESS METHOD <replaceable class="PARAMETER">object_name</replaceable> | - AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | + ACCESS METHOD <replaceable class="parameter">object_name</replaceable> | + AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) | - COLLATION <replaceable class="PARAMETER">object_name</replaceable> | - COLUMN <replaceable class="PARAMETER">relation_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> | - CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | - CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON DOMAIN <replaceable class="PARAMETER">domain_name</replaceable> | - CONVERSION <replaceable class="PARAMETER">object_name</replaceable> | - DATABASE <replaceable class="PARAMETER">object_name</replaceable> | - DOMAIN <replaceable class="PARAMETER">object_name</replaceable> | - EXTENSION <replaceable class="PARAMETER">object_name</replaceable> | - EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> | - FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> | - FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> | - FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | - INDEX <replaceable class="PARAMETER">object_name</replaceable> | - LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> | - MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> | - OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) | - OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | - OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | - POLICY <replaceable class="PARAMETER">policy_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | - [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> | - PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> | - ROLE <replaceable class="PARAMETER">object_name</replaceable> | - RULE <replaceable class="PARAMETER">rule_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | - SCHEMA <replaceable class="PARAMETER">object_name</replaceable> | - SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> | - SERVER <replaceable class="PARAMETER">object_name</replaceable> | - STATISTICS <replaceable class="PARAMETER">object_name</replaceable> | - SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> | - TABLE <replaceable class="PARAMETER">object_name</replaceable> | - TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> | - TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> | + COLLATION <replaceable class="parameter">object_name</replaceable> | + COLUMN <replaceable class="parameter">relation_name</replaceable>.<replaceable class="parameter">column_name</replaceable> | + CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> | + CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON DOMAIN <replaceable class="parameter">domain_name</replaceable> | + CONVERSION <replaceable class="parameter">object_name</replaceable> | + DATABASE <replaceable class="parameter">object_name</replaceable> | + DOMAIN <replaceable class="parameter">object_name</replaceable> | + EXTENSION <replaceable class="parameter">object_name</replaceable> | + EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> | + FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> | + FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> | + FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | + INDEX <replaceable class="parameter">object_name</replaceable> | + LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> | + MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> | + OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) | + OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | + OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> | + POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> | + [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> | + PUBLICATION <replaceable class="parameter">object_name</replaceable> | + ROLE <replaceable class="parameter">object_name</replaceable> | + RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> | + SCHEMA <replaceable class="parameter">object_name</replaceable> | + SEQUENCE <replaceable class="parameter">object_name</replaceable> | + SERVER <replaceable class="parameter">object_name</replaceable> | + STATISTICS <replaceable class="parameter">object_name</replaceable> | + SUBSCRIPTION <replaceable class="parameter">object_name</replaceable> | + TABLE <replaceable class="parameter">object_name</replaceable> | + TABLESPACE <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> | + TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> | TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> | - TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> | - TYPE <replaceable class="PARAMETER">object_name</replaceable> | - VIEW <replaceable class="PARAMETER">object_name</replaceable> -} IS '<replaceable class="PARAMETER">text</replaceable>' + TRIGGER <replaceable class="parameter">trigger_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> | + TYPE <replaceable class="parameter">object_name</replaceable> | + VIEW <replaceable class="parameter">object_name</replaceable> +} IS '<replaceable class="parameter">text</replaceable>' <phrase>where <replaceable>aggregate_signature</replaceable> is:</phrase> diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml index e1988ad318b..716aed3ac22 100644 --- a/doc/src/sgml/ref/commit_prepared.sgml +++ b/doc/src/sgml/ref/commit_prepared.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> +COMMIT PREPARED <replaceable class="parameter">transaction_id</replaceable> </synopsis> </refsynopsisdiv> @@ -39,7 +39,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">transaction_id</replaceable></term> + <term><replaceable class="parameter">transaction_id</replaceable></term> <listitem> <para> The transaction identifier of the transaction that is to be diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml index 6a8acfb4f9c..c96e4faba7b 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -22,59 +22,59 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ) ( - SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>, - STYPE = <replaceable class="PARAMETER">state_data_type</replaceable> - [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ] - [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ] + SFUNC = <replaceable class="parameter">sfunc</replaceable>, + STYPE = <replaceable class="parameter">state_data_type</replaceable> + [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ] + [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ] [ , FINALFUNC_EXTRA ] - [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ] - [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ] - [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ] - [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ] - [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ] - [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ] - [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ] - [ , MSSPACE = <replaceable class="PARAMETER">mstate_data_size</replaceable> ] - [ , MFINALFUNC = <replaceable class="PARAMETER">mffunc</replaceable> ] + [ , COMBINEFUNC = <replaceable class="parameter">combinefunc</replaceable> ] + [ , SERIALFUNC = <replaceable class="parameter">serialfunc</replaceable> ] + [ , DESERIALFUNC = <replaceable class="parameter">deserialfunc</replaceable> ] + [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ] + [ , MSFUNC = <replaceable class="parameter">msfunc</replaceable> ] + [ , MINVFUNC = <replaceable class="parameter">minvfunc</replaceable> ] + [ , MSTYPE = <replaceable class="parameter">mstate_data_type</replaceable> ] + [ , MSSPACE = <replaceable class="parameter">mstate_data_size</replaceable> ] + [ , MFINALFUNC = <replaceable class="parameter">mffunc</replaceable> ] [ , MFINALFUNC_EXTRA ] - [ , MINITCOND = <replaceable class="PARAMETER">minitial_condition</replaceable> ] - [ , SORTOP = <replaceable class="PARAMETER">sort_operator</replaceable> ] + [ , MINITCOND = <replaceable class="parameter">minitial_condition</replaceable> ] + [ , SORTOP = <replaceable class="parameter">sort_operator</replaceable> ] [ , PARALLEL = { SAFE | RESTRICTED | UNSAFE } ] ) CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ] ORDER BY [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ) ( - SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>, - STYPE = <replaceable class="PARAMETER">state_data_type</replaceable> - [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ] - [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ] + SFUNC = <replaceable class="parameter">sfunc</replaceable>, + STYPE = <replaceable class="parameter">state_data_type</replaceable> + [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ] + [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ] [ , FINALFUNC_EXTRA ] - [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ] + [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ] [ , PARALLEL = { SAFE | RESTRICTED | UNSAFE } ] [ , HYPOTHETICAL ] ) <phrase>or the old syntax</phrase> -CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( - BASETYPE = <replaceable class="PARAMETER">base_type</replaceable>, - SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>, - STYPE = <replaceable class="PARAMETER">state_data_type</replaceable> - [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ] - [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ] +CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( + BASETYPE = <replaceable class="parameter">base_type</replaceable>, + SFUNC = <replaceable class="parameter">sfunc</replaceable>, + STYPE = <replaceable class="parameter">state_data_type</replaceable> + [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ] + [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ] [ , FINALFUNC_EXTRA ] - [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ] - [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ] - [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ] - [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ] - [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ] - [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ] - [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ] - [ , MSSPACE = <replaceable class="PARAMETER">mstate_data_size</replaceable> ] - [ , MFINALFUNC = <replaceable class="PARAMETER">mffunc</replaceable> ] + [ , COMBINEFUNC = <replaceable class="parameter">combinefunc</replaceable> ] + [ , SERIALFUNC = <replaceable class="parameter">serialfunc</replaceable> ] + [ , DESERIALFUNC = <replaceable class="parameter">deserialfunc</replaceable> ] + [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ] + [ , MSFUNC = <replaceable class="parameter">msfunc</replaceable> ] + [ , MINVFUNC = <replaceable class="parameter">minvfunc</replaceable> ] + [ , MSTYPE = <replaceable class="parameter">mstate_data_type</replaceable> ] + [ , MSSPACE = <replaceable class="parameter">mstate_data_size</replaceable> ] + [ , MFINALFUNC = <replaceable class="parameter">mffunc</replaceable> ] [ , MFINALFUNC_EXTRA ] - [ , MINITCOND = <replaceable class="PARAMETER">minitial_condition</replaceable> ] - [ , SORTOP = <replaceable class="PARAMETER">sort_operator</replaceable> ] + [ , MINITCOND = <replaceable class="parameter">minitial_condition</replaceable> ] + [ , SORTOP = <replaceable class="parameter">sort_operator</replaceable> ] ) </synopsis> </refsynopsisdiv> @@ -112,19 +112,19 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( A simple aggregate function is made from one or two ordinary functions: a state transition function - <replaceable class="PARAMETER">sfunc</replaceable>, + <replaceable class="parameter">sfunc</replaceable>, and an optional final calculation function - <replaceable class="PARAMETER">ffunc</replaceable>. + <replaceable class="parameter">ffunc</replaceable>. These are used as follows: <programlisting> -<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state -<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) ---> aggregate-value +<replaceable class="parameter">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state +<replaceable class="parameter">ffunc</replaceable>( internal-state ) ---> aggregate-value </programlisting> </para> <para> <productname>PostgreSQL</productname> creates a temporary variable - of data type <replaceable class="PARAMETER">stype</replaceable> + of data type <replaceable class="parameter">stype</replaceable> to hold the current internal state of the aggregate. At each input row, the aggregate argument value(s) are calculated and the state transition function is invoked with the current state value @@ -155,9 +155,9 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( all-nonnull input values. This is handy for implementing aggregates like <function>max</function>. Note that this behavior is only available when - <replaceable class="PARAMETER">state_data_type</replaceable> + <replaceable class="parameter">state_data_type</replaceable> is the same as the first - <replaceable class="PARAMETER">arg_data_type</replaceable>. + <replaceable class="parameter">arg_data_type</replaceable>. When these types are different, you must supply a nonnull initial condition or use a nonstrict transition function. </para> @@ -224,7 +224,7 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( An aggregate can optionally support <firstterm>partial aggregation</>, as described in <xref linkend="xaggr-partial-aggregates">. This requires specifying the <literal>COMBINEFUNC</> parameter. - If the <replaceable class="PARAMETER">state_data_type</replaceable> + If the <replaceable class="parameter">state_data_type</replaceable> is <type>internal</>, it's usually also appropriate to provide the <literal>SERIALFUNC</> and <literal>DESERIALFUNC</> parameters so that parallel aggregation is possible. Note that the aggregate must also be @@ -268,7 +268,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the aggregate function @@ -302,7 +302,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">arg_data_type</replaceable></term> + <term><replaceable class="parameter">arg_data_type</replaceable></term> <listitem> <para> An input data type on which this aggregate function operates. @@ -314,7 +314,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">base_type</replaceable></term> + <term><replaceable class="parameter">base_type</replaceable></term> <listitem> <para> In the old syntax for <command>CREATE AGGREGATE</>, the input data type @@ -329,18 +329,18 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">sfunc</replaceable></term> + <term><replaceable class="parameter">sfunc</replaceable></term> <listitem> <para> The name of the state transition function to be called for each - input row. For a normal <replaceable class="PARAMETER">N</>-argument - aggregate function, the <replaceable class="PARAMETER">sfunc</> - must take <replaceable class="PARAMETER">N</>+1 arguments, + input row. For a normal <replaceable class="parameter">N</>-argument + aggregate function, the <replaceable class="parameter">sfunc</> + must take <replaceable class="parameter">N</>+1 arguments, the first being of type <replaceable - class="PARAMETER">state_data_type</replaceable> and the rest + class="parameter">state_data_type</replaceable> and the rest matching the declared input data type(s) of the aggregate. The function must return a value of type <replaceable - class="PARAMETER">state_data_type</replaceable>. This function + class="parameter">state_data_type</replaceable>. This function takes the current state value and the current input data value(s), and returns the next state value. </para> @@ -355,7 +355,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">state_data_type</replaceable></term> + <term><replaceable class="parameter">state_data_type</replaceable></term> <listitem> <para> The data type for the aggregate's state value. @@ -364,7 +364,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">state_data_size</replaceable></term> + <term><replaceable class="parameter">state_data_size</replaceable></term> <listitem> <para> The approximate average size (in bytes) of the aggregate's state value. @@ -380,19 +380,19 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">ffunc</replaceable></term> + <term><replaceable class="parameter">ffunc</replaceable></term> <listitem> <para> The name of the final function called to compute the aggregate's result after all input rows have been traversed. For a normal aggregate, this function must take a single argument of type <replaceable - class="PARAMETER">state_data_type</replaceable>. The return + class="parameter">state_data_type</replaceable>. The return data type of the aggregate is defined as the return type of this - function. If <replaceable class="PARAMETER">ffunc</replaceable> + function. If <replaceable class="parameter">ffunc</replaceable> is not specified, then the ending state value is used as the aggregate's result, and the return type is <replaceable - class="PARAMETER">state_data_type</replaceable>. + class="parameter">state_data_type</replaceable>. </para> <para> @@ -413,30 +413,30 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">combinefunc</replaceable></term> + <term><replaceable class="parameter">combinefunc</replaceable></term> <listitem> <para> - The <replaceable class="PARAMETER">combinefunc</replaceable> function + The <replaceable class="parameter">combinefunc</replaceable> function may optionally be specified to allow the aggregate function to support partial aggregation. If provided, - the <replaceable class="PARAMETER">combinefunc</replaceable> must - combine two <replaceable class="PARAMETER">state_data_type</replaceable> + the <replaceable class="parameter">combinefunc</replaceable> must + combine two <replaceable class="parameter">state_data_type</replaceable> values, each containing the result of aggregation over some subset of the input values, to produce a - new <replaceable class="PARAMETER">state_data_type</replaceable> that + new <replaceable class="parameter">state_data_type</replaceable> that represents the result of aggregating over both sets of inputs. This function can be thought of as - an <replaceable class="PARAMETER">sfunc</replaceable>, where instead of + an <replaceable class="parameter">sfunc</replaceable>, where instead of acting upon an individual input row and adding it to the running aggregate state, it adds another aggregate state to the running state. </para> <para> - The <replaceable class="PARAMETER">combinefunc</replaceable> must be + The <replaceable class="parameter">combinefunc</replaceable> must be declared as taking two arguments of - the <replaceable class="PARAMETER">state_data_type</replaceable> and + the <replaceable class="parameter">state_data_type</replaceable> and returning a value of - the <replaceable class="PARAMETER">state_data_type</replaceable>. + the <replaceable class="parameter">state_data_type</replaceable>. Optionally this function may be <quote>strict</quote>. In this case the function will not be called when either of the input states are null; the other state will be taken as the correct result. @@ -444,11 +444,11 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; <para> For aggregate functions - whose <replaceable class="PARAMETER">state_data_type</replaceable> + whose <replaceable class="parameter">state_data_type</replaceable> is <type>internal</type>, - the <replaceable class="PARAMETER">combinefunc</replaceable> must not + the <replaceable class="parameter">combinefunc</replaceable> must not be strict. In this case - the <replaceable class="PARAMETER">combinefunc</replaceable> must + the <replaceable class="parameter">combinefunc</replaceable> must ensure that null states are handled correctly and that the state being returned is properly stored in the aggregate memory context. </para> @@ -456,28 +456,28 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">serialfunc</replaceable></term> + <term><replaceable class="parameter">serialfunc</replaceable></term> <listitem> <para> An aggregate function - whose <replaceable class="PARAMETER">state_data_type</replaceable> + whose <replaceable class="parameter">state_data_type</replaceable> is <type>internal</> can participate in parallel aggregation only if it - has a <replaceable class="PARAMETER">serialfunc</replaceable> function, + has a <replaceable class="parameter">serialfunc</replaceable> function, which must serialize the aggregate state into a <type>bytea</> value for transmission to another process. This function must take a single argument of type <type>internal</> and return type <type>bytea</>. A - corresponding <replaceable class="PARAMETER">deserialfunc</replaceable> + corresponding <replaceable class="parameter">deserialfunc</replaceable> is also required. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">deserialfunc</replaceable></term> + <term><replaceable class="parameter">deserialfunc</replaceable></term> <listitem> <para> Deserialize a previously serialized aggregate state back into - <replaceable class="PARAMETER">state_data_type</replaceable>. This + <replaceable class="parameter">state_data_type</replaceable>. This function must take two arguments of types <type>bytea</> and <type>internal</>, and produce a result of type <type>internal</>. (Note: the second, <type>internal</> argument is unused, but is required @@ -487,19 +487,19 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">initial_condition</replaceable></term> + <term><replaceable class="parameter">initial_condition</replaceable></term> <listitem> <para> The initial setting for the state value. This must be a string constant in the form accepted for the data type <replaceable - class="PARAMETER">state_data_type</replaceable>. If not + class="parameter">state_data_type</replaceable>. If not specified, the state value starts out null. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">msfunc</replaceable></term> + <term><replaceable class="parameter">msfunc</replaceable></term> <listitem> <para> The name of the forward state transition function to be called for each @@ -512,7 +512,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">minvfunc</replaceable></term> + <term><replaceable class="parameter">minvfunc</replaceable></term> <listitem> <para> The name of the inverse state transition function to be used in @@ -526,7 +526,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">mstate_data_type</replaceable></term> + <term><replaceable class="parameter">mstate_data_type</replaceable></term> <listitem> <para> The data type for the aggregate's state value, when using @@ -536,7 +536,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">mstate_data_size</replaceable></term> + <term><replaceable class="parameter">mstate_data_size</replaceable></term> <listitem> <para> The approximate average size (in bytes) of the aggregate's state @@ -547,7 +547,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">mffunc</replaceable></term> + <term><replaceable class="parameter">mffunc</replaceable></term> <listitem> <para> The name of the final function called to compute the aggregate's @@ -564,7 +564,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">minitial_condition</replaceable></term> + <term><replaceable class="parameter">minitial_condition</replaceable></term> <listitem> <para> The initial setting for the state value, when using moving-aggregate @@ -574,7 +574,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1; </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">sort_operator</replaceable></term> + <term><replaceable class="parameter">sort_operator</replaceable></term> <listitem> <para> The associated sort operator for a <function>MIN</>- or diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index 48386a29f92..8e2a73402f4 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> +CREATE DATABASE <replaceable class="parameter">name</replaceable> [ [ WITH ] [ OWNER [=] <replaceable class="parameter">user_name</replaceable> ] [ TEMPLATE [=] <replaceable class="parameter">template</replaceable> ] [ ENCODING [=] <replaceable class="parameter">encoding</replaceable> ] diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml index 3423bf9a328..85ed57dd088 100644 --- a/doc/src/sgml/ref/create_domain.sgml +++ b/doc/src/sgml/ref/create_domain.sgml @@ -24,12 +24,12 @@ PostgreSQL documentation CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [ DEFAULT <replaceable>expression</replaceable> ] - [ <replaceable class="PARAMETER">constraint</replaceable> [ ... ] ] + [ <replaceable class="parameter">constraint</replaceable> [ ... ] ] -<phrase>where <replaceable class="PARAMETER">constraint</replaceable> is:</phrase> +<phrase>where <replaceable class="parameter">constraint</replaceable> is:</phrase> -[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] -{ NOT NULL | NULL | CHECK (<replaceable class="PARAMETER">expression</replaceable>) } +[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] +{ NOT NULL | NULL | CHECK (<replaceable class="parameter">expression</replaceable>) } </synopsis> </refsynopsisdiv> @@ -80,7 +80,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> The underlying data type of the domain. This can include array @@ -126,7 +126,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea </varlistentry> <varlistentry> - <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term> + <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term> <listitem> <para> An optional name for a constraint. If not specified, @@ -161,7 +161,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea </varlistentry> <varlistentry> - <term><literal>CHECK (<replaceable class="PARAMETER">expression</replaceable>)</literal></term> + <term><literal>CHECK (<replaceable class="parameter">expression</replaceable>)</literal></term> <listitem> <para><literal>CHECK</> clauses specify integrity constraints or tests which values of the domain must satisfy. diff --git a/doc/src/sgml/ref/create_event_trigger.sgml b/doc/src/sgml/ref/create_event_trigger.sgml index be18fc36e80..7decfbb983c 100644 --- a/doc/src/sgml/ref/create_event_trigger.sgml +++ b/doc/src/sgml/ref/create_event_trigger.sgml @@ -21,10 +21,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> - ON <replaceable class="PARAMETER">event</replaceable> - [ WHEN <replaceable class="PARAMETER">filter_variable</replaceable> IN (filter_value [, ... ]) [ AND ... ] ] - EXECUTE PROCEDURE <replaceable class="PARAMETER">function_name</replaceable>() +CREATE EVENT TRIGGER <replaceable class="parameter">name</replaceable> + ON <replaceable class="parameter">event</replaceable> + [ WHEN <replaceable class="parameter">filter_variable</replaceable> IN (filter_value [, ... ]) [ AND ... ] ] + EXECUTE PROCEDURE <replaceable class="parameter">function_name</replaceable>() </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml index a3811a3b636..1161e05d1c6 100644 --- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml @@ -24,7 +24,7 @@ PostgreSQL documentation CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> [ HANDLER <replaceable class="parameter">handler_function</replaceable> | NO HANDLER ] [ VALIDATOR <replaceable class="parameter">validator_function</replaceable> | NO VALIDATOR ] - [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] + [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] </synopsis> </refsynopsisdiv> @@ -100,7 +100,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> </varlistentry> <varlistentry> - <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term> + <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term> <listitem> <para> This clause specifies options for the new foreign-data wrapper. diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml index 065c982082d..f514b2d59f3 100644 --- a/doc/src/sgml/ref/create_foreign_table.sgml +++ b/doc/src/sgml/ref/create_foreign_table.sgml @@ -18,36 +18,36 @@ <refsynopsisdiv> <synopsis> -CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [ - { <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] +CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> ( [ + { <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] | <replaceable>table_constraint</replaceable> } [, ... ] ] ) [ INHERITS ( <replaceable>parent_table</replaceable> [, ... ] ) ] SERVER <replaceable class="parameter">server_name</replaceable> -[ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] +[ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] -CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> - PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> [ ( - { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] +CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> + PARTITION OF <replaceable class="parameter">parent_table</replaceable> [ ( + { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] | <replaceable>table_constraint</replaceable> } [, ... ] -) ] <replaceable class="PARAMETER">partition_bound_spec</replaceable> +) ] <replaceable class="parameter">partition_bound_spec</replaceable> SERVER <replaceable class="parameter">server_name</replaceable> -[ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] +[ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] -<phrase>where <replaceable class="PARAMETER">column_constraint</replaceable> is:</phrase> +<phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase> -[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] +[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] { NOT NULL | NULL | - CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] | + CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] | DEFAULT <replaceable>default_expr</replaceable> } -<phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase> -[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] -CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] +[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] +CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] </synopsis> </refsynopsisdiv> @@ -107,7 +107,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table to be created. @@ -116,7 +116,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a column to be created in the new table. @@ -125,7 +125,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> The data type of the column. This can include array @@ -161,7 +161,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term> + <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term> <listitem> <para> An optional name for a column or table constraint. If the @@ -199,7 +199,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><literal>CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </literal></term> + <term><literal>CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] </literal></term> <listitem> <para> The <literal>CHECK</> clause specifies an expression producing a @@ -247,7 +247,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">server_name</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The name of an existing foreign server to use for the foreign table. @@ -258,7 +258,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </varlistentry> <varlistentry> - <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ...] )</literal></term> + <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ...] )</literal></term> <listitem> <para> Options to be associated with the new foreign table or one of its diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml index 158617cb939..7896043a116 100644 --- a/doc/src/sgml/ref/create_group.sgml +++ b/doc/src/sgml/ref/create_group.sgml @@ -21,23 +21,23 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +CREATE GROUP <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB | CREATEROLE | NOCREATEROLE | INHERIT | NOINHERIT | LOGIN | NOLOGIN - | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' - | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | SYSID <replaceable class="PARAMETER">uid</replaceable> + | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' + | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>' + | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...] + | ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...] + | USER <replaceable class="parameter">role_name</replaceable> [, ...] + | SYSID <replaceable class="parameter">uid</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 83ee7d3f252..a462be790f6 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation <synopsis> CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class="parameter">name</replaceable> ] ON <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">method</replaceable> ] ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] ) - [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) ] + [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) ] [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] [ WHERE <replaceable class="parameter">predicate</replaceable> ] </synopsis> diff --git a/doc/src/sgml/ref/create_materialized_view.sgml b/doc/src/sgml/ref/create_materialized_view.sgml index a8fb84e7a73..577893fe929 100644 --- a/doc/src/sgml/ref/create_materialized_view.sgml +++ b/doc/src/sgml/ref/create_materialized_view.sgml @@ -23,8 +23,8 @@ PostgreSQL documentation <synopsis> CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable> [ (<replaceable>column_name</replaceable> [, ...] ) ] - [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ] - [ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] + [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ] + [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] AS <replaceable>query</replaceable> [ WITH [ NO ] DATA ] </synopsis> @@ -87,7 +87,7 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable> </varlistentry> <varlistentry> - <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term> + <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term> <listitem> <para> This clause specifies optional storage parameters for the new @@ -102,10 +102,10 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable> </varlistentry> <varlistentry> - <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term> + <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term> <listitem> <para> - The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name + The <replaceable class="parameter">tablespace_name</replaceable> is the name of the tablespace in which the new materialized view is to be created. If not specified, <xref linkend="guc-default-tablespace"> is consulted. </para> diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index 36772b678a8..41670c4b059 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +CREATE ROLE <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB @@ -32,15 +32,15 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac | LOGIN | NOLOGIN | REPLICATION | NOREPLICATION | BYPASSRLS | NOBYPASSRLS - | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> - | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' - | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | SYSID <replaceable class="PARAMETER">uid</replaceable> + | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable> + | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' + | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>' + | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...] + | ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...] + | USER <replaceable class="parameter">role_name</replaceable> [, ...] + | SYSID <replaceable class="parameter">uid</replaceable> </synopsis> </refsynopsisdiv> @@ -453,7 +453,7 @@ CREATE ROLE admin WITH CREATEDB CREATEROLE; The <command>CREATE ROLE</command> statement is in the SQL standard, but the standard only requires the syntax <synopsis> -CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable class="PARAMETER">role_name</> ] +CREATE ROLE <replaceable class="parameter">name</> [ WITH ADMIN <replaceable class="parameter">role_name</> ] </synopsis> Multiple initial administrators, and all the other options of <command>CREATE ROLE</command>, are diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml index 5d29cd768ab..ce145f96a0b 100644 --- a/doc/src/sgml/ref/create_schema.sgml +++ b/doc/src/sgml/ref/create_schema.sgml @@ -21,14 +21,14 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] -CREATE SCHEMA AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] -CREATE SCHEMA IF NOT EXISTS <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> ] -CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> +CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] +CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ] +CREATE SCHEMA IF NOT EXISTS <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> ] +CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> -<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase> - <replaceable class="PARAMETER">user_name</replaceable> + <replaceable class="parameter">user_name</replaceable> | CURRENT_USER | SESSION_USER </synopsis> diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml index 7318481487f..47b8a6291bb 100644 --- a/doc/src/sgml/ref/create_server.sgml +++ b/doc/src/sgml/ref/create_server.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation <synopsis> CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replaceable> [ TYPE '<replaceable class="parameter">server_type</replaceable>' ] [ VERSION '<replaceable class="parameter">server_version</replaceable>' ] FOREIGN DATA WRAPPER <replaceable class="parameter">fdw_name</replaceable> - [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] + [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] </synopsis> </refsynopsisdiv> @@ -105,7 +105,7 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac </varlistentry> <varlistentry> - <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term> + <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term> <listitem> <para> This clause specifies the options for the server. The options diff --git a/doc/src/sgml/ref/create_statistics.sgml b/doc/src/sgml/ref/create_statistics.sgml index ef4e4852bd2..0d68ca06b72 100644 --- a/doc/src/sgml/ref/create_statistics.sgml +++ b/doc/src/sgml/ref/create_statistics.sgml @@ -21,10 +21,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_name</replaceable> - [ ( <replaceable class="PARAMETER">statistics_kind</replaceable> [, ... ] ) ] - ON <replaceable class="PARAMETER">column_name</replaceable>, <replaceable class="PARAMETER">column_name</replaceable> [, ...] - FROM <replaceable class="PARAMETER">table_name</replaceable> +CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="parameter">statistics_name</replaceable> + [ ( <replaceable class="parameter">statistics_kind</replaceable> [, ... ] ) ] + ON <replaceable class="parameter">column_name</replaceable>, <replaceable class="parameter">column_name</replaceable> [, ...] + FROM <replaceable class="parameter">table_name</replaceable> </synopsis> </refsynopsisdiv> @@ -66,7 +66,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">statistics_name</replaceable></term> + <term><replaceable class="parameter">statistics_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the statistics object to be @@ -76,7 +76,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">statistics_kind</replaceable></term> + <term><replaceable class="parameter">statistics_kind</replaceable></term> <listitem> <para> A statistics kind to be computed in this statistics object. @@ -93,7 +93,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a table column to be covered by the computed statistics. @@ -103,7 +103,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table containing the diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml index de505ea8d37..bae9f839bd2 100644 --- a/doc/src/sgml/ref/create_subscription.sgml +++ b/doc/src/sgml/ref/create_subscription.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceable> - CONNECTION '<replaceable class="PARAMETER">conninfo</replaceable>' - PUBLICATION <replaceable class="PARAMETER">publication_name</replaceable> [, ...] +CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceable> + CONNECTION '<replaceable class="parameter">conninfo</replaceable>' + PUBLICATION <replaceable class="parameter">publication_name</replaceable> [, ...] [ WITH ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 14772888519..d15795857b1 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -21,81 +21,81 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [ - { <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] +CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> ( [ + { <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] | <replaceable>table_constraint</replaceable> | LIKE <replaceable>source_table</replaceable> [ <replaceable>like_option</replaceable> ... ] } [, ... ] ] ) [ INHERITS ( <replaceable>parent_table</replaceable> [, ... ] ) ] [ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ] -[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] +[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ] -[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] +[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] -CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> - OF <replaceable class="PARAMETER">type_name</replaceable> [ ( - { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] +CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> + OF <replaceable class="parameter">type_name</replaceable> [ ( + { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] | <replaceable>table_constraint</replaceable> } [, ... ] ) ] [ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ] -[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] +[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ] -[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] +[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] -CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> - PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> [ ( - { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ] +CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> + PARTITION OF <replaceable class="parameter">parent_table</replaceable> [ ( + { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ] | <replaceable>table_constraint</replaceable> } [, ... ] -) ] { FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable> | DEFAULT } +) ] { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT } [ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ] -[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] +[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ] -[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] +[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] -<phrase>where <replaceable class="PARAMETER">column_constraint</replaceable> is:</phrase> +<phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase> -[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] +[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] { NOT NULL | NULL | - CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] | + CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] | DEFAULT <replaceable>default_expr</replaceable> | GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ] | - UNIQUE <replaceable class="PARAMETER">index_parameters</replaceable> | - PRIMARY KEY <replaceable class="PARAMETER">index_parameters</replaceable> | - REFERENCES <replaceable class="PARAMETER">reftable</replaceable> [ ( <replaceable class="PARAMETER">refcolumn</replaceable> ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] + UNIQUE <replaceable class="parameter">index_parameters</replaceable> | + PRIMARY KEY <replaceable class="parameter">index_parameters</replaceable> | + REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] } [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] -<phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase> -[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ] -{ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] | - UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> | - PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> | +[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] +{ CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] | + UNIQUE ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> | + PRIMARY KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> | EXCLUDE [ USING <replaceable class="parameter">index_method</replaceable> ] ( <replaceable class="parameter">exclude_element</replaceable> WITH <replaceable class="parameter">operator</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> [ WHERE ( <replaceable class="parameter">predicate</replaceable> ) ] | - FOREIGN KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="PARAMETER">reftable</replaceable> [ ( <replaceable class="PARAMETER">refcolumn</replaceable> [, ... ] ) ] + FOREIGN KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> [, ... ] ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] } [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] -<phrase>and <replaceable class="PARAMETER">like_option</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">like_option</replaceable> is:</phrase> { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | IDENTITY | INDEXES | STORAGE | COMMENTS | ALL } -<phrase>and <replaceable class="PARAMETER">partition_bound_spec</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">partition_bound_spec</replaceable> is:</phrase> -IN ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | NULL } [, ...] ) | -FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) - TO ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) +IN ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | NULL } [, ...] ) | +FROM ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) + TO ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) -<phrase><replaceable class="PARAMETER">index_parameters</replaceable> in <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and <literal>EXCLUDE</literal> constraints are:</phrase> +<phrase><replaceable class="parameter">index_parameters</replaceable> in <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and <literal>EXCLUDE</literal> constraints are:</phrase> -[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ] -[ USING INDEX TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] +[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ] +[ USING INDEX TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] -<phrase><replaceable class="PARAMETER">exclude_element</replaceable> in an <literal>EXCLUDE</literal> constraint is:</phrase> +<phrase><replaceable class="parameter">exclude_element</replaceable> in an <literal>EXCLUDE</literal> constraint is:</phrase> { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] </synopsis> @@ -220,7 +220,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table to be created. @@ -229,7 +229,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>OF <replaceable class="PARAMETER">type_name</replaceable></literal></term> + <term><literal>OF <replaceable class="parameter">type_name</replaceable></literal></term> <listitem> <para> Creates a <firstterm>typed table</firstterm>, which takes its @@ -250,7 +250,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry id="SQL-CREATETABLE-PARTITION"> - <term><literal>PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> { FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable> | DEFAULT }</literal></term> + <term><literal>PARTITION OF <replaceable class="parameter">parent_table</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }</literal></term> <listitem> <para> Creates the table as a <firstterm>partition</firstterm> of the specified @@ -260,7 +260,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </para> <para> - The <replaceable class="PARAMETER">partition_bound_spec</replaceable> + The <replaceable class="parameter">partition_bound_spec</replaceable> must correspond to the partitioning method and partition key of the parent table, and must not overlap with any existing partition of that parent. The form with <literal>IN</> is used for list partitioning, @@ -270,7 +270,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace <para> Each of the values specified in - the <replaceable class="PARAMETER">partition_bound_spec</> is + the <replaceable class="parameter">partition_bound_spec</> is a literal, <literal>NULL</literal>, <literal>MINVALUE</literal>, or <literal>MAXVALUE</literal>. Each literal value must be either a numeric constant that is coercible to the corresponding partition key @@ -397,7 +397,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a column to be created in the new table. @@ -406,7 +406,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> The data type of the column. This can include array @@ -602,7 +602,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term> + <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term> <listitem> <para> An optional name for a column or table constraint. If the @@ -640,7 +640,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </literal></term> + <term><literal>CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] </literal></term> <listitem> <para> The <literal>CHECK</> clause specifies an expression producing a @@ -730,7 +730,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace <varlistentry> <term><literal>UNIQUE</> (column constraint)</term> - <term><literal>UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )</> (table constraint)</term> + <term><literal>UNIQUE ( <replaceable class="parameter">column_name</replaceable> [, ... ] )</> (table constraint)</term> <listitem> <para> @@ -757,7 +757,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace <varlistentry> <term><literal>PRIMARY KEY</> (column constraint)</term> - <term><literal>PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )</> (table constraint)</term> + <term><literal>PRIMARY KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] )</> (table constraint)</term> <listitem> <para> The <literal>PRIMARY KEY</> constraint specifies that a column or @@ -997,7 +997,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term> + <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term> <listitem> <para> This clause specifies optional storage parameters for a table or index; @@ -1092,10 +1092,10 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term> + <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term> <listitem> <para> - The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name + The <replaceable class="parameter">tablespace_name</replaceable> is the name of the tablespace in which the new table is to be created. If not specified, <xref linkend="guc-default-tablespace"> is consulted, or @@ -1105,7 +1105,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace </varlistentry> <varlistentry> - <term><literal>USING INDEX TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term> + <term><literal>USING INDEX TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term> <listitem> <para> This clause allows selection of the tablespace in which the index diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index 8e4ada794d4..0fa28a11fa7 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -23,9 +23,9 @@ PostgreSQL documentation <synopsis> CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable>table_name</replaceable> [ (<replaceable>column_name</replaceable> [, ...] ) ] - [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] + [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ] [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ] - [ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ] + [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ] AS <replaceable>query</replaceable> [ WITH [ NO ] DATA ] </synopsis> @@ -121,7 +121,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI </varlistentry> <varlistentry> - <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term> + <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term> <listitem> <para> This clause specifies optional storage parameters for the new table; @@ -195,10 +195,10 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI </varlistentry> <varlistentry> - <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term> + <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term> <listitem> <para> - The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name + The <replaceable class="parameter">tablespace_name</replaceable> is the name of the tablespace in which the new table is to be created. If not specified, <xref linkend="guc-default-tablespace"> is consulted, or diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml index cf08408f961..2fed29ffaf3 100644 --- a/doc/src/sgml/ref/create_tablespace.sgml +++ b/doc/src/sgml/ref/create_tablespace.sgml @@ -24,7 +24,7 @@ PostgreSQL documentation CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> [ OWNER { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } ] LOCATION '<replaceable class="parameter">directory</replaceable>' - [ WITH ( <replaceable class="PARAMETER">tablespace_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) ] + [ WITH ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index 2496250bed8..7fc481d9fcc 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -26,14 +26,14 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTER | INSTEAD OF } { <replaceable class="PARAMETER">event</replaceable> [ OR ... ] } - ON <replaceable class="PARAMETER">table_name</replaceable> +CREATE [ CONSTRAINT ] TRIGGER <replaceable class="parameter">name</replaceable> { BEFORE | AFTER | INSTEAD OF } { <replaceable class="parameter">event</replaceable> [ OR ... ] } + ON <replaceable class="parameter">table_name</replaceable> [ FROM <replaceable class="parameter">referenced_table_name</replaceable> ] [ NOT DEFERRABLE | [ DEFERRABLE ] [ INITIALLY IMMEDIATE | INITIALLY DEFERRED ] ] - [ REFERENCING { { OLD | NEW } TABLE [ AS ] <replaceable class="PARAMETER">transition_relation_name</replaceable> } [ ... ] ] + [ REFERENCING { { OLD | NEW } TABLE [ AS ] <replaceable class="parameter">transition_relation_name</replaceable> } [ ... ] ] [ FOR [ EACH ] { ROW | STATEMENT } ] [ WHEN ( <replaceable class="parameter">condition</replaceable> ) ] - EXECUTE PROCEDURE <replaceable class="PARAMETER">function_name</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> ) + EXECUTE PROCEDURE <replaceable class="parameter">function_name</replaceable> ( <replaceable class="parameter">arguments</replaceable> ) <phrase>where <replaceable class="parameter">event</replaceable> can be one of:</phrase> @@ -283,7 +283,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">referenced_table_name</replaceable></term> + <term><replaceable class="parameter">referenced_table_name</replaceable></term> <listitem> <para> The (possibly schema-qualified) name of another table referenced by the @@ -333,7 +333,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">transition_relation_name</replaceable></term> + <term><replaceable class="parameter">transition_relation_name</replaceable></term> <listitem> <para> The (unqualified) name to be used within the trigger for this diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 7146c4a27b7..312bd050bc3 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -22,7 +22,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> CREATE TYPE <replaceable class="parameter">name</replaceable> AS - ( [ <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [, ... ] ] ) + ( [ <replaceable class="parameter">attribute_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [, ... ] ] ) CREATE TYPE <replaceable class="parameter">name</replaceable> AS ENUM ( [ '<replaceable class="parameter">label</replaceable>' [, ... ] ] ) diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index 8a596eec9f2..480b6405e6b 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ] +CREATE USER <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase> SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB @@ -32,15 +32,15 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac | LOGIN | NOLOGIN | REPLICATION | NOREPLICATION | BYPASSRLS | NOBYPASSRLS - | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable> - | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>' - | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>' - | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...] - | SYSID <replaceable class="PARAMETER">uid</replaceable> + | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable> + | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' + | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>' + | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...] + | ROLE <replaceable class="parameter">role_name</replaceable> [, ...] + | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...] + | USER <replaceable class="parameter">role_name</replaceable> [, ...] + | SYSID <replaceable class="parameter">uid</replaceable> </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml index 1c44679a985..d6f29c94893 100644 --- a/doc/src/sgml/ref/create_user_mapping.sgml +++ b/doc/src/sgml/ref/create_user_mapping.sgml @@ -23,7 +23,7 @@ PostgreSQL documentation <synopsis> CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC } SERVER <replaceable class="parameter">server_name</replaceable> - [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [ , ... ] ) ] + [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [ , ... ] ) ] </synopsis> </refsynopsisdiv> @@ -86,7 +86,7 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na </varlistentry> <varlistentry> - <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term> + <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term> <listitem> <para> This clause specifies the options of the user mapping. The diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index 319335051b3..695c7593120 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] - [ WITH ( <replaceable class="PARAMETER">view_option_name</replaceable> [= <replaceable class="PARAMETER">view_option_value</replaceable>] [, ... ] ) ] - AS <replaceable class="PARAMETER">query</replaceable> +CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] + [ WITH ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] ) ] + AS <replaceable class="parameter">query</replaceable> [ WITH [ CASCADED | LOCAL ] CHECK OPTION ] </synopsis> </refsynopsisdiv> @@ -118,7 +118,7 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR </varlistentry> <varlistentry> - <term><literal>WITH ( <replaceable class="PARAMETER">view_option_name</replaceable> [= <replaceable class="PARAMETER">view_option_value</replaceable>] [, ... ] )</literal></term> + <term><literal>WITH ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] )</literal></term> <listitem> <para> This clause specifies optional parameters for a view; the following diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index 20417a13919..8ced7de7be6 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -22,9 +22,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ] -DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ] - [ USING <replaceable class="PARAMETER">using_list</replaceable> ] - [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ] +DELETE FROM [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ] + [ USING <replaceable class="parameter">using_list</replaceable> ] + [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ] [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ] </synopsis> </refsynopsisdiv> @@ -117,7 +117,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">using_list</replaceable></term> + <term><replaceable class="parameter">using_list</replaceable></term> <listitem> <para> A list of table expressions, allowing columns from other tables @@ -126,7 +126,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * linkend="sql-from" endterm="sql-from-title"> of a <command>SELECT</command> statement; for example, an alias for the table name can be specified. Do not repeat the target table - in the <replaceable class="PARAMETER">using_list</replaceable>, + in the <replaceable class="parameter">using_list</replaceable>, unless you wish to set up a self-join. </para> </listitem> @@ -144,7 +144,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cursor_name</replaceable></term> + <term><replaceable class="parameter">cursor_name</replaceable></term> <listitem> <para> The name of the cursor to use in a <literal>WHERE CURRENT OF</> @@ -161,12 +161,12 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_expression</replaceable></term> + <term><replaceable class="parameter">output_expression</replaceable></term> <listitem> <para> An expression to be computed and returned by the <command>DELETE</> command after each row is deleted. The expression can use any - column names of the table named by <replaceable class="PARAMETER">table_name</replaceable> + column names of the table named by <replaceable class="parameter">table_name</replaceable> or table(s) listed in <literal>USING</>. Write <literal>*</> to return all columns. </para> @@ -174,7 +174,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_name</replaceable></term> + <term><replaceable class="parameter">output_name</replaceable></term> <listitem> <para> A name to use for a returned column. diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml index ed5e588ee71..d4da32c34dc 100644 --- a/doc/src/sgml/ref/do.sgml +++ b/doc/src/sgml/ref/do.sgml @@ -25,7 +25,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replaceable class="PARAMETER">code</replaceable> +DO [ LANGUAGE <replaceable class="parameter">lang_name</replaceable> ] <replaceable class="parameter">code</replaceable> </synopsis> </refsynopsisdiv> @@ -54,7 +54,7 @@ DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replacea <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">code</replaceable></term> + <term><replaceable class="parameter">code</replaceable></term> <listitem> <para> The procedural language code to be executed. This must be specified @@ -65,7 +65,7 @@ DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">lang_name</replaceable></term> + <term><replaceable class="parameter">lang_name</replaceable></term> <listitem> <para> The name of the procedural language the code is written in. diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml index 740aa319951..44436ad48db 100644 --- a/doc/src/sgml/ref/drop_database.sgml +++ b/doc/src/sgml/ref/drop_database.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> +DROP DATABASE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> </synopsis> </refsynopsisdiv> @@ -57,7 +57,7 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the database to remove. diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml index e14795e6a30..ba546165c20 100644 --- a/doc/src/sgml/ref/drop_domain.sgml +++ b/doc/src/sgml/ref/drop_domain.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP DOMAIN [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -49,7 +49,7 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, . </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</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_event_trigger.sgml b/doc/src/sgml/ref/drop_event_trigger.sgml index 6e3ee22d7bb..583048dc0f4 100644 --- a/doc/src/sgml/ref/drop_event_trigger.sgml +++ b/doc/src/sgml/ref/drop_event_trigger.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the event trigger to remove. diff --git a/doc/src/sgml/ref/drop_extension.sgml b/doc/src/sgml/ref/drop_extension.sgml index 7438a08bb36..ba529220135 100644 --- a/doc/src/sgml/ref/drop_extension.sgml +++ b/doc/src/sgml/ref/drop_extension.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP EXTENSION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -54,7 +54,7 @@ DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an installed extension. diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml index 5a2b235d4e9..173eadadd36 100644 --- a/doc/src/sgml/ref/drop_foreign_table.sgml +++ b/doc/src/sgml/ref/drop_foreign_table.sgml @@ -18,7 +18,7 @@ <refsynopsisdiv> <synopsis> -DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -46,7 +46,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the foreign table to drop. diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml index e601ff4172c..5987c5f760b 100644 --- a/doc/src/sgml/ref/drop_group.sgml +++ b/doc/src/sgml/ref/drop_group.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] +DROP GROUP [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml index 6fe108ded25..4c838fffffb 100644 --- a/doc/src/sgml/ref/drop_index.sgml +++ b/doc/src/sgml/ref/drop_index.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -72,7 +72,7 @@ DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</r </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an index to remove. diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml index f014a74d454..081bd5fe3ec 100644 --- a/doc/src/sgml/ref/drop_language.sgml +++ b/doc/src/sgml/ref/drop_language.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -60,7 +60,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of an existing procedural language. For backward diff --git a/doc/src/sgml/ref/drop_materialized_view.sgml b/doc/src/sgml/ref/drop_materialized_view.sgml index 36ec33ceb08..a898a1fc0af 100644 --- a/doc/src/sgml/ref/drop_materialized_view.sgml +++ b/doc/src/sgml/ref/drop_materialized_view.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -50,7 +50,7 @@ DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the materialized view to diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml index 187a9a4d1f7..423a211bcab 100644 --- a/doc/src/sgml/ref/drop_opclass.sgml +++ b/doc/src/sgml/ref/drop_opclass.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ] +DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="parameter">name</replaceable> USING <replaceable class="parameter">index_method</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index fc82c3e0e3f..5897c99a620 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( { <replaceable class="PARAMETER">left_type</replaceable> | NONE } , { <replaceable class="PARAMETER">right_type</replaceable> | NONE } ) [, ...] [ CASCADE | RESTRICT ] +DROP OPERATOR [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ( { <replaceable class="parameter">left_type</replaceable> | NONE } , { <replaceable class="parameter">right_type</replaceable> | NONE } ) [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_opfamily.sgml b/doc/src/sgml/ref/drop_opfamily.sgml index 53bce228837..a7b90f306c7 100644 --- a/doc/src/sgml/ref/drop_opfamily.sgml +++ b/doc/src/sgml/ref/drop_opfamily.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ] +DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="parameter">name</replaceable> USING <replaceable class="parameter">index_method</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml index 81694b88e53..0426373d2de 100644 --- a/doc/src/sgml/ref/drop_owned.sgml +++ b/doc/src/sgml/ref/drop_owned.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ] +DROP OWNED BY { <replaceable class="parameter">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -42,7 +42,7 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of a role whose objects will be dropped, and whose diff --git a/doc/src/sgml/ref/drop_publication.sgml b/doc/src/sgml/ref/drop_publication.sgml index 8e45a439820..bf43db3dac3 100644 --- a/doc/src/sgml/ref/drop_publication.sgml +++ b/doc/src/sgml/ref/drop_publication.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP PUBLICATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP PUBLICATION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml index 75b48f94f9a..fcddfeb172c 100644 --- a/doc/src/sgml/ref/drop_role.sgml +++ b/doc/src/sgml/ref/drop_role.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] +DROP ROLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] </synopsis> </refsynopsisdiv> @@ -68,7 +68,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the role to remove. diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml index d4905a69c9d..d3fdf55080c 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ] +DROP RULE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml index 5b1697fff20..fd1fcd7e037 100644 --- a/doc/src/sgml/ref/drop_schema.sgml +++ b/doc/src/sgml/ref/drop_schema.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP SCHEMA [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -54,7 +54,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, . </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of a schema. diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml index f0e1edc81c5..9d827f0cb17 100644 --- a/doc/src/sgml/ref/drop_sequence.sgml +++ b/doc/src/sgml/ref/drop_sequence.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -49,7 +49,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a sequence. diff --git a/doc/src/sgml/ref/drop_statistics.sgml b/doc/src/sgml/ref/drop_statistics.sgml index 37fc4025891..fd2087db6a7 100644 --- a/doc/src/sgml/ref/drop_statistics.sgml +++ b/doc/src/sgml/ref/drop_statistics.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP STATISTICS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] +DROP STATISTICS [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ DROP STATISTICS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the statistics object to drop. diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml index 94d28b06fbc..ae96cf06575 100644 --- a/doc/src/sgml/ref/drop_table.sgml +++ b/doc/src/sgml/ref/drop_table.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -62,7 +62,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .. </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table to drop. diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml index d0a05af2e14..ee40cc6b0c3 100644 --- a/doc/src/sgml/ref/drop_tablespace.sgml +++ b/doc/src/sgml/ref/drop_tablespace.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> +DROP TABLESPACE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> </synopsis> </refsynopsisdiv> @@ -60,7 +60,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of a tablespace. diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml index d400b8383f4..d44bf138a67 100644 --- a/doc/src/sgml/ref/drop_trigger.sgml +++ b/doc/src/sgml/ref/drop_trigger.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ] +DROP TRIGGER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the trigger to remove. @@ -60,7 +60,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table for which diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml index 0096e0092d3..e4a1738baeb 100644 --- a/doc/src/sgml/ref/drop_tsconfig.sgml +++ b/doc/src/sgml/ref/drop_tsconfig.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml index 803abf8cba9..faa4b3a1e5d 100644 --- a/doc/src/sgml/ref/drop_tsdictionary.sgml +++ b/doc/src/sgml/ref/drop_tsdictionary.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml index fa997201610..bc9dae17a5e 100644 --- a/doc/src/sgml/ref/drop_tsparser.sgml +++ b/doc/src/sgml/ref/drop_tsparser.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml index 9d051eb6197..98f5523e513 100644 --- a/doc/src/sgml/ref/drop_tstemplate.sgml +++ b/doc/src/sgml/ref/drop_tstemplate.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ] +DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml index 2c7b8fe9f6b..4ec1b92f329 100644 --- a/doc/src/sgml/ref/drop_type.sgml +++ b/doc/src/sgml/ref/drop_type.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP TYPE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -49,7 +49,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</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/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml index 38e5418d078..3cb90522daa 100644 --- a/doc/src/sgml/ref/drop_user.sgml +++ b/doc/src/sgml/ref/drop_user.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] +DROP USER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml index 40f23561884..002d2c6dd65 100644 --- a/doc/src/sgml/ref/drop_view.sgml +++ b/doc/src/sgml/ref/drop_view.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] +DROP VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -49,7 +49,7 @@ DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the view to remove. diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml index 76069c019ea..6ab5e54fa7e 100644 --- a/doc/src/sgml/ref/execute.sgml +++ b/doc/src/sgml/ref/execute.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">parameter</replaceable> [, ...] ) ] +EXECUTE <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">parameter</replaceable> [, ...] ) ] </synopsis> </refsynopsisdiv> @@ -61,7 +61,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the prepared statement to execute. @@ -70,7 +70,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">parameter</replaceable></term> + <term><replaceable class="parameter">parameter</replaceable></term> <listitem> <para> The actual value of a parameter to the prepared statement. This diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index 24c8c491569..7651dcd0f82 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -27,23 +27,23 @@ PostgreSQL documentation <refsynopsisdiv> <!-- Note the "direction" bit is also in ref/move.sgml --> <synopsis> -FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <replaceable class="PARAMETER">cursor_name</replaceable> +FETCH [ <replaceable class="parameter">direction</replaceable> [ FROM | IN ] ] <replaceable class="parameter">cursor_name</replaceable> -<phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase> +<phrase>where <replaceable class="parameter">direction</replaceable> can be empty or one of:</phrase> NEXT PRIOR FIRST LAST - ABSOLUTE <replaceable class="PARAMETER">count</replaceable> - RELATIVE <replaceable class="PARAMETER">count</replaceable> - <replaceable class="PARAMETER">count</replaceable> + ABSOLUTE <replaceable class="parameter">count</replaceable> + RELATIVE <replaceable class="parameter">count</replaceable> + <replaceable class="parameter">count</replaceable> ALL FORWARD - FORWARD <replaceable class="PARAMETER">count</replaceable> + FORWARD <replaceable class="parameter">count</replaceable> FORWARD ALL BACKWARD - BACKWARD <replaceable class="PARAMETER">count</replaceable> + BACKWARD <replaceable class="parameter">count</replaceable> BACKWARD ALL </synopsis> </refsynopsisdiv> @@ -82,7 +82,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < retrieve the indicated number of rows moving in the forward or backward direction, leaving the cursor positioned on the last-returned row (or after/before all rows, if the <replaceable - class="PARAMETER">count</replaceable> exceeds the number of rows + class="parameter">count</replaceable> exceeds the number of rows available). </para> @@ -109,9 +109,9 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">direction</replaceable></term> + <term><replaceable class="parameter">direction</replaceable></term> <listitem> - <para><replaceable class="PARAMETER">direction</replaceable> defines + <para><replaceable class="parameter">direction</replaceable> defines the fetch direction and number of rows to fetch. It can be one of the following: @@ -121,7 +121,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < <listitem> <para> Fetch the next row. This is the default if <replaceable - class="PARAMETER">direction</replaceable> is omitted. + class="parameter">direction</replaceable> is omitted. </para> </listitem> </varlistentry> @@ -154,17 +154,17 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><literal>ABSOLUTE <replaceable class="PARAMETER">count</replaceable></literal></term> + <term><literal>ABSOLUTE <replaceable class="parameter">count</replaceable></literal></term> <listitem> <para> Fetch the <replaceable - class="PARAMETER">count</replaceable>'th row of the query, + class="parameter">count</replaceable>'th row of the query, or the <literal>abs(<replaceable - class="PARAMETER">count</replaceable>)</literal>'th row from + class="parameter">count</replaceable>)</literal>'th row from the end if <replaceable - class="PARAMETER">count</replaceable> is negative. Position + class="parameter">count</replaceable> is negative. Position before first row or after last row if <replaceable - class="PARAMETER">count</replaceable> is out of range; in + class="parameter">count</replaceable> is out of range; in particular, <literal>ABSOLUTE 0</literal> positions before the first row. </para> @@ -172,14 +172,14 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><literal>RELATIVE <replaceable class="PARAMETER">count</replaceable></literal></term> + <term><literal>RELATIVE <replaceable class="parameter">count</replaceable></literal></term> <listitem> <para> Fetch the <replaceable - class="PARAMETER">count</replaceable>'th succeeding row, or + class="parameter">count</replaceable>'th succeeding row, or the <literal>abs(<replaceable - class="PARAMETER">count</replaceable>)</literal>'th prior - row if <replaceable class="PARAMETER">count</replaceable> is + class="parameter">count</replaceable>)</literal>'th prior + row if <replaceable class="parameter">count</replaceable> is negative. <literal>RELATIVE 0</literal> re-fetches the current row, if any. </para> @@ -187,13 +187,13 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">count</replaceable></term> + <term><replaceable class="parameter">count</replaceable></term> <listitem> <para> Fetch the next <replaceable - class="PARAMETER">count</replaceable> rows (same as + class="parameter">count</replaceable> rows (same as <literal>FORWARD <replaceable - class="PARAMETER">count</replaceable></literal>). + class="parameter">count</replaceable></literal>). </para> </listitem> </varlistentry> @@ -217,11 +217,11 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><literal>FORWARD <replaceable class="PARAMETER">count</replaceable></literal></term> + <term><literal>FORWARD <replaceable class="parameter">count</replaceable></literal></term> <listitem> <para> Fetch the next <replaceable - class="PARAMETER">count</replaceable> rows. + class="parameter">count</replaceable> rows. <literal>FORWARD 0</literal> re-fetches the current row. </para> </listitem> @@ -246,11 +246,11 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><literal>BACKWARD <replaceable class="PARAMETER">count</replaceable></literal></term> + <term><literal>BACKWARD <replaceable class="parameter">count</replaceable></literal></term> <listitem> <para> Fetch the prior <replaceable - class="PARAMETER">count</replaceable> rows (scanning + class="parameter">count</replaceable> rows (scanning backwards). <literal>BACKWARD 0</literal> re-fetches the current row. </para> @@ -270,20 +270,20 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">count</replaceable></term> + <term><replaceable class="parameter">count</replaceable></term> <listitem> - <para><replaceable class="PARAMETER">count</replaceable> is a + <para><replaceable class="parameter">count</replaceable> is a possibly-signed integer constant, determining the location or number of rows to fetch. For <literal>FORWARD</> and <literal>BACKWARD</> cases, specifying a negative <replaceable - class="PARAMETER">count</replaceable> is equivalent to changing + class="parameter">count</replaceable> is equivalent to changing the sense of <literal>FORWARD</> and <literal>BACKWARD</>. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cursor_name</replaceable></term> + <term><replaceable class="parameter">cursor_name</replaceable></term> <listitem> <para> An open cursor's name. @@ -394,7 +394,7 @@ COMMIT WORK; The <command>FETCH</command> forms involving <literal>FORWARD</literal> and <literal>BACKWARD</literal>, as well as the forms <literal>FETCH <replaceable - class="PARAMETER">count</replaceable></literal> and <literal>FETCH + class="parameter">count</replaceable></literal> and <literal>FETCH ALL</literal>, in which <literal>FORWARD</literal> is implicit, are <productname>PostgreSQL</productname> extensions. </para> diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index c63252ca247..8f385f6bb75 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -23,70 +23,70 @@ PostgreSQL documentation <synopsis> GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [, ...] | ALL [ PRIVILEGES ] } - ON { [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] - | ALL TABLES IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] } - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + ON { [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...] + | ALL TABLES IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] } + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] -GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) - [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) } - ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] +GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="parameter">column_name</replaceable> [, ...] ) + [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="parameter">column_name</replaceable> [, ...] ) } + ON [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { { USAGE | SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } - ON { SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...] - | ALL SEQUENCES IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] } - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + ON { SEQUENCE <replaceable class="parameter">sequence_name</replaceable> [, ...] + | ALL SEQUENCES IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] } + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [, ...] | ALL [ PRIVILEGES ] } ON DATABASE <replaceable>database_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON DOMAIN <replaceable>domain_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { EXECUTE | ALL [ PRIVILEGES ] } ON { FUNCTION <replaceable>function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...] - | ALL FUNCTIONS IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] } - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + | ALL FUNCTIONS IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] } + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON LANGUAGE <replaceable>lang_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { { SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } - ON LARGE OBJECT <replaceable class="PARAMETER">loid</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + ON LARGE OBJECT <replaceable class="parameter">loid</replaceable> [, ...] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { { CREATE | USAGE } [, ...] | ALL [ PRIVILEGES ] } ON SCHEMA <replaceable>schema_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { CREATE | ALL [ PRIVILEGES ] } ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } ON TYPE <replaceable>type_name</replaceable> [, ...] - TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] + TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ] -<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase> +<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase> - [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> + [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER -GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replaceable class="PARAMETER">role_name</replaceable> [, ...] [ WITH ADMIN OPTION ] +GRANT <replaceable class="parameter">role_name</replaceable> [, ...] TO <replaceable class="parameter">role_name</replaceable> [, ...] [ WITH ADMIN OPTION ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/import_foreign_schema.sgml b/doc/src/sgml/ref/import_foreign_schema.sgml index b73dee9439a..f22893f1373 100644 --- a/doc/src/sgml/ref/import_foreign_schema.sgml +++ b/doc/src/sgml/ref/import_foreign_schema.sgml @@ -21,11 +21,11 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> - [ { LIMIT TO | EXCEPT } ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] ) ] - FROM SERVER <replaceable class="PARAMETER">server_name</replaceable> - INTO <replaceable class="PARAMETER">local_schema</replaceable> - [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] +IMPORT FOREIGN SCHEMA <replaceable class="parameter">remote_schema</replaceable> + [ { LIMIT TO | EXCEPT } ( <replaceable class="parameter">table_name</replaceable> [, ...] ) ] + FROM SERVER <replaceable class="parameter">server_name</replaceable> + INTO <replaceable class="parameter">local_schema</replaceable> + [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] </synopsis> </refsynopsisdiv> @@ -59,7 +59,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">remote_schema</replaceable></term> + <term><replaceable class="parameter">remote_schema</replaceable></term> <listitem> <para> The remote schema to import from. The specific meaning of a remote schema @@ -69,7 +69,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> </varlistentry> <varlistentry> - <term><literal>LIMIT TO ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] )</literal></term> + <term><literal>LIMIT TO ( <replaceable class="parameter">table_name</replaceable> [, ...] )</literal></term> <listitem> <para> Import only foreign tables matching one of the given table names. @@ -79,7 +79,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> </varlistentry> <varlistentry> - <term><literal>EXCEPT ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] )</literal></term> + <term><literal>EXCEPT ( <replaceable class="parameter">table_name</replaceable> [, ...] )</literal></term> <listitem> <para> Exclude specified foreign tables from the import. All tables @@ -90,7 +90,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">server_name</replaceable></term> + <term><replaceable class="parameter">server_name</replaceable></term> <listitem> <para> The foreign server to import from. @@ -99,7 +99,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">local_schema</replaceable></term> + <term><replaceable class="parameter">local_schema</replaceable></term> <listitem> <para> The schema in which the imported foreign tables will be created. @@ -108,7 +108,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable> </varlistentry> <varlistentry> - <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ...] )</literal></term> + <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ...] )</literal></term> <listitem> <para> Options to be used during the import. diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index cc9b94617e9..ce037e59027 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -22,25 +22,25 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ] -INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replaceable class="parameter">alias</replaceable> ] [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] +INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replaceable class="parameter">alias</replaceable> ] [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] [ OVERRIDING { SYSTEM | USER} VALUE ] - { DEFAULT VALUES | VALUES ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) [, ...] | <replaceable class="PARAMETER">query</replaceable> } + { DEFAULT VALUES | VALUES ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) [, ...] | <replaceable class="parameter">query</replaceable> } [ ON CONFLICT [ <replaceable class="parameter">conflict_target</replaceable> ] <replaceable class="parameter">conflict_action</replaceable> ] [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ] <phrase>where <replaceable class="parameter">conflict_target</replaceable> can be one of:</phrase> - ( { <replaceable class="parameter">index_column_name</replaceable> | ( <replaceable class="parameter">index_expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="PARAMETER">index_predicate</replaceable> ] - ON CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> + ( { <replaceable class="parameter">index_column_name</replaceable> | ( <replaceable class="parameter">index_expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="parameter">index_predicate</replaceable> ] + ON CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> <phrase>and <replaceable class="parameter">conflict_action</replaceable> is one of:</phrase> DO NOTHING - DO UPDATE SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } | - ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) | - ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> ) + DO UPDATE SET { <replaceable class="parameter">column_name</replaceable> = { <replaceable class="parameter">expression</replaceable> | DEFAULT } | + ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) | + ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> ) } [, ...] - [ WHERE <replaceable class="PARAMETER">condition</replaceable> ] + [ WHERE <replaceable class="parameter">condition</replaceable> ] </synopsis> </refsynopsisdiv> @@ -93,7 +93,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac inserted or updated will be returned. For example, if a row was locked but not updated because an <literal>ON CONFLICT DO UPDATE ... WHERE</literal> clause <replaceable - class="PARAMETER">condition</replaceable> was not satisfied, the + class="parameter">condition</replaceable> was not satisfied, the row will not be returned. </para> @@ -119,7 +119,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac Use of the <literal>RETURNING</> clause requires <literal>SELECT</> privilege on all columns mentioned in <literal>RETURNING</>. If you use the <replaceable - class="PARAMETER">query</replaceable> clause to insert rows from a + class="parameter">query</replaceable> clause to insert rows from a query, you of course need to have <literal>SELECT</literal> privilege on any table or column used in the query. </para> @@ -160,7 +160,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an existing table. @@ -173,7 +173,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <listitem> <para> A substitute name for <replaceable - class="PARAMETER">table_name</replaceable>. When an alias is + class="parameter">table_name</replaceable>. When an alias is provided, it completely hides the actual name of the table. This is particularly useful when <literal>ON CONFLICT DO UPDATE</> targets a table named <varname>excluded</>, since that will otherwise @@ -185,11 +185,11 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a column in the table named by <replaceable - class="PARAMETER">table_name</replaceable>. The column name + class="parameter">table_name</replaceable>. The column name can be qualified with a subfield name or array subscript, if needed. (Inserting into only some fields of a composite column leaves the other fields null.) When referencing a @@ -246,7 +246,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">expression</replaceable></term> + <term><replaceable class="parameter">expression</replaceable></term> <listitem> <para> An expression or value to assign to the corresponding column. @@ -265,7 +265,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">query</replaceable></term> + <term><replaceable class="parameter">query</replaceable></term> <listitem> <para> A query (<command>SELECT</command> statement) that supplies the @@ -277,14 +277,14 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_expression</replaceable></term> + <term><replaceable class="parameter">output_expression</replaceable></term> <listitem> <para> An expression to be computed and returned by the <command>INSERT</> command after each row is inserted or updated. The expression can use any column names of the table named by <replaceable - class="PARAMETER">table_name</replaceable>. Write + class="parameter">table_name</replaceable>. Write <literal>*</> to return all columns of the inserted or updated row(s). </para> @@ -292,7 +292,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_name</replaceable></term> + <term><replaceable class="parameter">output_name</replaceable></term> <listitem> <para> A name to use for a returned column. @@ -328,14 +328,14 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <parameter>conflict_target</parameter> can perform <emphasis>unique index inference</emphasis>. When performing inference, it consists of one or more <replaceable - class="PARAMETER">index_column_name</replaceable> columns and/or - <replaceable class="PARAMETER">index_expression</replaceable> - expressions, and an optional <replaceable class="PARAMETER">index_predicate</replaceable>. All <replaceable - class="PARAMETER">table_name</replaceable> unique indexes that, + class="parameter">index_column_name</replaceable> columns and/or + <replaceable class="parameter">index_expression</replaceable> + expressions, and an optional <replaceable class="parameter">index_predicate</replaceable>. All <replaceable + class="parameter">table_name</replaceable> unique indexes that, without regard to order, contain exactly the <parameter>conflict_target</parameter>-specified columns/expressions are inferred (chosen) as arbiter indexes. If - an <replaceable class="PARAMETER">index_predicate</replaceable> is + an <replaceable class="parameter">index_predicate</replaceable> is specified, it must, as a further requirement for inference, satisfy arbiter indexes. Note that this means a non-partial unique index (a unique index without a predicate) will be inferred @@ -400,42 +400,42 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">index_column_name</replaceable></term> + <term><replaceable class="parameter">index_column_name</replaceable></term> <listitem> <para> The name of a <replaceable - class="PARAMETER">table_name</replaceable> column. Used to + class="parameter">table_name</replaceable> column. Used to infer arbiter indexes. Follows <command>CREATE INDEX</command> format. <literal>SELECT</> privilege on - <replaceable class="PARAMETER">index_column_name</replaceable> + <replaceable class="parameter">index_column_name</replaceable> is required. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">index_expression</replaceable></term> + <term><replaceable class="parameter">index_expression</replaceable></term> <listitem> <para> Similar to <replaceable - class="PARAMETER">index_column_name</replaceable>, but used to + class="parameter">index_column_name</replaceable>, but used to infer expressions on <replaceable - class="PARAMETER">table_name</replaceable> columns appearing + class="parameter">table_name</replaceable> columns appearing within index definitions (not simple columns). Follows <command>CREATE INDEX</command> format. <literal>SELECT</> privilege on any column appearing within <replaceable - class="PARAMETER">index_expression</replaceable> is required. + class="parameter">index_expression</replaceable> is required. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">collation</replaceable></term> + <term><replaceable class="parameter">collation</replaceable></term> <listitem> <para> When specified, mandates that corresponding <replaceable - class="PARAMETER">index_column_name</replaceable> or - <replaceable class="PARAMETER">index_expression</replaceable> + class="parameter">index_column_name</replaceable> or + <replaceable class="parameter">index_expression</replaceable> use a particular collation in order to be matched during inference. Typically this is omitted, as collations usually do not affect whether or not a constraint violation occurs. @@ -445,12 +445,12 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">opclass</replaceable></term> + <term><replaceable class="parameter">opclass</replaceable></term> <listitem> <para> When specified, mandates that corresponding <replaceable - class="PARAMETER">index_column_name</replaceable> or - <replaceable class="PARAMETER">index_expression</replaceable> + class="parameter">index_column_name</replaceable> or + <replaceable class="parameter">index_expression</replaceable> use particular operator class in order to be matched during inference. Typically this is omitted, as the <emphasis>equality</emphasis> semantics are often equivalent @@ -463,7 +463,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">index_predicate</replaceable></term> + <term><replaceable class="parameter">index_predicate</replaceable></term> <listitem> <para> Used to allow inference of partial unique indexes. Any @@ -471,13 +471,13 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac partial indexes) can be inferred. Follows <command>CREATE INDEX</command> format. <literal>SELECT</> privilege on any column appearing within <replaceable - class="PARAMETER">index_predicate</replaceable> is required. + class="parameter">index_predicate</replaceable> is required. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">constraint_name</replaceable></term> + <term><replaceable class="parameter">constraint_name</replaceable></term> <listitem> <para> Explicitly specifies an arbiter @@ -488,7 +488,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">condition</replaceable></term> + <term><replaceable class="parameter">condition</replaceable></term> <listitem> <para> An expression that returns a value of type @@ -522,7 +522,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <para> It is often preferable to use unique index inference rather than naming a constraint directly using <literal>ON CONFLICT ON - CONSTRAINT</literal> <replaceable class="PARAMETER"> + CONSTRAINT</literal> <replaceable class="parameter"> constraint_name</replaceable>. Inference will continue to work correctly when the underlying index is replaced by another more or less equivalent index in an overlapping way, for example when @@ -753,7 +753,7 @@ INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International') <para> Possible limitations of the <replaceable - class="PARAMETER">query</replaceable> clause are documented under + class="parameter">query</replaceable> clause are documented under <xref linkend="sql-select">. </para> </refsect1> diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml index 9cd53b02bb2..76215716d61 100644 --- a/doc/src/sgml/ref/listen.sgml +++ b/doc/src/sgml/ref/listen.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -LISTEN <replaceable class="PARAMETER">channel</replaceable> +LISTEN <replaceable class="parameter">channel</replaceable> </synopsis> </refsynopsisdiv> @@ -31,14 +31,14 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable> <para> <command>LISTEN</command> registers the current session as a listener on the notification channel named <replaceable - class="PARAMETER">channel</replaceable>. + class="parameter">channel</replaceable>. If the current session is already registered as a listener for this notification channel, nothing is done. </para> <para> Whenever the command <command>NOTIFY <replaceable - class="PARAMETER">channel</replaceable></command> is invoked, either + class="parameter">channel</replaceable></command> is invoked, either by this session or another one connected to the same database, all the sessions currently listening on that notification channel are notified, and each will in turn notify its connected client @@ -77,7 +77,7 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">channel</replaceable></term> + <term><replaceable class="parameter">channel</replaceable></term> <listitem> <para> Name of a notification channel (any identifier). diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml index 6e9182fa3b3..2be28e6d15a 100644 --- a/doc/src/sgml/ref/load.sgml +++ b/doc/src/sgml/ref/load.sgml @@ -20,7 +20,7 @@ doc/src/sgml/ref/load.sgml <refsynopsisdiv> <synopsis> -LOAD '<replaceable class="PARAMETER">filename</replaceable>' +LOAD '<replaceable class="parameter">filename</replaceable>' </synopsis> </refsynopsisdiv> @@ -53,7 +53,7 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>' <para> Non-superusers can only apply <command>LOAD</> to library files located in <filename>$libdir/plugins/</> — the specified - <replaceable class="PARAMETER">filename</replaceable> must begin + <replaceable class="parameter">filename</replaceable> must begin with exactly that string. (It is the database administrator's responsibility to ensure that only <quote>safe</> libraries are installed there.) diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index b946eab3039..f1dbb8e65a8 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -21,9 +21,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ...] [ IN <replaceable class="PARAMETER">lockmode</replaceable> MODE ] [ NOWAIT ] +LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] [, ...] [ IN <replaceable class="parameter">lockmode</replaceable> MODE ] [ NOWAIT ] -<phrase>where <replaceable class="PARAMETER">lockmode</replaceable> is one of:</phrase> +<phrase>where <replaceable class="parameter">lockmode</replaceable> is one of:</phrase> ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE @@ -59,7 +59,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] committed data, because <literal>SHARE</> lock mode conflicts with the <literal>ROW EXCLUSIVE</> lock acquired by writers, and your <command>LOCK TABLE <replaceable - class="PARAMETER">name</replaceable> IN SHARE MODE</command> + class="parameter">name</replaceable> IN SHARE MODE</command> statement will wait until any concurrent holders of <literal>ROW EXCLUSIVE</literal> mode locks commit or roll back. Thus, once you obtain the lock, there are no uncommitted writes outstanding; @@ -107,7 +107,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of an existing table to diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml index ed64f230689..6b809b961d6 100644 --- a/doc/src/sgml/ref/move.sgml +++ b/doc/src/sgml/ref/move.sgml @@ -27,23 +27,23 @@ PostgreSQL documentation <refsynopsisdiv> <!-- Note the "direction" bit is also in ref/fetch.sgml --> <synopsis> -MOVE [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <replaceable class="PARAMETER">cursor_name</replaceable> +MOVE [ <replaceable class="parameter">direction</replaceable> [ FROM | IN ] ] <replaceable class="parameter">cursor_name</replaceable> -<phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase> +<phrase>where <replaceable class="parameter">direction</replaceable> can be empty or one of:</phrase> NEXT PRIOR FIRST LAST - ABSOLUTE <replaceable class="PARAMETER">count</replaceable> - RELATIVE <replaceable class="PARAMETER">count</replaceable> - <replaceable class="PARAMETER">count</replaceable> + ABSOLUTE <replaceable class="parameter">count</replaceable> + RELATIVE <replaceable class="parameter">count</replaceable> + <replaceable class="parameter">count</replaceable> ALL FORWARD - FORWARD <replaceable class="PARAMETER">count</replaceable> + FORWARD <replaceable class="parameter">count</replaceable> FORWARD ALL BACKWARD - BACKWARD <replaceable class="PARAMETER">count</replaceable> + BACKWARD <replaceable class="parameter">count</replaceable> BACKWARD ALL </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml index 3389aa055ca..09debd6685f 100644 --- a/doc/src/sgml/ref/notify.sgml +++ b/doc/src/sgml/ref/notify.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable class="PARAMETER">payload</replaceable> ] +NOTIFY <replaceable class="parameter">channel</replaceable> [ , <replaceable class="parameter">payload</replaceable> ] </synopsis> </refsynopsisdiv> @@ -128,7 +128,7 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">channel</replaceable></term> + <term><replaceable class="parameter">channel</replaceable></term> <listitem> <para> Name of the notification channel to be signaled (any identifier). @@ -136,7 +136,7 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">payload</replaceable></term> + <term><replaceable class="parameter">payload</replaceable></term> <listitem> <para> The <quote>payload</> string to be communicated along with the diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index 51801035260..a628e793109 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -287,12 +287,12 @@ <listitem> <para> Restore only those archive elements that are listed in <replaceable - class="PARAMETER">list-file</replaceable>, and restore them in the + class="parameter">list-file</replaceable>, and restore them in the order they appear in the file. Note that if filtering switches such as <option>-n</> or <option>-t</> are used with <option>-L</>, they will further restrict the items restored. </para> - <para><replaceable class="PARAMETER">list-file</> is normally created by + <para><replaceable class="parameter">list-file</> is normally created by editing the output of a previous <option>-l</> operation. Lines can be moved or removed, and can also be commented out by placing a semicolon (<literal>;</literal>) at the diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index fea2196efee..f4e1d543492 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -26,7 +26,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">data_type</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable> +PREPARE <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">data_type</replaceable> [, ...] ) ] AS <replaceable class="parameter">statement</replaceable> </synopsis> </refsynopsisdiv> @@ -86,7 +86,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> An arbitrary name given to this particular prepared @@ -98,7 +98,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">data_type</replaceable></term> + <term><replaceable class="parameter">data_type</replaceable></term> <listitem> <para> The data type of a parameter to the prepared statement. If the @@ -112,7 +112,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">statement</replaceable></term> + <term><replaceable class="parameter">statement</replaceable></term> <listitem> <para> Any <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>, diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml index 626753f5762..9a2e38e98c7 100644 --- a/doc/src/sgml/ref/prepare_transaction.sgml +++ b/doc/src/sgml/ref/prepare_transaction.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable> +PREPARE TRANSACTION <replaceable class="parameter">transaction_id</replaceable> </synopsis> </refsynopsisdiv> @@ -65,7 +65,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">transaction_id</replaceable></term> + <term><replaceable class="parameter">transaction_id</replaceable></term> <listitem> <para> An arbitrary identifier that later identifies this transaction for diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml index ccd038629bf..7e9819395f4 100644 --- a/doc/src/sgml/ref/reassign_owned.sgml +++ b/doc/src/sgml/ref/reassign_owned.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...] - TO { <replaceable class="PARAMETER">new_role</replaceable> | CURRENT_USER | SESSION_USER } +REASSIGN OWNED BY { <replaceable class="parameter">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...] + TO { <replaceable class="parameter">new_role</replaceable> | CURRENT_USER | SESSION_USER } </synopsis> </refsynopsisdiv> @@ -32,8 +32,8 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR <para> <command>REASSIGN OWNED</command> instructs the system to change the ownership of database objects owned by any of the - <replaceable class="PARAMETER">old_roles</replaceable> to - <replaceable class="PARAMETER">new_role</replaceable>. + <replaceable class="parameter">old_roles</replaceable> to + <replaceable class="parameter">new_role</replaceable>. </para> </refsect1> @@ -42,19 +42,19 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">old_role</replaceable></term> + <term><replaceable class="parameter">old_role</replaceable></term> <listitem> <para> The name of a role. The ownership of all the objects within the current database, and of all shared objects (databases, tablespaces), owned by this role will be reassigned to - <replaceable class="PARAMETER">new_role</replaceable>. + <replaceable class="parameter">new_role</replaceable>. </para> </listitem> </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_role</replaceable></term> + <term><replaceable class="parameter">new_role</replaceable></term> <listitem> <para> The name of the role that will be made the new owner of the @@ -88,7 +88,7 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR <para> The <command>REASSIGN OWNED</command> command does not affect any - privileges granted to the <replaceable class="PARAMETER">old_roles</> for + privileges granted to the <replaceable class="parameter">old_roles</> for objects that are not owned by them. Use <command>DROP OWNED</command> to revoke such privileges. </para> diff --git a/doc/src/sgml/ref/refresh_materialized_view.sgml b/doc/src/sgml/ref/refresh_materialized_view.sgml index c165c69c9f9..e56e542eb58 100644 --- a/doc/src/sgml/ref/refresh_materialized_view.sgml +++ b/doc/src/sgml/ref/refresh_materialized_view.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</replaceable> +REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="parameter">name</replaceable> [ WITH [ NO ] DATA ] </synopsis> </refsynopsisdiv> @@ -77,7 +77,7 @@ REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the materialized view to diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 3908ade37b8..09fc61d15b8 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable> +REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="parameter">name</replaceable> </synopsis> </refsynopsisdiv> @@ -139,7 +139,7 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of the specific index, table, or database to be diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml index 7e76891bde0..98c32078316 100644 --- a/doc/src/sgml/ref/reset.sgml +++ b/doc/src/sgml/ref/reset.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -RESET <replaceable class="PARAMETER">configuration_parameter</replaceable> +RESET <replaceable class="parameter">configuration_parameter</replaceable> RESET ALL </synopsis> </refsynopsisdiv> @@ -63,7 +63,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">configuration_parameter</replaceable></term> + <term><replaceable class="parameter">configuration_parameter</replaceable></term> <listitem> <para> Name of a settable run-time parameter. Available parameters are diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml index ce532543f0b..91f69af9eed 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -24,89 +24,89 @@ PostgreSQL documentation REVOKE [ GRANT OPTION FOR ] { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER } [, ...] | ALL [ PRIVILEGES ] } - ON { [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] + ON { [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...] | ALL TABLES IN SCHEMA <replaceable>schema_name</replaceable> [, ...] } - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] - { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) - [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) } - ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="parameter">column_name</replaceable> [, ...] ) + [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="parameter">column_name</replaceable> [, ...] ) } + ON [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { USAGE | SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } - ON { SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...] + ON { SEQUENCE <replaceable class="parameter">sequence_name</replaceable> [, ...] | ALL SEQUENCES IN SCHEMA <replaceable>schema_name</replaceable> [, ...] } - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | CONNECT | TEMPORARY | TEMP } [, ...] | ALL [ PRIVILEGES ] } ON DATABASE <replaceable>database_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON DOMAIN <replaceable>domain_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { EXECUTE | ALL [ PRIVILEGES ] } ON { FUNCTION <replaceable>function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...] | ALL FUNCTIONS IN SCHEMA <replaceable>schema_name</replaceable> [, ...] } - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON LANGUAGE <replaceable>lang_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] } - ON LARGE OBJECT <replaceable class="PARAMETER">loid</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + ON LARGE OBJECT <replaceable class="parameter">loid</replaceable> [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { { CREATE | USAGE } [, ...] | ALL [ PRIVILEGES ] } ON SCHEMA <replaceable>schema_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { CREATE | ALL [ PRIVILEGES ] } ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ GRANT OPTION FOR ] { USAGE | ALL [ PRIVILEGES ] } ON TYPE <replaceable>type_name</replaceable> [, ...] - FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] + FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ CASCADE | RESTRICT ] REVOKE [ ADMIN OPTION FOR ] - <replaceable class="PARAMETER">role_name</replaceable> [, ...] FROM <replaceable class="PARAMETER">role_name</replaceable> [, ...] + <replaceable class="parameter">role_name</replaceable> [, ...] FROM <replaceable class="parameter">role_name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml index a5328e96a29..a0ffc650830 100644 --- a/doc/src/sgml/ref/rollback_prepared.sgml +++ b/doc/src/sgml/ref/rollback_prepared.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> +ROLLBACK PREPARED <replaceable class="parameter">transaction_id</replaceable> </synopsis> </refsynopsisdiv> @@ -39,7 +39,7 @@ ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">transaction_id</replaceable></term> + <term><replaceable class="parameter">transaction_id</replaceable></term> <listitem> <para> The transaction identifier of the transaction that is to be diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml index 060f408a633..e8072d8974d 100644 --- a/doc/src/sgml/ref/rollback_to.sgml +++ b/doc/src/sgml/ref/rollback_to.sgml @@ -50,7 +50,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">savepoint_name</></term> + <term><replaceable class="parameter">savepoint_name</></term> <listitem> <para> The savepoint to roll back to. diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml index aa8be473bdf..971b928a02e 100644 --- a/doc/src/sgml/ref/security_label.sgml +++ b/doc/src/sgml/ref/security_label.sgml @@ -21,28 +21,28 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON +SECURITY LABEL [ FOR <replaceable class="parameter">provider</replaceable> ] ON { - TABLE <replaceable class="PARAMETER">object_name</replaceable> | - COLUMN <replaceable class="PARAMETER">table_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> | - AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | - DATABASE <replaceable class="PARAMETER">object_name</replaceable> | - DOMAIN <replaceable class="PARAMETER">object_name</replaceable> | - EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> | - FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> - FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | - LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> | - MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> | - [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> | - PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> | - ROLE <replaceable class="PARAMETER">object_name</replaceable> | - SCHEMA <replaceable class="PARAMETER">object_name</replaceable> | - SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> | - SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> | - TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> | - TYPE <replaceable class="PARAMETER">object_name</replaceable> | - VIEW <replaceable class="PARAMETER">object_name</replaceable> -} IS '<replaceable class="PARAMETER">label</replaceable>' + TABLE <replaceable class="parameter">object_name</replaceable> | + COLUMN <replaceable class="parameter">table_name</replaceable>.<replaceable class="parameter">column_name</replaceable> | + AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) | + DATABASE <replaceable class="parameter">object_name</replaceable> | + DOMAIN <replaceable class="parameter">object_name</replaceable> | + EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> | + FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> + FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] | + LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> | + MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> | + [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> | + PUBLICATION <replaceable class="parameter">object_name</replaceable> | + ROLE <replaceable class="parameter">object_name</replaceable> | + SCHEMA <replaceable class="parameter">object_name</replaceable> | + SEQUENCE <replaceable class="parameter">object_name</replaceable> | + SUBSCRIPTION <replaceable class="parameter">object_name</replaceable> | + TABLESPACE <replaceable class="parameter">object_name</replaceable> | + TYPE <replaceable class="parameter">object_name</replaceable> | + VIEW <replaceable class="parameter">object_name</replaceable> +} IS '<replaceable class="parameter">label</replaceable>' <phrase>where <replaceable>aggregate_signature</replaceable> is:</phrase> diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml index 84b0dd831f9..63c02349aa4 100644 --- a/doc/src/sgml/ref/select_into.sgml +++ b/doc/src/sgml/ref/select_into.sgml @@ -76,7 +76,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">new_table</replaceable></term> + <term><replaceable class="parameter">new_table</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table to be created. diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml index 4ebb6a627b6..89c0fad1950 100644 --- a/doc/src/sgml/ref/set.sgml +++ b/doc/src/sgml/ref/set.sgml @@ -21,8 +21,8 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">configuration_parameter</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 } +SET [ SESSION | LOCAL ] <replaceable class="parameter">configuration_parameter</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> @@ -118,7 +118,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">configuration_parameter</replaceable></term> + <term><replaceable class="parameter">configuration_parameter</replaceable></term> <listitem> <para> Name of a settable run-time parameter. Available parameters are @@ -128,7 +128,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">value</replaceable></term> + <term><replaceable class="parameter">value</replaceable></term> <listitem> <para> New value of parameter. Values can be specified as string diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml index 46bb239baf2..7e198e6df8c 100644 --- a/doc/src/sgml/ref/show.sgml +++ b/doc/src/sgml/ref/show.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -SHOW <replaceable class="PARAMETER">name</replaceable> +SHOW <replaceable class="parameter">name</replaceable> SHOW ALL </synopsis> </refsynopsisdiv> @@ -47,7 +47,7 @@ SHOW ALL <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name of a run-time parameter. Available parameters are diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml index e9c8a03a638..fef33155998 100644 --- a/doc/src/sgml/ref/truncate.sgml +++ b/doc/src/sgml/ref/truncate.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ... ] +TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] [, ... ] [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> @@ -44,7 +44,7 @@ TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">name</replaceable></term> + <term><replaceable class="parameter">name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a table to truncate. diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml index f7c3c47e2f3..622e1cf1548 100644 --- a/doc/src/sgml/ref/unlisten.sgml +++ b/doc/src/sgml/ref/unlisten.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * } +UNLISTEN { <replaceable class="parameter">channel</replaceable> | * } </synopsis> </refsynopsisdiv> @@ -34,7 +34,7 @@ UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * } <command>UNLISTEN</command> cancels any existing registration of the current <productname>PostgreSQL</productname> session as a listener on the notification channel named <replaceable - class="PARAMETER">channel</replaceable>. The special wildcard + class="parameter">channel</replaceable>. The special wildcard <literal>*</literal> cancels all listener registrations for the current session. </para> @@ -52,7 +52,7 @@ UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * } <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">channel</replaceable></term> + <term><replaceable class="parameter">channel</replaceable></term> <listitem> <para> Name of a notification channel (any identifier). diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml index 8a1619fb68b..9dcbbd0e287 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -22,13 +22,13 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ] -UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ] - SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } | - ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) | - ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> ) +UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ] + SET { <replaceable class="parameter">column_name</replaceable> = { <replaceable class="parameter">expression</replaceable> | DEFAULT } | + ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) | + ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> ) } [, ...] - [ FROM <replaceable class="PARAMETER">from_list</replaceable> ] - [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ] + [ FROM <replaceable class="parameter">from_list</replaceable> ] + [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ] [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ] </synopsis> </refsynopsisdiv> @@ -88,7 +88,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of the table to update. @@ -115,11 +115,11 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a column in the table named by <replaceable - class="PARAMETER">table_name</replaceable>. + class="parameter">table_name</replaceable>. The column name can be qualified with a subfield name or array subscript, if needed. Do not include the table's name in the specification of a target column — for example, @@ -129,7 +129,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">expression</replaceable></term> + <term><replaceable class="parameter">expression</replaceable></term> <listitem> <para> An expression to assign to the column. The expression can use the @@ -149,7 +149,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">sub-SELECT</replaceable></term> + <term><replaceable class="parameter">sub-SELECT</replaceable></term> <listitem> <para> A <literal>SELECT</> sub-query that produces as many output columns @@ -164,7 +164,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">from_list</replaceable></term> + <term><replaceable class="parameter">from_list</replaceable></term> <listitem> <para> A list of table expressions, allowing columns from other tables @@ -180,7 +180,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">condition</replaceable></term> + <term><replaceable class="parameter">condition</replaceable></term> <listitem> <para> An expression that returns a value of type <type>boolean</type>. @@ -191,7 +191,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">cursor_name</replaceable></term> + <term><replaceable class="parameter">cursor_name</replaceable></term> <listitem> <para> The name of the cursor to use in a <literal>WHERE CURRENT OF</> @@ -208,12 +208,12 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_expression</replaceable></term> + <term><replaceable class="parameter">output_expression</replaceable></term> <listitem> <para> An expression to be computed and returned by the <command>UPDATE</> command after each row is updated. The expression can use any - column names of the table named by <replaceable class="PARAMETER">table_name</replaceable> + column names of the table named by <replaceable class="parameter">table_name</replaceable> or table(s) listed in <literal>FROM</>. Write <literal>*</> to return all columns. </para> @@ -221,7 +221,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">output_name</replaceable></term> + <term><replaceable class="parameter">output_name</replaceable></term> <listitem> <para> A name to use for a returned column. diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml index e712226c61c..f5bc87e2903 100644 --- a/doc/src/sgml/ref/vacuum.sgml +++ b/doc/src/sgml/ref/vacuum.sgml @@ -21,10 +21,10 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -VACUUM [ ( <replaceable class="PARAMETER">option</replaceable> [, ...] ) ] [ <replaceable class="PARAMETER">table_and_columns</replaceable> [, ...] ] -VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMETER">table_and_columns</replaceable> [, ...] ] +VACUUM [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ] +VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ] -<phrase>where <replaceable class="PARAMETER">option</replaceable> can be one of:</phrase> +<phrase>where <replaceable class="parameter">option</replaceable> can be one of:</phrase> FULL FREEZE @@ -32,9 +32,9 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMET ANALYZE DISABLE_PAGE_SKIPPING -<phrase>and <replaceable class="PARAMETER">table_and_columns</replaceable> is:</phrase> +<phrase>and <replaceable class="parameter">table_and_columns</replaceable> is:</phrase> - <replaceable class="PARAMETER">table_name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] + <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] </synopsis> </refsynopsisdiv> @@ -51,7 +51,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMET </para> <para> - Without a <replaceable class="PARAMETER">table_and_columns</replaceable> + Without a <replaceable class="parameter">table_and_columns</replaceable> list, <command>VACUUM</command> processes every table and materialized view in the current database that the current user has permission to vacuum. With a list, <command>VACUUM</command> processes only those table(s). @@ -161,7 +161,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMET </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">table_name</replaceable></term> + <term><replaceable class="parameter">table_name</replaceable></term> <listitem> <para> The name (optionally schema-qualified) of a specific table or @@ -172,7 +172,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMET </varlistentry> <varlistentry> - <term><replaceable class="PARAMETER">column_name</replaceable></term> + <term><replaceable class="parameter">column_name</replaceable></term> <listitem> <para> The name of a specific column to analyze. Defaults to all columns. diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml index 9b0d8fa4a16..9baeade5519 100644 --- a/doc/src/sgml/ref/values.sgml +++ b/doc/src/sgml/ref/values.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ...] +VALUES ( <replaceable class="parameter">expression</replaceable> [, ...] ) [, ...] [ ORDER BY <replaceable class="parameter">sort_expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [, ...] ] [ LIMIT { <replaceable class="parameter">count</replaceable> | ALL } ] [ OFFSET <replaceable class="parameter">start</replaceable> [ ROW | ROWS ] ] @@ -63,13 +63,13 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, .. <variablelist> <varlistentry> - <term><replaceable class="PARAMETER">expression</replaceable></term> + <term><replaceable class="parameter">expression</replaceable></term> <listitem> <para> A constant or expression to compute and insert at the indicated place in the resulting table (set of rows). In a <command>VALUES</> list appearing at the top level of an <command>INSERT</>, an - <replaceable class="PARAMETER">expression</replaceable> can be replaced + <replaceable class="parameter">expression</replaceable> can be replaced by <literal>DEFAULT</literal> to indicate that the destination column's default value should be inserted. <literal>DEFAULT</literal> cannot be used when <command>VALUES</> appears in other contexts. diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml index fe630a66b34..d5bde5c6c06 100644 --- a/doc/src/sgml/textsearch.sgml +++ b/doc/src/sgml/textsearch.sgml @@ -701,7 +701,7 @@ LIMIT 10; </indexterm> <synopsis> -to_tsvector(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>) returns <type>tsvector</> +to_tsvector(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>text</>) returns <type>tsvector</> </synopsis> <para> @@ -811,7 +811,7 @@ UPDATE tt SET ti = </indexterm> <synopsis> -to_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</> +to_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</>) returns <type>tsquery</> </synopsis> <para> @@ -884,7 +884,7 @@ SELECT to_tsquery('''supernovae stars'' & !crab'); </indexterm> <synopsis> -plainto_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</> +plainto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</>) returns <type>tsquery</> </synopsis> <para> @@ -924,7 +924,7 @@ SELECT plainto_tsquery('english', 'The Fat & Rats:C'); </indexterm> <synopsis> -phraseto_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</> +phraseto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</>) returns <type>tsquery</> </synopsis> <para> @@ -994,7 +994,7 @@ SELECT phraseto_tsquery('english', 'The Fat & Rats:C'); <primary>ts_rank</primary> </indexterm> - <literal>ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal> + <literal>ts_rank(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal> </term> <listitem> @@ -1011,7 +1011,7 @@ SELECT phraseto_tsquery('english', 'The Fat & Rats:C'); <primary>ts_rank_cd</primary> </indexterm> - <literal>ts_rank_cd(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal> + <literal>ts_rank_cd(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal> </term> <listitem> @@ -1043,7 +1043,7 @@ SELECT phraseto_tsquery('english', 'The Fat & Rats:C'); <para> For both these functions, - the optional <replaceable class="PARAMETER">weights</replaceable> + the optional <replaceable class="parameter">weights</replaceable> argument offers the ability to weigh word instances more or less heavily depending on how they are labeled. The weight arrays specify how heavily to weigh each category of word, in the order: @@ -1052,7 +1052,7 @@ SELECT phraseto_tsquery('english', 'The Fat & Rats:C'); {D-weight, C-weight, B-weight, A-weight} </synopsis> - If no <replaceable class="PARAMETER">weights</replaceable> are provided, + If no <replaceable class="parameter">weights</replaceable> are provided, then these defaults are used: <programlisting> @@ -1199,7 +1199,7 @@ LIMIT 10; </indexterm> <synopsis> -ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>) returns <type>text</> +ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>text</>, <replaceable class="parameter">query</replaceable> <type>tsquery</> <optional>, <replaceable class="parameter">options</replaceable> <type>text</> </optional>) returns <type>text</> </synopsis> <para> @@ -1388,7 +1388,7 @@ query.', <primary>setweight</primary> </indexterm> - <literal>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>) returns <type>tsvector</></literal> + <literal>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</>, <replaceable class="parameter">weight</replaceable> <type>"char"</>) returns <type>tsvector</></literal> </term> <listitem> @@ -1416,7 +1416,7 @@ query.', <primary>length(tsvector)</primary> </indexterm> - <literal>length(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>integer</></literal> + <literal>length(<replaceable class="parameter">vector</replaceable> <type>tsvector</>) returns <type>integer</></literal> </term> <listitem> @@ -1433,7 +1433,7 @@ query.', <primary>strip</primary> </indexterm> - <literal>strip(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>tsvector</></literal> + <literal>strip(<replaceable class="parameter">vector</replaceable> <type>tsvector</>) returns <type>tsvector</></literal> </term> <listitem> @@ -1546,7 +1546,7 @@ SELECT to_tsquery('fat') <-> to_tsquery('cat | rat'); <primary>tsquery_phrase</primary> </indexterm> - <literal>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</> [, <replaceable class="PARAMETER">distance</replaceable> <type>integer</> ]) returns <type>tsquery</></literal> + <literal>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</>, <replaceable class="parameter">query2</replaceable> <type>tsquery</> [, <replaceable class="parameter">distance</replaceable> <type>integer</> ]) returns <type>tsquery</></literal> </term> <listitem> @@ -1575,7 +1575,7 @@ SELECT tsquery_phrase(to_tsquery('fat'), to_tsquery('cat'), 10); <primary>numnode</primary> </indexterm> - <literal>numnode(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>integer</></literal> + <literal>numnode(<replaceable class="parameter">query</replaceable> <type>tsquery</>) returns <type>integer</></literal> </term> <listitem> @@ -1609,7 +1609,7 @@ SELECT numnode('foo & bar'::tsquery); <primary>querytree</primary> </indexterm> - <literal>querytree(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>text</></literal> + <literal>querytree(<replaceable class="parameter">query</replaceable> <type>tsquery</>) returns <type>text</></literal> </term> <listitem> @@ -1662,16 +1662,16 @@ SELECT querytree(to_tsquery('!defined')); <varlistentry> <term> - <literal>ts_rewrite (<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">target</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">substitute</replaceable> <type>tsquery</>) returns <type>tsquery</></literal> + <literal>ts_rewrite (<replaceable class="parameter">query</replaceable> <type>tsquery</>, <replaceable class="parameter">target</replaceable> <type>tsquery</>, <replaceable class="parameter">substitute</replaceable> <type>tsquery</>) returns <type>tsquery</></literal> </term> <listitem> <para> This form of <function>ts_rewrite</> simply applies a single - rewrite rule: <replaceable class="PARAMETER">target</replaceable> - is replaced by <replaceable class="PARAMETER">substitute</replaceable> + rewrite rule: <replaceable class="parameter">target</replaceable> + is replaced by <replaceable class="parameter">substitute</replaceable> wherever it appears in <replaceable - class="PARAMETER">query</replaceable>. For example: + class="parameter">query</replaceable>. For example: <screen> SELECT ts_rewrite('a & b'::tsquery, 'a'::tsquery, 'c'::tsquery); @@ -1686,7 +1686,7 @@ SELECT ts_rewrite('a & b'::tsquery, 'a'::tsquery, 'c'::tsquery); <varlistentry> <term> - <literal>ts_rewrite (<replaceable class="PARAMETER">query</> <type>tsquery</>, <replaceable class="PARAMETER">select</> <type>text</>) returns <type>tsquery</></literal> + <literal>ts_rewrite (<replaceable class="parameter">query</> <type>tsquery</>, <replaceable class="parameter">select</> <type>text</>) returns <type>tsquery</></literal> </term> <listitem> @@ -1785,8 +1785,8 @@ SELECT ts_rewrite('a & b'::tsquery, </para> <synopsis> -tsvector_update_trigger(<replaceable class="PARAMETER">tsvector_column_name</replaceable>, <replaceable class="PARAMETER">config_name</replaceable>, <replaceable class="PARAMETER">text_column_name</replaceable> <optional>, ... </optional>) -tsvector_update_trigger_column(<replaceable class="PARAMETER">tsvector_column_name</replaceable>, <replaceable class="PARAMETER">config_column_name</replaceable>, <replaceable class="PARAMETER">text_column_name</replaceable> <optional>, ... </optional>) +tsvector_update_trigger(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>) +tsvector_update_trigger_column(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_column_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>) </synopsis> <para> @@ -1886,9 +1886,9 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE </para> <synopsis> -ts_stat(<replaceable class="PARAMETER">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="PARAMETER">weights</replaceable> <type>text</>, </optional> - OUT <replaceable class="PARAMETER">word</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">ndoc</replaceable> <type>integer</>, - OUT <replaceable class="PARAMETER">nentry</replaceable> <type>integer</>) returns <type>setof record</> +ts_stat(<replaceable class="parameter">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="parameter">weights</replaceable> <type>text</>, </optional> + OUT <replaceable class="parameter">word</replaceable> <type>text</>, OUT <replaceable class="parameter">ndoc</replaceable> <type>integer</>, + OUT <replaceable class="parameter">nentry</replaceable> <type>integer</>) returns <type>setof record</> </synopsis> <para> @@ -3177,22 +3177,22 @@ SHOW default_text_search_config; </indexterm> <synopsis> -ts_debug(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, - OUT <replaceable class="PARAMETER">alias</> <type>text</>, - OUT <replaceable class="PARAMETER">description</> <type>text</>, - OUT <replaceable class="PARAMETER">token</> <type>text</>, - OUT <replaceable class="PARAMETER">dictionaries</> <type>regdictionary[]</>, - OUT <replaceable class="PARAMETER">dictionary</> <type>regdictionary</>, - OUT <replaceable class="PARAMETER">lexemes</> <type>text[]</>) +ts_debug(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</>, </optional> <replaceable class="parameter">document</replaceable> <type>text</>, + OUT <replaceable class="parameter">alias</> <type>text</>, + OUT <replaceable class="parameter">description</> <type>text</>, + OUT <replaceable class="parameter">token</> <type>text</>, + OUT <replaceable class="parameter">dictionaries</> <type>regdictionary[]</>, + OUT <replaceable class="parameter">dictionary</> <type>regdictionary</>, + OUT <replaceable class="parameter">lexemes</> <type>text[]</>) returns setof record </synopsis> <para> <function>ts_debug</> displays information about every token of - <replaceable class="PARAMETER">document</replaceable> as produced by the + <replaceable class="parameter">document</replaceable> as produced by the parser and processed by the configured dictionaries. It uses the configuration specified by <replaceable - class="PARAMETER">config</replaceable>, + class="parameter">config</replaceable>, or <varname>default_text_search_config</varname> if that argument is omitted. </para> @@ -3360,10 +3360,10 @@ FROM ts_debug('public.english','The Brightest supernovaes'); </indexterm> <synopsis> -ts_parse(<replaceable class="PARAMETER">parser_name</replaceable> <type>text</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, - OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>) returns <type>setof record</> -ts_parse(<replaceable class="PARAMETER">parser_oid</replaceable> <type>oid</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, - OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>) returns <type>setof record</> +ts_parse(<replaceable class="parameter">parser_name</replaceable> <type>text</>, <replaceable class="parameter">document</replaceable> <type>text</>, + OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">token</> <type>text</>) returns <type>setof record</> +ts_parse(<replaceable class="parameter">parser_oid</replaceable> <type>oid</>, <replaceable class="parameter">document</replaceable> <type>text</>, + OUT <replaceable class="parameter">tokid</> <type>integer</>, OUT <replaceable class="parameter">token</> <type>text</>) returns <type>setof record</> </synopsis> <para> @@ -3391,10 +3391,10 @@ SELECT * FROM ts_parse('default', '123 - a number'); </indexterm> <synopsis> -ts_token_type(<replaceable class="PARAMETER">parser_name</> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, - OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>) returns <type>setof record</> -ts_token_type(<replaceable class="PARAMETER">parser_oid</> <type>oid</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, - OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>) returns <type>setof record</> +ts_token_type(<replaceable class="parameter">parser_name</> <type>text</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, + OUT <replaceable class="parameter">alias</> <type>text</>, OUT <replaceable class="parameter">description</> <type>text</>) returns <type>setof record</> +ts_token_type(<replaceable class="parameter">parser_oid</> <type>oid</>, OUT <replaceable class="parameter">tokid</> <type>integer</>, + OUT <replaceable class="parameter">alias</> <type>text</>, OUT <replaceable class="parameter">description</> <type>text</>) returns <type>setof record</> </synopsis> <para> @@ -3449,7 +3449,7 @@ SELECT * FROM ts_token_type('default'); </indexterm> <synopsis> -ts_lexize(<replaceable class="PARAMETER">dict</replaceable> <type>regdictionary</>, <replaceable class="PARAMETER">token</replaceable> <type>text</>) returns <type>text[]</> +ts_lexize(<replaceable class="parameter">dict</replaceable> <type>regdictionary</>, <replaceable class="parameter">token</replaceable> <type>text</>) returns <type>text[]</> </synopsis> <para> diff --git a/doc/src/sgml/unaccent.sgml b/doc/src/sgml/unaccent.sgml index 2b127e6736c..d5cf98f6c1f 100644 --- a/doc/src/sgml/unaccent.sgml +++ b/doc/src/sgml/unaccent.sgml @@ -174,11 +174,11 @@ mydb=# select ts_headline('fr','Hôtel de la Mer',to_tsquery('fr','Hotels') </indexterm> <synopsis> -unaccent(<optional><replaceable class="PARAMETER">dictionary</replaceable>, </optional> <replaceable class="PARAMETER">string</replaceable>) returns <type>text</type> +unaccent(<optional><replaceable class="parameter">dictionary</replaceable>, </optional> <replaceable class="parameter">string</replaceable>) returns <type>text</type> </synopsis> <para> - If the <replaceable class="PARAMETER">dictionary</replaceable> argument is + If the <replaceable class="parameter">dictionary</replaceable> argument is omitted, <literal>unaccent</> is assumed. </para> |