agora inbox for pgsql-docs@postgresql.org
help / color / mirror / Atom feedMiscellaneous minor fixes
2+ messages / 2 participants
[nested] [flat]
* Miscellaneous minor fixes
@ 2019-10-14 08:29 Alexander Lakhin <exclusion@gmail.com>
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Lakhin @ 2019-10-14 08:29 UTC (permalink / raw)
To: pgsql-docs
Hello,
Please consider fixing minor inconsistencies and typos in doc/.
(fix-contributor-name.patch is for REL_12_STABLE only)
Best regards,
Alexander
Attachments:
[text/x-patch] copy-consistency.patch (3.5K, ../../bf95233a-9943-b341-e2ff-a860c28af481@gmail.com/2-copy-consistency.patch)
download | inline diff:
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 5e2992ddac..3e6f9cd532 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1015,22 +1015,22 @@ COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable cl
FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
[ [ WITH ]
[ BINARY ]
- [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
- [ NULL [ AS ] '<replaceable class="parameter">null string</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> ) }
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
[ [ WITH ]
[ BINARY ]
- [ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
- [ NULL [ AS ] '<replaceable class="parameter">null string</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>
@@ -1046,13 +1046,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
<synopsis>
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable>
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>
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>
[text/x-patch] extend-consistency.patch (996B, ../../bf95233a-9943-b341-e2ff-a860c28af481@gmail.com/3-extend-consistency.patch)
download | inline diff:
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index 8dc2b893f7..a3046f22d0 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>).
[text/x-patch] fix-contributor-name.patch (514B, ../../bf95233a-9943-b341-e2ff-a860c28af481@gmail.com/4-fix-contributor-name.patch)
download | inline diff:
diff --git a/doc/src/sgml/release-12.sgml b/doc/src/sgml/release-12.sgml
index 04f4effa8a..126d6144a4 100644
--- a/doc/src/sgml/release-12.sgml
+++ b/doc/src/sgml/release-12.sgml
@@ -3917,7 +3917,7 @@ Author: Michael Paquier <michael@paquier.xyz>
<member>Yuming Wang</member>
<member>YunQiang Su</member>
<member>Yuri Kurenkov</member>
- <member>Yusuke Egashita</member>
+ <member>Yusuke Egashira</member>
<member>Yuzuko Hosoya</member>
<member>Zhou Digoal</member>
</simplelist>
[text/x-patch] prepare-consistency.patch (810B, ../../bf95233a-9943-b341-e2ff-a860c28af481@gmail.com/5-prepare-consistency.patch)
download | inline diff:
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index 9f786cd3ad..4e5e96a401 100644
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -165,7 +165,7 @@ PREPARE <replaceable class="parameter">name</replaceable> [ ( <replaceable class
To examine the query plan <productname>PostgreSQL</productname> is using
for a prepared statement, use <xref linkend="sql-explain"/>, for example
<programlisting>
-EXPLAIN EXECUTE <replaceable>stmt_name</replaceable>(<replaceable>parameter_values</replaceable>);
+EXPLAIN EXECUTE <replaceable>name</replaceable>(<replaceable>parameter_values</replaceable>);
</programlisting>
If a generic plan is in use, it will contain parameter symbols
<literal>$<replaceable>n</replaceable></literal>, while a custom plan
[text/x-patch] role-inherits.patch (714B, ../../bf95233a-9943-b341-e2ff-a860c28af481@gmail.com/6-role-inherits.patch)
download | inline diff:
diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml
index 9ab0d6af04..a4842f363c 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
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: Miscellaneous minor fixes
@ 2019-10-16 04:18 Michael Paquier <michael@paquier.xyz>
parent: Alexander Lakhin <exclusion@gmail.com>
0 siblings, 0 replies; 2+ messages in thread
From: Michael Paquier @ 2019-10-16 04:18 UTC (permalink / raw)
To: Alexander Lakhin <exclusion@gmail.com>; +Cc: pgsql-docs
On Mon, Oct 14, 2019 at 11:29:22AM +0300, Alexander Lakhin wrote:
> Please consider fixing minor inconsistencies and typos in doc/.
> (fix-contributor-name.patch is for REL_12_STABLE only)
So, for the COPY part this involves a set of inconsistencies with the
compatibility section. No objections to that.
The rest makes sense as well, so committed and back-patched down to
9.4 for the relevant parts. The part about the contributor name
applies only to 12 as you have mentioned for the release notes of the
branch, so done separately of the rest.
Thanks a lot for the patches, Alexander.
--
Michael
Attachments:
[application/pgp-signature] signature.asc (832B, ../../20191016041823.GB2602@paquier.xyz/2-signature.asc)
download
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2019-10-16 04:18 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2019-10-14 08:29 Miscellaneous minor fixes Alexander Lakhin <exclusion@gmail.com>
2019-10-16 04:18 ` Michael Paquier <michael@paquier.xyz>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox