From 79c4fa0f62291fd30d126a12f35b9ce71f06b3c0 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 6 Jun 2017 12:24:44 -0400 Subject: [PATCH] Fix some cases of "the the" split across two lines. Kevin Grittner observed that 2186b608b3cb859fe0ec04015a5c4e4cbf69caed introduced a new occurence of this by copying existing text, and I found a few more cases using grep. Discussion: http://postgr.es/m/CADAecHWfG-K+YvocHCkrXV-ycm+eUOaaUVfYZNOnwf0pSmuQCw@mail.gmail.com --- doc/src/sgml/catalogs.sgml | 4 ++-- doc/src/sgml/ddl.sgml | 2 +- src/bin/pg_basebackup/receivelog.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 61ce12c560..ea655a10a8 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -3783,7 +3783,7 @@ SCRAM-SHA-256$<iteration count>:<salt>< pg_collation.oid For each column in the index key, this contains the OID of the - the collation to use for the index, or zero if the column is not + collation to use for the index, or zero if the column is not of a collatable data type. @@ -4771,7 +4771,7 @@ SCRAM-SHA-256$<iteration count>:<salt>< pg_opclass.oid For each column in the partition key, this contains the OID of the - the collation to use for partitioning, or zero if the column is not + collation to use for partitioning, or zero if the column is not of a collatable data type. diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index 84c4f20990..ec015e93d0 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -3165,7 +3165,7 @@ CREATE INDEX ON measurement_y2008m01 (logdate); Normally the set of partitions established when initially defining the - the table are not intended to remain static. It is common to want to + table are not intended to remain static. It is common to want to remove old partitions of data and periodically add new partitions for new data. One of the most important advantages of partitioning is precisely that it allows this otherwise painful task to be executed diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index cf730da283..52aa274bb8 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -629,7 +629,7 @@ ReceiveXlogStream(PGconn *conn, StreamCtl *stream) * server had sent us half of a WAL record, when it was promoted. * The new timeline will begin at the end of the last complete * record in that case, overlapping the partial WAL record on the - * the old timeline. + * old timeline. */ uint32 newtimeline; bool parsed; -- 2.40.0