From 33980a0640e9b495fe85a99c16c6b4806e41325a Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 23 Apr 2010 23:21:44 +0000 Subject: [PATCH] Fix various instances of "the the". Two of these were pointed out by Erik Rijkers; the rest I found. --- contrib/cube/CHANGES | 2 +- doc/src/sgml/pgbench.sgml | 4 ++-- doc/src/sgml/pgfreespacemap.sgml | 4 ++-- doc/src/sgml/ref/copy.sgml | 4 ++-- src/backend/access/heap/README.HOT | 4 ++-- src/backend/access/heap/visibilitymap.c | 6 +++--- src/backend/storage/ipc/standby.c | 4 ++-- src/bin/pg_dump/pg_backup_archiver.c | 4 ++-- src/include/port.h | 4 ++-- src/tools/backend/backend_dirs.html | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/contrib/cube/CHANGES b/contrib/cube/CHANGES index 5e5e7c8d4a..d3eca90f6d 100644 --- a/contrib/cube/CHANGES +++ b/contrib/cube/CHANGES @@ -89,7 +89,7 @@ cube_enlarge cube takes text input and returns a cube. This is useful for making cubes from computed strings. -cube_dim returns the number of dimensions stored in the the data structure +cube_dim returns the number of dimensions stored in the data structure for a cube. This is useful for constraints on the dimensions of a cube. cube_ll_coord returns the nth coordinate value for the lower left corner diff --git a/doc/src/sgml/pgbench.sgml b/doc/src/sgml/pgbench.sgml index 50c98b658f..98e3b12438 100644 --- a/doc/src/sgml/pgbench.sgml +++ b/doc/src/sgml/pgbench.sgml @@ -1,4 +1,4 @@ - + pgbench @@ -553,7 +553,7 @@ END; nnn is the PID of the pgbench process. If the -j option is 2 or higher, creating multiple worker threads, each will have its own log file. The first worker will use the - the same name for its log file as in the standard single worker case. + same name for its log file as in the standard single worker case. The additional log files for the other workers will be named pgbench_log.nnn.mmm, where mmm is a sequential number for each worker starting diff --git a/doc/src/sgml/pgfreespacemap.sgml b/doc/src/sgml/pgfreespacemap.sgml index f7263eef27..31d3b836a3 100644 --- a/doc/src/sgml/pgfreespacemap.sgml +++ b/doc/src/sgml/pgfreespacemap.sgml @@ -1,4 +1,4 @@ - + pg_freespacemap @@ -46,7 +46,7 @@ - Displays the the amount of free space on each page of the relation, + Displays the amount of free space on each page of the relation, according to the FSM. A set of (blkno bigint, avail int2) tuples is returned, one tuple for each page in the relation. diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index f29a2f093b..8f8f48dd64 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1,5 +1,5 @@ @@ -368,7 +368,7 @@ COPY count Input data is interpreted according to the current client encoding, - and output data is encoded in the the current client encoding, even + and output data is encoded in the current client encoding, even if the data does not pass through the client but is read from or written to a file directly by the server. diff --git a/src/backend/access/heap/README.HOT b/src/backend/access/heap/README.HOT index fb3e9d31ad..2f9162e52d 100644 --- a/src/backend/access/heap/README.HOT +++ b/src/backend/access/heap/README.HOT @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/heap/README.HOT,v 1.5 2010/02/08 04:33:52 tgl Exp $ +$PostgreSQL: pgsql/src/backend/access/heap/README.HOT,v 1.6 2010/04/23 23:21:44 rhaas Exp $ Heap Only Tuples (HOT) ====================== @@ -281,7 +281,7 @@ a "broken" chain that can't be indexed properly. To address this issue, regular (non-concurrent) CREATE INDEX makes the new index usable only by new transactions and transactions that don't -have snapshots older than the the CREATE INDEX command. This prevents +have snapshots older than the CREATE INDEX command. This prevents queries that can see the inconsistent HOT chains from trying to use the new index and getting incorrect results. Queries that can see the index can only see the rows that were visible after the index was created, diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index 1ae92e6fe8..88a0c74e32 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.9 2010/02/26 02:00:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.10 2010/04/23 23:21:44 rhaas Exp $ * * INTERFACE ROUTINES * visibilitymap_clear - clear a bit in the visibility map @@ -173,7 +173,7 @@ visibilitymap_clear(Relation rel, BlockNumber heapBlk) * On entry, *buf should be InvalidBuffer or a valid buffer returned by * an earlier call to visibilitymap_pin or visibilitymap_test on the same * relation. On return, *buf is a valid buffer with the map page containing - * the the bit for heapBlk. + * the bit for heapBlk. * * If the page doesn't exist in the map file yet, it is extended. */ @@ -247,7 +247,7 @@ visibilitymap_set(Relation rel, BlockNumber heapBlk, XLogRecPtr recptr, * On entry, *buf should be InvalidBuffer or a valid buffer returned by an * earlier call to visibilitymap_pin or visibilitymap_test on the same * relation. On return, *buf is a valid buffer with the map page containing - * the the bit for heapBlk, or InvalidBuffer. The caller is responsible for + * the bit for heapBlk, or InvalidBuffer. The caller is responsible for * releasing *buf after it's done testing and setting bits. */ bool diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 029d807079..e8a4fc2e93 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.18 2010/04/22 08:04:25 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.19 2010/04/23 23:21:44 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -382,7 +382,7 @@ ResolveRecoveryConflictWithLock(Oid dbOid, Oid relOid) * be cleared if the Startup process replays a transaction completion record. * If Startup process is also waiting then that is a deadlock. The deadlock * can occur if the query is waiting and then the Startup sleeps, or if - * Startup is sleeping and the the query waits on a lock. We protect against + * Startup is sleeping and the query waits on a lock. We protect against * only the former sequence here, the latter sequence is checked prior to * the query sleeping, in CheckRecoveryConflictDeadlock(). */ diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 25862470bd..bd723a0c74 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.183 2010/03/18 20:00:51 petere Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.184 2010/04/23 23:21:44 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -2545,7 +2545,7 @@ _becomeUser(ArchiveHandle *AH, const char *user) } /* - * Become the owner of the the given TOC entry object. If + * Become the owner of the given TOC entry object. If * changes in ownership are not allowed, this doesn't do anything. */ static void diff --git a/src/include/port.h b/src/include/port.h index b9197cdb9c..973ac940a1 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.131 2010/02/26 02:01:20 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.132 2010/04/23 23:21:44 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -126,7 +126,7 @@ extern BOOL AddUserToTokenDacl(HANDLE hToken); * - exactly two quote characters * - no special characters between the two quote characters, where special * is one of: &<>()@^| - * - there are one or more whitespace characters between the the two quote + * - there are one or more whitespace characters between the two quote * characters * - the string between the two quote characters is the name of an * executable file. diff --git a/src/tools/backend/backend_dirs.html b/src/tools/backend/backend_dirs.html index 9ce2bedfcb..a77cee96cf 100644 --- a/src/tools/backend/backend_dirs.html +++ b/src/tools/backend/backend_dirs.html @@ -63,7 +63,7 @@ href="../../backend/parser">parser - converts SQL query to query tree

This converts SQL queries coming from libpq into -command-specific structures to be used the the optimizer/executor, +command-specific structures to be used the optimizer/executor, or /commands routines. The SQL is lexically analyzed into keywords, identifiers, and constants, and passed to the parser. The parser creates command-specific structures to hold the elements of