Skip to content

Commit 952af24

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 b705582 commit 952af24

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
@@ -772,7 +772,7 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
772772
dynamically from one version to the next, you should provide
773773
<firstterm>update scripts</> that make the necessary changes to go from
774774
one version to the next. Update scripts have names following the pattern
775-
<literal><replaceable>extension</>--<replaceable>oldversion</>--<replaceable>newversion</>.sql</literal>
775+
<literal><replaceable>extension</>--<replaceable>old_version</>--<replaceable>target_version</>.sql</literal>
776776
(for example, <literal>foo--1.0--1.1.sql</> contains the commands to modify
777777
version <literal>1.0</> of extension <literal>foo</> into version
778778
<literal>1.1</>).

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -966,23 +966,23 @@ COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable cl
966966
[ [ WITH ]
967967
[ BINARY ]
968968
[ OIDS ]
969-
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
969+
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
970970
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
971971
[ CSV [ HEADER ]
972-
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
973-
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
972+
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
973+
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
974974
[ FORCE NOT NULL <replaceable class="parameter">column_name</replaceable> [, ...] ] ] ]
975975

976976
COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) }
977977
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
978978
[ [ WITH ]
979979
[ BINARY ]
980980
[ OIDS ]
981-
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
981+
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
982982
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
983983
[ CSV [ HEADER ]
984-
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
985-
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
984+
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
985+
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
986986
[ FORCE QUOTE { <replaceable class="parameter">column_name</replaceable> [, ...] | * } ] ] ]
987987
</synopsis>
988988

@@ -998,13 +998,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
998998
<synopsis>
999999
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ]
10001000
FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
1001-
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
1002-
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
1001+
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
1002+
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
10031003

10041004
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH OIDS ]
10051005
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
1006-
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
1007-
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
1006+
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
1007+
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
10081008
</synopsis></para>
10091009
</refsect1>
10101010
</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)