Skip to content

Commit c0e5df9

Browse files
michaelpqmichaelpq
committed
Doc: Fix various inconsistencies
This fixes multiple areas of the documentation: - COPY for its past compatibility section. - SET ROLE mentioning INHERITS instead of INHERIT - PREPARE referring to stmt_name, that is not present. - Extension documentation about format name with upgrade scripts. Backpatch down to 9.4 for the relevant parts. Author: Alexander Lakhin Discussion: https://postgr.es/m/bf95233a-9943-b341-e2ff-a860c28af481@gmail.com Backpatch-through: 9.4
1 parent 77cc4a5 commit c0e5df9

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎doc/src/sgml/extend.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
825825
dynamically from one version to the next, you should provide
826826
<firstterm>update scripts</> that make the necessary changes to go from
827827
one version to the next. Update scripts have names following the pattern
828-
<literal><replaceable>extension</>--<replaceable>oldversion</>--<replaceable>newversion</>.sql</literal>
828+
<literal><replaceable>extension</>--<replaceable>old_version</>--<replaceable>target_version</>.sql</literal>
829829
(for example, <literal>foo--1.0--1.1.sql</> contains the commands to modify
830830
version <literal>1.0</> of extension <literal>foo</> into version
831831
<literal>1.1</>).

‎doc/src/sgml/ref/copy.sgml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -997,23 +997,23 @@ COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable cl
997997
[ [ WITH ]
998998
[ BINARY ]
999999
[ OIDS ]
1000-
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
1000+
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
10011001
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
10021002
[ CSV [ HEADER ]
1003-
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
1004-
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
1003+
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
1004+
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
10051005
[ FORCE NOT NULL <replaceable class="parameter">column_name</replaceable> [, ...] ] ] ]
10061006

10071007
COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) }
10081008
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
10091009
[ [ WITH ]
10101010
[ BINARY ]
10111011
[ OIDS ]
1012-
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
1012+
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
10131013
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
10141014
[ CSV [ HEADER ]
1015-
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
1016-
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
1015+
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
1016+
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
10171017
[ FORCE QUOTE { <replaceable class="parameter">column_name</replaceable> [, ...] | * } ] ] ]
10181018
</synopsis>
10191019

@@ -1029,13 +1029,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
10291029
<synopsis>
10301030
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ]
10311031
FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
1032-
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
1033-
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
1032+
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
1033+
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
10341034

10351035
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ]
10361036
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
1037-
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
1038-
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
1037+
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
1038+
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
10391039
</synopsis></para>
10401040
</refsect1>
10411041
</refentry>

‎doc/src/sgml/ref/set_role.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RESET ROLE
6464

6565
<para>
6666
Using this command, it is possible to either add privileges or restrict
67-
one's privileges. If the session user role has the <literal>INHERITS</>
67+
one's privileges. If the session user role has the <literal>INHERIT</>
6868
attribute, then it automatically has all the privileges of every role that
6969
it could <command>SET ROLE</> to; in this case <command>SET ROLE</>
7070
effectively drops all the privileges assigned directly to the session user

0 commit comments

Comments
 (0)