From 7cc2f59dd57ab275497ae42a4f98e7936e1e3723 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Mon, 9 Oct 2023 09:18:47 +0530 Subject: [PATCH] Remove duplicate words in docs and code comments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additionally, add a missing "the" in a couple of places. Author: Vignesh C, Dagfinn Ilmari Mannsåker Discussion: http://postgr.es/m/CALDaNm28t+wWyPfuyqEaARS810Je=dRFkaPertaLAEJYY2cWYQ@mail.gmail.com --- .cirrus.star | 2 +- contrib/citext/expected/citext_utf8.out | 2 +- contrib/citext/expected/citext_utf8_1.out | 2 +- contrib/citext/sql/citext_utf8.sql | 2 +- doc/src/sgml/logical-replication.sgml | 2 +- doc/src/sgml/ref/create_subscription.sgml | 2 +- src/backend/access/nbtree/nbtsearch.c | 4 ++-- src/backend/access/transam/xlogreader.c | 2 +- src/backend/executor/nodeHashjoin.c | 2 +- src/test/regress/expected/tuplesort.out | 4 ++-- src/test/regress/sql/tuplesort.sql | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.cirrus.star b/.cirrus.star index d2d6ceca20..36233872d1 100644 --- a/.cirrus.star +++ b/.cirrus.star @@ -46,7 +46,7 @@ def main(): def config_from(config_src): """return contents of config file `config_src`, surrounded by markers - indicating start / end of the the included file + indicating start / end of the included file """ config_contents = fs.read(config_src) diff --git a/contrib/citext/expected/citext_utf8.out b/contrib/citext/expected/citext_utf8.out index 6630e09a4d..5d988dcd48 100644 --- a/contrib/citext/expected/citext_utf8.out +++ b/contrib/citext/expected/citext_utf8.out @@ -2,7 +2,7 @@ * This test must be run in a database with UTF-8 encoding * and a Unicode-aware locale. * - * Also disable this file for ICU, because the test for the the + * Also disable this file for ICU, because the test for the * Turkish dotted I is not correct for many ICU locales. citext always * uses the default collation, so it's not easy to restrict the test * to the "tr-TR-x-icu" collation where it will succeed. diff --git a/contrib/citext/expected/citext_utf8_1.out b/contrib/citext/expected/citext_utf8_1.out index 3caa7a00d4..7065a5da19 100644 --- a/contrib/citext/expected/citext_utf8_1.out +++ b/contrib/citext/expected/citext_utf8_1.out @@ -2,7 +2,7 @@ * This test must be run in a database with UTF-8 encoding * and a Unicode-aware locale. * - * Also disable this file for ICU, because the test for the the + * Also disable this file for ICU, because the test for the * Turkish dotted I is not correct for many ICU locales. citext always * uses the default collation, so it's not easy to restrict the test * to the "tr-TR-x-icu" collation where it will succeed. diff --git a/contrib/citext/sql/citext_utf8.sql b/contrib/citext/sql/citext_utf8.sql index 1f51df134b..34b232d64e 100644 --- a/contrib/citext/sql/citext_utf8.sql +++ b/contrib/citext/sql/citext_utf8.sql @@ -2,7 +2,7 @@ * This test must be run in a database with UTF-8 encoding * and a Unicode-aware locale. * - * Also disable this file for ICU, because the test for the the + * Also disable this file for ICU, because the test for the * Turkish dotted I is not correct for many ICU locales. citext always * uses the default collation, so it's not easy to restrict the test * to the "tr-TR-x-icu" collation where it will succeed. diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index fbf8ad669e..3b2fa1129e 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -1788,7 +1788,7 @@ CONTEXT: processing remote data for replication origin "pg_16395" during "INSER - To create a subscription, the user must have the privileges of the + To create a subscription, the user must have the privileges of the pg_create_subscription role, as well as CREATE privileges on the database. diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml index 71652fd918..c1bafbfa06 100644 --- a/doc/src/sgml/ref/create_subscription.sgml +++ b/doc/src/sgml/ref/create_subscription.sgml @@ -51,7 +51,7 @@ CREATE SUBSCRIPTION subscription_name - To be able to create a subscription, you must have the privileges of the + To be able to create a subscription, you must have the privileges of the pg_create_subscription role, as well as CREATE privileges on the current database. diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 72b052b249..efc5284e5b 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -1664,7 +1664,7 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum) /* * If the result of prechecking required keys was true, then in - * assert-enabled builds we also recheck that _bt_checkkeys() + * assert-enabled builds we also recheck that the _bt_checkkeys() * result is the same. */ Assert(!requiredMatchedByPrecheck || @@ -1783,7 +1783,7 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum) /* * If the result of prechecking required keys was true, then in - * assert-enabled builds we also recheck that _bt_checkkeys() + * assert-enabled builds we also recheck that the _bt_checkkeys() * result is the same. */ Assert(!requiredMatchedByPrecheck || diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index a1363e3b8f..e0baa86bd3 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -846,7 +846,7 @@ restart: /* * If we got here without a DecodedXLogRecord, it means we needed to - * validate total_len before trusting it, but by now now we've done that. + * validate total_len before trusting it, but by now we've done that. */ if (decoded == NULL) { diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index aea44a9d56..25a2d78f15 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -1306,7 +1306,7 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate) * The data recorded in the file for each tuple is its hash value, * then the tuple in MinimalTuple format. * - * fileptr points to a batch file in one of the the hashtable arrays. + * fileptr points to a batch file in one of the hashtable arrays. * * The batch files (and their buffers) are allocated in the spill context * created for the hashtable. diff --git a/src/test/regress/expected/tuplesort.out b/src/test/regress/expected/tuplesort.out index a2efa179fc..0e8b5bf4a3 100644 --- a/src/test/regress/expected/tuplesort.out +++ b/src/test/regress/expected/tuplesort.out @@ -401,7 +401,7 @@ FETCH NEXT FROM c; 00000000-0000-0000-0000-000000000000 (1 row) --- scroll beyond end end +-- scroll beyond end FETCH LAST FROM c; noabort_decreasing -------------------- @@ -498,7 +498,7 @@ FETCH NEXT FROM c; 00000000-0000-0000-0000-000000000000 (1 row) --- scroll beyond end end +-- scroll beyond end FETCH LAST FROM c; noabort_decreasing -------------------- diff --git a/src/test/regress/sql/tuplesort.sql b/src/test/regress/sql/tuplesort.sql index 846484d561..658fe98dc5 100644 --- a/src/test/regress/sql/tuplesort.sql +++ b/src/test/regress/sql/tuplesort.sql @@ -169,7 +169,7 @@ FETCH BACKWARD FROM c; FETCH BACKWARD FROM c; FETCH NEXT FROM c; --- scroll beyond end end +-- scroll beyond end FETCH LAST FROM c; FETCH BACKWARD FROM c; FETCH NEXT FROM c; @@ -200,7 +200,7 @@ FETCH BACKWARD FROM c; FETCH BACKWARD FROM c; FETCH NEXT FROM c; --- scroll beyond end end +-- scroll beyond end FETCH LAST FROM c; FETCH BACKWARD FROM c; FETCH NEXT FROM c;