diff options
| -rw-r--r-- | doc/src/sgml/extend.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/ref/copy.sgml | 20 | ||||
| -rw-r--r-- | doc/src/sgml/ref/set_role.sgml | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index 421e059e7bd..4f1bc6130aa 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -856,7 +856,7 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr dynamically from one version to the next, you should provide <firstterm>update scripts</firstterm> that make the necessary changes to go from one version to the next. Update scripts have names following the pattern - <literal><replaceable>extension</replaceable>--<replaceable>oldversion</replaceable>--<replaceable>newversion</replaceable>.sql</literal> + <literal><replaceable>extension</replaceable>--<replaceable>old_version</replaceable>--<replaceable>target_version</replaceable>.sql</literal> (for example, <literal>foo--1.0--1.1.sql</literal> contains the commands to modify version <literal>1.0</literal> of extension <literal>foo</literal> into version <literal>1.1</literal>). diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 9f3c85bf7f9..e2663063f17 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1002,11 +1002,11 @@ COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable cl [ [ WITH ] [ BINARY ] [ OIDS ] - [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ] + [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ] [ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ] [ CSV [ HEADER ] - [ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ] - [ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ] + [ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ] + [ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ] [ FORCE NOT NULL <replaceable class="parameter">column_name</replaceable> [, ...] ] ] ] COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) } @@ -1014,11 +1014,11 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable [ [ WITH ] [ BINARY ] [ OIDS ] - [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ] + [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ] [ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ] [ CSV [ HEADER ] - [ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ] - [ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ] + [ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ] + [ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ] [ FORCE QUOTE { <replaceable class="parameter">column_name</replaceable> [, ...] | * } ] ] ] </synopsis> @@ -1034,13 +1034,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable <synopsis> COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ] FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN } - [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ] - [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ] + [ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ] + [ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ] COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ] TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT } - [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ] - [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ] + [ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ] + [ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ] </synopsis></para> </refsect1> </refentry> diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 9ab0d6af04c..a4842f363c8 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -64,7 +64,7 @@ RESET ROLE <para> Using this command, it is possible to either add privileges or restrict - one's privileges. If the session user role has the <literal>INHERITS</literal> + one's privileges. If the session user role has the <literal>INHERIT</literal> attribute, then it automatically has all the privileges of every role that it could <command>SET ROLE</command> to; in this case <command>SET ROLE</command> effectively drops all the privileges assigned directly to the session user |