On Thu, Feb 06, 2020 at 04:43:18PM +0530, Amit Kapila wrote:
> On Thu, Feb 6, 2020 at 10:45 AM Michael Paquier <mich...@paquier.xyz> wrote:
> >
> > On Thu, Feb 06, 2020 at 08:47:14AM +0530, Amit Kapila wrote:
> > > Your changes look fine to me on the first read. I will push this to
> > > HEAD unless there are any objections. If we want them in
> > > back-branches, we might want to probably segregate the changes based
> > > on the branch until those apply.
> >
> > +1. It would be nice to back-patch the user-visible changes in the
> > docs.
> >
>
> Fair enough, Justin, is it possible for you to segregate the changes
> that can be backpatched?
Looks like the whole patch can be applied to master and v12 [0].
My original thread from last year was about docs added in v12, so bloom.sgml is
the only user-facing doc which can be backpatched. README.parallel and
bufmgr.c changes could be backpatched but I agree it's not necessary.
Note, the bloom typo seems to complete a change that was started here:
|commit 31ff51adc855e3ffe8e3c20e479b8d1a4508feb8
|Author: Alexander Korotkov <akorot...@postgresql.org>
|Date: Mon Oct 22 00:23:26 2018 +0300
|
| Fix some grammar errors in bloom.sgml
|
| Discussion:
https://postgr.es/m/CAEepm%3D3sijpGr8tXdyz-7EJJZfhQHABPKEQ29gpnb7-XSy%2B%3D5A%40mail.gmail.com
| Reported-by: Thomas Munro
| Backpatch-through: 9.6
Justin
[0] modulo a fix for a typo which I introduced in another patch in this branch,
which shouldn't have been in this patch; fixed in the attached.
>From a1780229e024e2e4b9a0549bcd516bb80b2d5a8d Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryz...@telsasoft.com>
Date: Thu, 9 May 2019 21:13:55 -0500
Subject: [PATCH] spelling and typos
---
doc/src/sgml/bloom.sgml | 2 +-
doc/src/sgml/ref/alter_table.sgml | 2 +-
doc/src/sgml/sources.sgml | 4 ++--
src/backend/access/transam/README.parallel | 2 +-
src/backend/storage/buffer/bufmgr.c | 2 +-
src/backend/storage/sync/sync.c | 2 +-
src/include/access/tableam.h | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/src/sgml/bloom.sgml b/doc/src/sgml/bloom.sgml
index 6eeadde..c341b65 100644
--- a/doc/src/sgml/bloom.sgml
+++ b/doc/src/sgml/bloom.sgml
@@ -65,7 +65,7 @@
<para>
Number of bits generated for each index column. Each parameter's name
refers to the number of the index column that it controls. The default
- is <literal>2</literal> bits and maximum is <literal>4095</literal>. Parameters for
+ is <literal>2</literal> bits and the maximum is <literal>4095</literal>. Parameters for
index columns not actually used are ignored.
</para>
</listitem>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 5de3676..a22770c 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -222,7 +222,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
<para>
<literal>SET NOT NULL</literal> may only be applied to a column
- providing none of the records in the table contain a
+ provided none of the records in the table contain a
<literal>NULL</literal> value for the column. Ordinarily this is
checked during the <literal>ALTER TABLE</literal> by scanning the
entire table; however, if a valid <literal>CHECK</literal> constraint is
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 5831ec4..b5d28e7 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -511,7 +511,7 @@ Hint: the addendum
<para>
There are functions in the backend that will double-quote their own output
- at need (for example, <function>format_type_be()</function>). Do not put
+ as needed (for example, <function>format_type_be()</function>). Do not put
additional quotes around the output of such functions.
</para>
@@ -880,7 +880,7 @@ BETTER: unrecognized node type: 42
practices.
</para>
<para>
- Features from later revision of the C standard or compiler specific
+ Features from later revisions of the C standard or compiler specific
features can be used, if a fallback is provided.
</para>
<para>
diff --git a/src/backend/access/transam/README.parallel b/src/backend/access/transam/README.parallel
index 85e5840..99c588d 100644
--- a/src/backend/access/transam/README.parallel
+++ b/src/backend/access/transam/README.parallel
@@ -169,7 +169,7 @@ differently because of them. Right now, we don't even allow that.
At the end of a parallel operation, which can happen either because it
completed successfully or because it was interrupted by an error, parallel
workers associated with that operation exit. In the error case, transaction
-abort processing in the parallel leader kills of any remaining workers, and
+abort processing in the parallel leader kills off any remaining workers, and
the parallel leader then waits for them to die. In the case of a successful
parallel operation, the parallel leader does not send any signals, but must
wait for workers to complete and exit of their own volition. In either
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index aba3960..5880054 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -4291,7 +4291,7 @@ ts_ckpt_progress_comparator(Datum a, Datum b, void *arg)
*
* *max_pending is a pointer instead of an immediate value, so the coalesce
* limits can easily changed by the GUC mechanism, and so calling code does
- * not have to check the current configuration. A value is 0 means that no
+ * not have to check the current configuration. A value of 0 means that no
* writeback control will be performed.
*/
void
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index 9cb7c65..8282a47 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -216,7 +216,7 @@ SyncPostCheckpoint(void)
/*
* As in ProcessSyncRequests, we don't want to stop absorbing fsync
- * requests for along time when there are many deletions to be done.
+ * requests for a long time when there are many deletions to be done.
* We can safely call AbsorbSyncRequests() at this point in the loop
* (note it might try to delete list entries).
*/
diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index 696451f..ba9f7b8 100644
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -1185,7 +1185,7 @@ table_tuple_complete_speculative(Relation rel, TupleTableSlot *slot,
* operation. That's often faster than calling table_insert() in a loop,
* because e.g. the AM can reduce WAL logging and page locking overhead.
*
- * Except for taking `nslots` tuples as input, as an array of TupleTableSlots
+ * Except for taking `nslots` tuples as input, and an array of TupleTableSlots
* in `slots`, the parameters for table_multi_insert() are the same as for
* table_tuple_insert().
*
--
2.7.4
>From 51c7956b238357080bc3204a534faaf4017fa8df Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryz...@telsasoft.com>
Date: Thu, 9 May 2019 21:13:55 -0500
Subject: [PATCH] bloom typo for backpatch to 9.6
---
doc/src/sgml/bloom.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/bloom.sgml b/doc/src/sgml/bloom.sgml
index 6eeadde..c341b65 100644
--- a/doc/src/sgml/bloom.sgml
+++ b/doc/src/sgml/bloom.sgml
@@ -65,7 +65,7 @@
<para>
Number of bits generated for each index column. Each parameter's name
refers to the number of the index column that it controls. The default
- is <literal>2</literal> bits and maximum is <literal>4095</literal>. Parameters for
+ is <literal>2</literal> bits and the maximum is <literal>4095</literal>. Parameters for
index columns not actually used are ignored.
</para>
</listitem>
--
2.7.4
