From 952af2476f88d25cc532bd8db79e0737059b5421 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Wed, 16 Oct 2019 13:11:01 +0900
Subject: [PATCH] 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
---
doc/src/sgml/extend.sgml | 2 +-
doc/src/sgml/ref/copy.sgml | 20 ++++++++++----------
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 feb7a92c17f..74130dc51d1 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -772,7 +772,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</> that make the necessary changes to go from
one version to the next. Update scripts have names following the pattern
- <literal><replaceable>extension</>--<replaceable>oldversion</>--<replaceable>newversion</>.sql</literal>
+ <literal><replaceable>extension</>--<replaceable>old_version</>--<replaceable>target_version</>.sql</literal>
(for example, <literal>foo--1.0--1.1.sql</> contains the commands to modify
version <literal>1.0</> of extension <literal>foo</> into version
<literal>1.1</>).
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 2850b4763f2..7ca663f925f 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -966,11 +966,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> ) }
@@ -978,11 +978,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>
@@ -998,13 +998,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 cb25ebbec6f..bb8483f0d40 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</>
+ one's privileges. If the session user role has the <literal>INHERIT</>
attribute, then it automatically has all the privileges of every role that
it could <command>SET ROLE</> to; in this case <command>SET ROLE</>
effectively drops all the privileges assigned directly to the session user
--
GitLab