aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2017-06-06 12:24:44 -0400
committerRobert Haas <rhaas@postgresql.org>2017-06-06 12:24:44 -0400
commit79c4fa0f62291fd30d126a12f35b9ce71f06b3c0 (patch)
treec3f9019b21fb9b247c246aea77b0434f9d095931
parent3106829513ab7c8e46e94db103f1ef8d8dfd379b (diff)
downloadpostgresql-79c4fa0f62291fd30d126a12f35b9ce71f06b3c0.tar.gz
postgresql-79c4fa0f62291fd30d126a12f35b9ce71f06b3c0.zip
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
-rw-r--r--doc/src/sgml/catalogs.sgml4
-rw-r--r--doc/src/sgml/ddl.sgml2
-rw-r--r--src/bin/pg_basebackup/receivelog.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 61ce12c5600..ea655a10a89 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -3783,7 +3783,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
<entry><literal><link linkend="catalog-pg-collation"><structname>pg_collation</structname></link>.oid</literal></entry>
<entry>
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.
</entry>
</row>
@@ -4771,7 +4771,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
<entry><literal><link linkend="catalog-pg-opclass"><structname>pg_opclass</structname></link>.oid</literal></entry>
<entry>
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.
</entry>
</row>
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 84c4f209909..ec015e93d07 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -3165,7 +3165,7 @@ CREATE INDEX ON measurement_y2008m01 (logdate);
<para>
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 cf730da283a..52aa274bb89 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;