summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHeikki Linnakangas2015-05-20 13:18:11 +0000
committerHeikki Linnakangas2015-05-20 13:56:22 +0000
commit4fc72cc7bb9d2105261b8ee45558af50d788cd19 (patch)
tree57f1b8dda880693ac01ead8945ad18734e24677f /contrib
parentf6a54fefc299b933052885bb0532c476d382cc71 (diff)
Collection of typo fixes.
Use "a" and "an" correctly, mostly in comments. Two error messages were also fixed (they were just elogs, so no translation work required). Two function comments in pg_proc.h were also fixed. Etsuro Fujita reported one of these, but I found a lot more with grep. Also fix a few other typos spotted while grepping for the a/an typos. For example, "consists out of ..." -> "consists of ...". Plus a "though"/ "through" mixup reported by Euler Taveira. Many of these typos were in old code, which would be nice to backpatch to make future backpatching easier. But much of the code was new, and I didn't feel like crafting separate patches for each branch. So no backpatching.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/isn/isn.c2
-rw-r--r--contrib/pg_buffercache/pg_buffercache_pages.c2
-rw-r--r--contrib/spi/timetravel.c2
-rw-r--r--contrib/test_decoding/expected/decoding_in_xact.out2
-rw-r--r--contrib/test_decoding/specs/ondisk_startup.spec2
-rw-r--r--contrib/test_decoding/sql/decoding_in_xact.sql2
6 files changed, 6 insertions, 6 deletions
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 5fbd253491a..40398245f6d 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -511,7 +511,7 @@ str2ean(const char *num)
}
/*
- * ean2string --- Try to convert an ean13 number to an hyphenated string.
+ * ean2string --- Try to convert an ean13 number to a hyphenated string.
* Assumes there's enough space in result to hold
* the string (maximum MAXEAN13LEN+1 bytes)
* This doesn't verify for a valid check digit.
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index 98016fc365e..761c277c63b 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -142,7 +142,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
LWLockAcquire(BufMappingPartitionLockByIndex(i), LW_SHARED);
/*
- * Scan though all the buffers, saving the relevant fields in the
+ * Scan through all the buffers, saving the relevant fields in the
* fctx->record structure.
*/
for (i = 0; i < NBuffers; i++)
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index e125986c2b3..5a345841c6a 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -51,7 +51,7 @@ static EPlan *find_plan(char *ident, EPlan **eplan, int *nplans);
* and all other column values as in new tuple, and insert tuple
* with old data and stop_date eq current date
* ELSE - skip updation of tuple.
- * 2. IF an delete affects tuple with stop_date eq INFINITY
+ * 2. IF a delete affects tuple with stop_date eq INFINITY
* then insert the same tuple with stop_date eq current date
* [ and delete_user eq current user ]
* ELSE - skip deletion of tuple.
diff --git a/contrib/test_decoding/expected/decoding_in_xact.out b/contrib/test_decoding/expected/decoding_in_xact.out
index 456840886aa..ab4d3aee723 100644
--- a/contrib/test_decoding/expected/decoding_in_xact.out
+++ b/contrib/test_decoding/expected/decoding_in_xact.out
@@ -11,7 +11,7 @@ SELECT txid_current() = 0;
SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
ERROR: cannot create logical replication slot in transaction that has performed writes
ROLLBACK;
--- fail because we're creating a slot while in an subxact whose topxact has a xid
+-- fail because we're creating a slot while in a subxact whose topxact has an xid
BEGIN;
SELECT txid_current() = 0;
?column?
diff --git a/contrib/test_decoding/specs/ondisk_startup.spec b/contrib/test_decoding/specs/ondisk_startup.spec
index 39c4a223aee..82237056392 100644
--- a/contrib/test_decoding/specs/ondisk_startup.spec
+++ b/contrib/test_decoding/specs/ondisk_startup.spec
@@ -36,7 +36,7 @@ step "s3txid" { BEGIN ISOLATION LEVEL REPEATABLE READ; SELECT txid_current() IS
step "s3c" { COMMIT; }
# Force usage of ondisk snapshot by starting and not finishing a
-# transaction with a assigned xid after consistency has been
+# transaction with an assigned xid after consistency has been
# reached. In combination with a checkpoint forcing a snapshot to be
# written and a new restart point computed that'll lead to the usage
# of the snapshot.
diff --git a/contrib/test_decoding/sql/decoding_in_xact.sql b/contrib/test_decoding/sql/decoding_in_xact.sql
index 990f61885e7..b524eb9a6e0 100644
--- a/contrib/test_decoding/sql/decoding_in_xact.sql
+++ b/contrib/test_decoding/sql/decoding_in_xact.sql
@@ -7,7 +7,7 @@ SELECT txid_current() = 0;
SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
ROLLBACK;
--- fail because we're creating a slot while in an subxact whose topxact has a xid
+-- fail because we're creating a slot while in a subxact whose topxact has an xid
BEGIN;
SELECT txid_current() = 0;
SAVEPOINT barf;