From e4704001ea4c3d63b53e8783859ff598ef2f69e5 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 10 Mar 2003 22:28:22 +0000
Subject: [PATCH] This patch fixes a bunch of spelling mistakes in comments
 throughout the PostgreSQL source code.

Neil Conway
---
 contrib/dbase/dbf2pg.c                |  2 +-
 contrib/fulltextindex/fti.c           |  2 +-
 contrib/fuzzystrmatch/fuzzystrmatch.c |  6 +++---
 contrib/intagg/int_aggregate.c        |  4 ++--
 contrib/intarray/_int.c               |  8 ++++----
 contrib/ltree/ltxtquery_io.c          |  2 +-
 contrib/oid2name/oid2name.c           |  2 +-
 contrib/pgcrypto/random.c             |  4 ++--
 contrib/spi/moddatetime.c             |  6 +++---
 contrib/string/string_io.c            |  2 +-
 contrib/tablefunc/tablefunc.c         | 16 ++++++++--------
 contrib/tsearch/morph.c               |  2 +-
 contrib/tsearch/query.c               |  4 ++--
 contrib/tsearch/rewrite.c             |  2 +-
 src/backend/access/gist/gist.c        |  6 +++---
 src/backend/access/hash/hashovfl.c    |  4 ++--
 src/backend/access/hash/hashstrat.c   |  4 ++--
 src/backend/access/transam/xact.c     |  6 +++---
 src/backend/commands/comment.c        |  8 ++++----
 src/backend/port/beos/sem.c           |  8 ++++----
 src/backend/utils/adt/formatting.c    | 16 ++++++++--------
 src/backend/utils/adt/name.c          |  4 ++--
 src/backend/utils/adt/pg_lzcompress.c |  8 ++++----
 src/backend/utils/adt/varlena.c       |  4 ++--
 src/backend/utils/mb/conv.c           |  4 ++--
 src/backend/utils/mb/encnames.c       |  6 +++---
 src/backend/utils/mb/mbutils.c        | 10 +++++-----
 src/backend/utils/misc/database.c     |  4 ++--
 src/bin/pg_dump/pg_backup_archiver.c  |  6 +++---
 src/bin/pg_dump/pg_dump.c             |  4 ++--
 src/bin/psql/common.c                 |  4 ++--
 src/bin/psql/stringutils.c            |  4 ++--
 src/include/catalog/pg_am.h           |  4 ++--
 src/include/catalog/pg_amop.h         |  4 ++--
 src/include/catalog/pg_attrdef.h      |  4 ++--
 src/include/catalog/pg_attribute.h    |  4 ++--
 src/include/catalog/pg_class.h        |  4 ++--
 src/include/catalog/pg_constraint.h   |  4 ++--
 src/include/catalog/pg_database.h     |  4 ++--
 src/include/catalog/pg_description.h  |  6 +++---
 src/include/catalog/pg_group.h        |  4 ++--
 src/include/catalog/pg_index.h        |  4 ++--
 src/include/catalog/pg_inherits.h     |  4 ++--
 src/include/catalog/pg_language.h     |  4 ++--
 src/include/catalog/pg_largeobject.h  |  4 ++--
 src/include/catalog/pg_listener.h     |  4 ++--
 src/include/catalog/pg_opclass.h      |  4 ++--
 src/include/catalog/pg_operator.h     |  4 ++--
 src/include/catalog/pg_proc.h         |  4 ++--
 src/include/catalog/pg_rewrite.h      |  4 ++--
 src/include/catalog/pg_statistic.h    |  4 ++--
 src/include/catalog/pg_trigger.h      |  2 +-
 src/include/catalog/pg_version.h      |  4 ++--
 src/include/commands/comment.h        |  2 +-
 src/include/port/solaris.h            |  4 ++--
 src/include/storage/off.h             |  4 ++--
 src/interfaces/ecpg/include/sqlca.h   |  2 +-
 src/interfaces/ecpg/preproc/ecpg.c    |  4 ++--
 src/interfaces/libpq/fe-auth.c        |  4 ++--
 src/interfaces/libpq/fe-connect.c     |  4 ++--
 src/interfaces/libpq/fe-exec.c        |  6 +++---
 src/interfaces/libpq/libpq-fe.h       |  4 ++--
 src/interfaces/python/pgmodule.c      |  2 +-
 src/pl/plpython/plpython.c            |  6 +++---
 64 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c
index abf04dfa28..5f67383725 100644
--- a/contrib/dbase/dbf2pg.c
+++ b/contrib/dbase/dbf2pg.c
@@ -199,7 +199,7 @@ usage(void)
 }
 
 /* patch submitted by Jeffrey Y. Sue <jysue@aloha.net> */
-/* Provides functionallity for substituting dBase-fieldnames for others */
+/* Provides functionality for substituting dBase-fieldnames for others */
 /* Mainly for avoiding conflicts between fieldnames and SQL-reserved */
 /* keywords */
 
diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index 7620c0640c..4c5705ba74 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -83,7 +83,7 @@
  *	 nothing in it, then re-populate the fti-table)
  *
  *	 can we do something with operator overloading or a seperate function
- *	 that can build the final query automatigally?
+ *	 that can build the final query automagically?
  */
 
 #define MAX_FTI_QUERY_LENGTH 8192
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index fbb16f66b3..0358fb2b66 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -76,7 +76,7 @@ levenshtein(PG_FUNCTION_ARGS)
 	/*
 	 * Restrict the length of the strings being compared to something
 	 * reasonable because we will have to perform rows * cols
-	 * calcualtions. If longer strings need to be compared, increase
+	 * calculations. If longer strings need to be compared, increase
 	 * MAX_LEVENSHTEIN_STRLEN to suit (but within your tolerance for speed
 	 * and memory usage).
 	 */
@@ -250,7 +250,7 @@ metaphone(PG_FUNCTION_ARGS)
  *------------------------------------------------------------------*/
 
 /* I suppose I could have been using a character pointer instead of
- * accesssing the array directly... */
+ * accessing the array directly... */
 
 /* Look at the next letter in the word */
 #define Next_Letter (toupper((unsigned char) word[w_idx+1]))
@@ -421,7 +421,7 @@ _metaphone(
 		 w_idx++)
 	{
 		/*
-		 * How many letters to skip because an eariler encoding handled
+		 * How many letters to skip because an earlier encoding handled
 		 * multiple letters
 		 */
 		unsigned short int skip_letter = 0;
diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index fc08137d4d..1c14e7c2db 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -191,7 +191,7 @@ int_agg_state(PG_FUNCTION_ARGS)
 }
 
 /* This is the final function used for the integer aggregator. It returns all the integers
- * collected as a one dimentional integer array */
+ * collected as a one dimensional integer array */
 Datum
 int_agg_final_array(PG_FUNCTION_ARGS)
 {
@@ -225,7 +225,7 @@ int_enum(PG_FUNCTION_ARGS)
 		/* Allocate a working context */
 		pc = (CTX *) palloc(sizeof(CTX));
 
-		/* Don't copy atribute if you don't need too */
+		/* Don't copy attribute if you don't need too */
 		if (VARATT_IS_EXTENDED(p))
 		{
 			/* Toasted!!! */
diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c
index 325d504d84..199a39adc9 100644
--- a/contrib/intarray/_int.c
+++ b/contrib/intarray/_int.c
@@ -133,7 +133,7 @@ typedef ArrayType *(*formarray) (ArrayType *, ArrayType *);
 typedef void (*formfloat) (ArrayType *, float *);
 
 /*
-** usefull function
+** useful function
 */
 static bool isort(int4 *a, const int len);
 static ArrayType *new_intArrayType(int num);
@@ -446,7 +446,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
 	lenin = ARRNELEMS(in);
 
 	if (lenin < 2 * MAXNUMRANGE || ISLEAFKEY(in))
-	{							/* not comressed value */
+	{							/* not compressed value */
 		if (in != (ArrayType *) DatumGetPointer(entry->key))
 		{
 			retval = palloc(sizeof(GISTENTRY));
@@ -1642,7 +1642,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
@@ -1747,7 +1747,7 @@ pushquery(WORKSTATE * state, int4 type, int4 val)
 #define STACKDEPTH	16
 
 /*
- * make polish notaion of query
+ * make polish notation of query
  */
 static int4
 makepol(WORKSTATE * state)
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index e9be1621d6..c07abaa228 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -38,7 +38,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 155d54e707..d6cb526a1a 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -50,7 +50,7 @@ void		sql_exec_dumptable(PGconn *, int);
 void		sql_exec_searchtable(PGconn *, const char *);
 void		sql_exec_searchoid(PGconn *, int);
 
-/* fuction to parse command line options and check for some usage errors. */
+/* function to parse command line options and check for some usage errors. */
 void
 get_opts(int argc, char **argv, struct options * my_opts)
 {
diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c
index ce5f838a0c..7984aee915 100644
--- a/contrib/pgcrypto/random.c
+++ b/contrib/pgcrypto/random.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: random.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
+ * $Id: random.c,v 1.6 2003/03/10 22:28:17 tgl Exp $
  */
 
 
@@ -115,7 +115,7 @@ px_get_random_bytes(uint8 *dst, unsigned count)
 
 	/*
 	 * OpenSSL random should re-feeded occasionally. From /dev/urandom
-	 * preferrably.
+	 * preferably.
 	 */
 
 	res = RAND_bytes(dst, count);
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 4bc06d51be..21e71e166c 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -2,7 +2,7 @@
 moddatetime.c
 
 What is this?
-It is a function to be called from a trigger for the perpose of updating
+It is a function to be called from a trigger for the purpose of updating
 a modification datetime stamp in a record when that record is UPDATEd.
 
 Credits
@@ -70,14 +70,14 @@ moddatetime(PG_FUNCTION_ARGS)
 								Int32GetDatum(-1));
 
 	/*
-	 * This gets the position in the turple of the field we want. args[0]
+	 * This gets the position in the tuple of the field we want. args[0]
 	 * being the name of the field to update, as passed in from the
 	 * trigger.
 	 */
 	attnum = SPI_fnumber(tupdesc, args[0]);
 
 	/*
-	 * This is were we check to see if the feild we are suppost to update
+	 * This is were we check to see if the field we are supposed to update
 	 * even exits.	The above function must return -1 if name not found?
 	 */
 	if (attnum < 0)
diff --git a/contrib/string/string_io.c b/contrib/string/string_io.c
index fdc6da1915..059dfa0894 100644
--- a/contrib/string/string_io.c
+++ b/contrib/string/string_io.c
@@ -166,7 +166,7 @@ string_output(unsigned char *data, int size)
  *
  * This function accepts a C string in input and copies it into a new
  * object allocated with palloc() translating all escape sequences.
- * An optional header can be allocatd before the string, for example
+ * An optional header can be allocated before the string, for example
  * to hold the length of a varlena object.
  * This function is not necessary for input from sql commands because
  * the parser already does escape translation, all data input routines
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 6b502dda00..a6d63fc942 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -44,7 +44,7 @@ static bool compatCrosstabTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
 static bool compatConnectbyTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
 static void get_normal_pair(float8 *x1, float8 *x2);
 static TupleDesc make_crosstab_tupledesc(TupleDesc spi_tupdesc,
-						int num_catagories);
+						int num_categories);
 static Tuplestorestate *connectby(char *relname,
 		  char *key_fld,
 		  char *parent_key_fld,
@@ -373,9 +373,9 @@ crosstab(PG_FUNCTION_ARGS)
 				elog(ERROR, "Wrong number of arguments specified for function");
 			else
 			{
-				int			num_catagories = PG_GETARG_INT32(1);
+				int			num_categories = PG_GETARG_INT32(1);
 
-				tupdesc = make_crosstab_tupledesc(spi_tupdesc, num_catagories);
+				tupdesc = make_crosstab_tupledesc(spi_tupdesc, num_categories);
 			}
 		}
 		else if (functyptype == 'b')
@@ -1034,7 +1034,7 @@ compatCrosstabTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 }
 
 static TupleDesc
-make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
+make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_categories)
 {
 	Form_pg_attribute sql_attr;
 	Oid			sql_atttypid;
@@ -1046,10 +1046,10 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
 
 	/*
 	 * We need to build a tuple description with one column for the
-	 * rowname, and num_catagories columns for the values. Each must be of
+	 * rowname, and num_categories columns for the values. Each must be of
 	 * the same type as the corresponding spi result input column.
 	 */
-	natts = num_catagories + 1;
+	natts = num_categories + 1;
 	tupdesc = CreateTemplateTupleDesc(natts, false);
 
 	/* first the rowname column */
@@ -1063,11 +1063,11 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_catagories)
 	TupleDescInitEntry(tupdesc, attnum, attname, sql_atttypid,
 					   -1, 0, false);
 
-	/* now the catagory values columns */
+	/* now the category values columns */
 	sql_attr = spi_tupdesc->attrs[2];
 	sql_atttypid = sql_attr->atttypid;
 
-	for (i = 0; i < num_catagories; i++)
+	for (i = 0; i < num_categories; i++)
 	{
 		attnum++;
 
diff --git a/contrib/tsearch/morph.c b/contrib/tsearch/morph.c
index 3acbef9862..2455a72d8d 100644
--- a/contrib/tsearch/morph.c
+++ b/contrib/tsearch/morph.c
@@ -187,7 +187,7 @@ lemmatize(char *word, int *len, int type)
 				int			oldlen = *len;
 				char	   *newword = (*(dict->lemmatize)) (dictobjs[nd], word, len);
 
-				/* word is recognized by distionary */
+				/* word is recognized by dictionary */
 				if (newword != word || *len != oldlen)
 				{
 					if (dict->is_stemstoplemm &&
diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c
index 9d5e126c5b..8253787320 100644
--- a/contrib/tsearch/query.c
+++ b/contrib/tsearch/query.c
@@ -79,7 +79,7 @@ typedef struct
 	char	   *buf;
 	int4		state;
 	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
+	/* reverse polish notation in list (for temporary usage) */
 	NODE	   *str;
 	/* number in str */
 	int4		num;
@@ -247,7 +247,7 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval)
 
 #define STACKDEPTH	32
 /*
- * make polish notaion of query
+ * make polish notation of query
  */
 static int4
 makepol(QPRS_STATE * state, void (*pushval) (QPRS_STATE *, int, char *, int))
diff --git a/contrib/tsearch/rewrite.c b/contrib/tsearch/rewrite.c
index 33e948faf8..6cd3cb14e7 100644
--- a/contrib/tsearch/rewrite.c
+++ b/contrib/tsearch/rewrite.c
@@ -116,7 +116,7 @@ freetree(NODE * node)
 
 /*
  * clean tree for ! operator.
- * It's usefull for debug, but in
+ * It's useful for debug, but in
  * other case, such view is used with search in index.
  * Operator ! always return TRUE
  */
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 56a5c6fb60..cba57dc503 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.101 2003/02/24 00:57:17 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.102 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -465,7 +465,7 @@ gistlayerinsert(Relation r, BlockNumber blkno,
 		/*
 		 * After this call: 1. if child page was splited, then itup
 		 * contains keys for each page 2. if  child page wasn't splited,
-		 * then itup contains additional for adjustement of current key
+		 * then itup contains additional for adjustment of current key
 		 */
 		ret = gistlayerinsert(r, nblkno, itup, len, res, giststate);
 
@@ -551,7 +551,7 @@ gistlayerinsert(Relation r, BlockNumber blkno,
 			ItemPointerSet(&((*res)->pointerData), blkno, l);
 
 		if (*len > 1)
-		{						/* previos insert ret & SPLITED != 0 */
+		{						/* previous insert ret & SPLITED != 0 */
 			int			i;
 
 			/*
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index b5198dbb1d..1e2df0aee0 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.33 2002/06/20 20:29:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.34 2003/03/10 22:28:18 tgl Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -452,7 +452,7 @@ _hash_initbitmap(Relation rel,
 /*
  *	_hash_squeezebucket(rel, bucket)
  *
- *	Try to squeeze the tuples onto pages occuring earlier in the
+ *	Try to squeeze the tuples onto pages occurring earlier in the
  *	bucket chain in an attempt to free overflow pages. When we start
  *	the "squeezing", the page from which we start taking tuples (the
  *	"read" page) is the last bucket in the bucket chain and the page
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 75133d69b8..4fc8667ada 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -1,14 +1,14 @@
 /*-------------------------------------------------------------------------
  *
  * hashstrat.c
- *	  Srategy map entries for the hash indexed access method
+ *	  Strategy map entries for the hash indexed access method
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.21 2002/06/20 20:29:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.22 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 7150569a22..0506e4801a 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.141 2003/01/10 22:03:27 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.142 2003/03/10 22:28:18 tgl Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -91,7 +91,7 @@
  *				CommitTransactionBlock
  *				AbortTransactionBlock
  *
- *		These are invoked only in responce to a user "BEGIN WORK", "COMMIT",
+ *		These are invoked only in response to a user "BEGIN WORK", "COMMIT",
  *		or "ROLLBACK" command.  The tricky part about these functions
  *		is that they are called within the postgres main loop, in between
  *		the StartTransactionCommand() and CommitTransactionCommand().
@@ -236,7 +236,7 @@ static void *_RollbackData = NULL;
  *	SetTransactionFlushEnabled()
  *
  *	These are used to test and set the "TransactionFlushState"
- *	varable.  If this variable is true (the default), then
+ *	variable.  If this variable is true (the default), then
  *	the system will flush all dirty buffers to disk at the end
  *	of each transaction.   If false then we are assuming the
  *	buffer pool resides in stable main memory, in which case we
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index bff639cf26..4176cf3cfd 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1996-2001, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.61 2002/10/09 16:26:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.62 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -389,7 +389,7 @@ CommentAttribute(List *qualname, char *comment)
  *
  * This routine is used to add/drop any user-comments a user might
  * have regarding the specified database. The routine will check
- * security for owner permissions, and, if succesful, will then
+ * security for owner permissions, and, if successful, will then
  * attempt to find the oid of the database specified. Once found,
  * a comment is added/dropped using the CreateComments() routine.
  */
@@ -427,7 +427,7 @@ CommentDatabase(List *qualname, char *comment)
  *
  * This routine is used to add/drop any user-comments a user might
  * have regarding the specified namespace. The routine will check
- * security for owner permissions, and, if succesful, will then
+ * security for owner permissions, and, if successful, will then
  * attempt to find the oid of the namespace specified. Once found,
  * a comment is added/dropped using the CreateComments() routine.
  */
@@ -579,7 +579,7 @@ CommentRule(List *qualname, char *comment)
  * have regarding a TYPE. The type is specified by name
  * and, if found, and the user has appropriate permissions, a
  * comment will be added/dropped using the CreateComments() routine.
- * The type's name and the comments are the paramters to this routine.
+ * The type's name and the comments are the parameters to this routine.
  */
 static void
 CommentType(List *typename, char *comment)
diff --git a/src/backend/port/beos/sem.c b/src/backend/port/beos/sem.c
index f1d2c1c63f..71598fcc4c 100644
--- a/src/backend/port/beos/sem.c
+++ b/src/backend/port/beos/sem.c
@@ -99,7 +99,7 @@ semctl(int semId, int semNum, int flag, union semun semun)
 		return 1;
 	}
 
-	/* Get the last pid which accesed the sem */
+	/* Get the last pid which accessed the sem */
 	if (flag == GETPID)
 	{
 		TRACEDBG("->semctl getpid");
@@ -191,7 +191,7 @@ semget(int semKey, int semNum, int flags)
 	/* find area */
 	parea = find_area(Nom);
 
-	/* Test of area existance */
+	/* Test of area existence */
 	if (parea != B_NAME_NOT_FOUND)
 	{
 		/* Area exist and creation is requested, error */
@@ -221,7 +221,7 @@ semget(int semKey, int semNum, int flags)
 
 			/*
 			 * Limit to 250 (8 byte per sem : 4 for the semid and 4 for
-			 * the last pid which acceced the semaphore in a pool
+			 * the last pid which accessed the semaphore in a pool
 			 */
 			if (semNum > 250)
 			{
@@ -293,7 +293,7 @@ semop(int semId, struct sembuf * sops, int nsops)
 		if (sops[i].sem_op < 0)
 		{
 			/*
-			 * Try acuiring the semaphore till we are not inteerupted by a
+			 * Try acquiring the semaphore till we are not interrupted by a
 			 * signal
 			 */
 			if (sops[i].sem_flg == IPC_NOWAIT)
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index bebccbdfdc..6a5f0af138 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.57 2002/11/08 20:23:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.58 2003/03/10 22:28:18 tgl Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2002, PostgreSQL Global Development Group
@@ -264,7 +264,7 @@ typedef struct
 	int			pre,			/* (count) numbers before decimal */
 				post,			/* (count) numbers after decimal  */
 				lsign,			/* want locales sign		  */
-				flag,			/* number parametrs		  */
+				flag,			/* number parameters		  */
 				pre_lsign_num,	/* tmp value for lsign		  */
 				multi,			/* multiplier for 'V'		  */
 				zero_start,		/* position of first zero	  */
@@ -488,7 +488,7 @@ static KeySuffix DCH_suff[] = {
  * it is not good.
  *
  * (!)
- *	 - Position for the keyword is simular as position in the enum DCH/NUM_poz.
+ *	 - Position for the keyword is similar as position in the enum DCH/NUM_poz.
  * (!)
  *
  * For fast search is used the 'int index[]', index is ascii table from position
@@ -776,7 +776,7 @@ static int	DCH_index[KeyWord_INDEX_SIZE] = {
 /*
 0	1	2	3	4	5	6	7	8	9
 */
-	/*---- first 0..31 chars are skiped ----*/
+	/*---- first 0..31 chars are skipped ----*/
 
 	-1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -838,9 +838,9 @@ typedef struct NUMProc
 				read_post;		/* to_number - number of dec. digit */
 
 	char	   *number,			/* string with number	*/
-			   *number_p,		/* pointer to current number pozition */
+			   *number_p,		/* pointer to current number position */
 			   *inout,			/* in / out buffer	*/
-			   *inout_p,		/* pointer to current inout pozition */
+			   *inout_p,		/* pointer to current inout position */
 			   *last_relevant,	/* last relevant number after decimal
 								 * point */
 
@@ -3753,7 +3753,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 		else
 		{
 			/*
-			 * Write Decinal point
+			 * Write Decimal point
 			 */
 			if (*Np->number_p == '.')
 			{
@@ -3934,7 +3934,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
 			{
 				Np->sign_pos = Np->num_count + (Np->num_pre ? 1 : 0);
 
-				if (IS_DECIMAL(Np->Num))		/* decimal point correctio */
+				if (IS_DECIMAL(Np->Num))		/* decimal point correction */
 					++Np->sign_pos;
 			}
 			else if (IS_ZERO(Np->Num) && Np->num_pre > Np->Num->zero_start)
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 154a2067ec..746254add5 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.42 2003/02/09 06:56:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.43 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ namein(PG_FUNCTION_ARGS)
 	int			len;
 	char	   *ermsg;
 
-	/* veryfy encoding */
+	/* verify encoding */
 	len = strlen(s);
 	if ((ermsg = pg_verifymbstr(s, len)))
 		elog(ERROR, "%s", ermsg);
diff --git a/src/backend/utils/adt/pg_lzcompress.c b/src/backend/utils/adt/pg_lzcompress.c
index a22c57cb4c..cf42f4f3a6 100644
--- a/src/backend/utils/adt/pg_lzcompress.c
+++ b/src/backend/utils/adt/pg_lzcompress.c
@@ -1,7 +1,7 @@
 /* ----------
  * pg_lzcompress.c -
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_lzcompress.c,v 1.16 2002/11/23 03:59:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_lzcompress.c,v 1.17 2003/03/10 22:28:18 tgl Exp $
  *
  *		This is an implementation of LZ compression for PostgreSQL.
  *		It uses a simple history table and generates 2-3 byte tags
@@ -98,7 +98,7 @@
  *			makes total limits of 1-4095 for offset and 3-273 for length.
  *
  *			Now that we have successfully decoded a tag. We simply copy
- *			the output that occured <offset> bytes back to the current
+ *			the output that occurred <offset> bytes back to the current
  *			output location in the specified <length>. Thus, a
  *			sequence of 200 spaces (think about bpchar fields) could be
  *			coded in 4 bytes. One literal space and a three byte tag to
@@ -419,7 +419,7 @@ pglz_find_match(PGLZ_HistEntry **hstart, char *input, char *end,
 		 * bytes, it's worth the call overhead to use memcmp() to check if
 		 * this match is equal for the same size. After that we must
 		 * fallback to character by character comparison to know the exact
-		 * position where the diff occured.
+		 * position where the diff occurred.
 		 */
 		thislen = 0;
 		if (len >= 16)
@@ -783,7 +783,7 @@ pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate)
 		/*
 		 * This decompression method saves time only, if we stop near the
 		 * beginning of the data (maybe because we're called by a
-		 * comparision function and a difference occurs early). Otherwise,
+		 * comparison function and a difference occurs early). Otherwise,
 		 * all the checks, needed here, cause too much overhead.
 		 *
 		 * Thus we decompress the entire rest at once into the temporary
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index e98a2dfe0e..974e7f8fc6 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.94 2002/12/06 05:20:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.95 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1663,7 +1663,7 @@ byteacmp(PG_FUNCTION_ARGS)
 
 /*
  * replace_text
- * replace all occurences of 'old_sub_str' in 'orig_str'
+ * replace all occurrences of 'old_sub_str' in 'orig_str'
  * with 'new_sub_str' to form 'new_str'
  *
  * returns 'orig_str' if 'old_sub_str' == '' or 'orig_str' == ''
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index a41f9abe9d..0337692d88 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.43 2002/09/04 20:31:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.44 2003/03/10 22:28:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -335,7 +335,7 @@ compare2(const void *p1, const void *p2)
  * UTF-8 ---> local code
  *
  * utf: input UTF-8 string. Its length is limited by "len" parameter
- *		or a null terminater.
+ *		or a null terminator.
  * iso: pointer to the output.
  * map: the conversion map.
  * size: the size of the conversion map.
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
index dc6623b09c..7c62d8c4ab 100644
--- a/src/backend/utils/mb/encnames.c
+++ b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
  * Encoding names and routines for work with it. All
  * in this file is shared bedween FE and BE.
  *
- * $Id: encnames.c,v 1.11 2002/12/05 23:21:07 momjian Exp $
+ * $Id: encnames.c,v 1.12 2003/03/10 22:28:18 tgl Exp $
  */
 #ifdef FRONTEND
 #include "postgres_fe.h"
@@ -25,7 +25,7 @@
 /* ----------
  * All encoding names, sorted:		 *** A L P H A B E T I C ***
  *
- * All names must be without irrelevan chars, search routines use
+ * All names must be without irrelevant chars, search routines use
  * isalnum() chars only. It means ISO-8859-1, iso_8859-1 and Iso8859_1
  * are always converted to 'iso88591'. All must be lower case.
  *
@@ -52,7 +52,7 @@ pg_encname	pg_encname_tbl[] =
 	{
 		"eucjp", PG_EUC_JP
 	},							/* EUC-JP; Extended UNIX Code fixed Width
-								 * for Japanese, stdandard OSF */
+								 * for Japanese, standard OSF */
 	{
 		"euckr", PG_EUC_KR
 	},							/* EUC-KR; Extended Unix Code for Korean ,
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 560dffa858..588aefc61c 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.38 2003/02/19 14:31:26 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.39 2003/03/10 22:28:18 tgl Exp $
  */
 #include "postgres.h"
 
@@ -41,7 +41,7 @@ static int cliplen(const unsigned char *str, int len, int limit);
 static bool need_to_init_client_encoding = -1;
 
 /*
- * Set the client encoding and save fmgrinfo for the converion
+ * Set the client encoding and save fmgrinfo for the conversion
  * function if necessary. if encoding conversion between client/server
  * encoding is not supported, returns -1
 */
@@ -60,7 +60,7 @@ SetClientEncoding(int encoding, bool doit)
 	if (!PG_VALID_FE_ENCODING(encoding))
 		return (-1);
 
-	/* If we cannot actualy set client encoding info, remeber it
+	/* If we cannot actually set client encoding info, remember it
 	 * so that we could set it using InitializeClientEncoding()
 	 * in InitPostgres()
 	 */
@@ -164,7 +164,7 @@ pg_get_client_encoding_name(void)
  * warn and returns src. We cannot raise an error, since it will cause
  * an infinit loop in error message sending.
  *
- * In the case of no coversion, src is returned.
+ * In the case of no conversion, src is returned.
  *
  * XXX We assume that storage for converted result is 4-to-1 growth in
  * the worst case. The rate for currently supported encoding pares are within 3
@@ -281,7 +281,7 @@ pg_convert2(PG_FUNCTION_ARGS)
 		elog(ERROR, "Encoding conversion failed");
 
 	/*
-	 * build text data type structre. we cannot use textin() here, since
+	 * build text data type structure. we cannot use textin() here, since
 	 * textin assumes that input string encoding is same as database
 	 * encoding.
 	 */
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 8cf5879922..981d7ea7dc 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.54 2002/11/08 20:23:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.55 2003/03/10 22:28:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,7 @@ static bool PhonyHeapTupleSatisfiesNow(HeapTupleHeader tuple);
  * pg_database.datpath) to a full absolute path for further consumption.
  * NULL means an error, which the caller should process. One reason for
  * such an error would be an absolute alternative path when no absolute
- * paths are alllowed.
+ * paths are allowed.
  */
 
 char *
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index d91f630b70..1ef3f371f4 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.69 2003/03/09 19:38:52 tgl Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.70 2003/03/10 22:28:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1661,7 +1661,7 @@ _discoverArchiveFormat(ArchiveHandle *AH)
 	if (fseeko(fh, 0, SEEK_SET) != 0)
 	{
 		/*
-		 * NOTE: Formats that use the looahead buffer can unset this in
+		 * NOTE: Formats that use the lookahead buffer can unset this in
 		 * their Init routine.
 		 */
 		AH->readHeader = 1;
@@ -2030,7 +2030,7 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt)
 	if (ropt->dataOnly)
 		res = res & REQ_DATA;
 
-	/* Mask it if we don't have a schema contribition */
+	/* Mask it if we don't have a schema contribution */
 	if (!te->defn || strlen(te->defn) == 0)
 		res = res & ~REQ_SCHEMA;
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1bea9cf509..41c7a66762 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.318 2003/02/13 22:56:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.319 2003/03/10 22:28:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -932,7 +932,7 @@ dumpClasses_nodumpData(Archive *fout, char *oid, void *dctxv)
 		 * select(0, NULL, NULL, NULL, &tvi);
 		 *
 		 * This will return after the interval specified in the structure
-		 * tvi. Fianally, call gettimeofday again to save the 'last sleep
+		 * tvi. Finally, call gettimeofday again to save the 'last sleep
 		 * time'.
 		 */
 	}
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index b7aa0a3ba2..0caaf1ef64 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.55 2003/02/21 21:34:27 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.56 2003/03/10 22:28:19 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -153,7 +153,7 @@ psql_error(const char *fmt,...)
 
 
 /*
- * for backend Notice mesages (INFO, WARNING, etc)
+ * for backend Notice messages (INFO, WARNING, etc)
  */
 void
 NoticeProcessor(void *arg, const char *message)
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index 0401c92718..b6ecf114fe 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.31 2002/10/19 00:22:14 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.32 2003/03/10 22:28:19 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -39,7 +39,7 @@ static void strip_quotes(char *source, char quote, char escape, int encoding);
  * Characters in 'delim', if any, will be returned as single-character
  * tokens unless part of a quoted token.
  *
- * Double occurences of the quoting character are always taken to represent
+ * Double occurrences of the quoting character are always taken to represent
  * a single quote character in the data.  If escape isn't 0, then escape
  * followed by anything (except \0) is a data character too.
  *
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index 3ee7121812..0807fb1a39 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_am.h,v 1.24 2003/02/22 00:45:05 tgl Exp $
+ * $Id: pg_am.h,v 1.25 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -23,7 +23,7 @@
 #define PG_AM_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 21228c8ca3..445033ecd0 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -16,7 +16,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_amop.h,v 1.46 2002/06/20 20:29:43 momjian Exp $
+ * $Id: pg_amop.h,v 1.47 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	 the genbki.sh script reads this file and generates .bki
@@ -28,7 +28,7 @@
 #define PG_AMOP_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index 3d39911d83..20ddc7181e 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attrdef.h,v 1.13 2002/07/15 16:33:32 tgl Exp $
+ * $Id: pg_attrdef.h,v 1.14 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_ATTRDEF_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index e23f793bc7..c2d07e822a 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.100 2002/09/22 19:42:51 tgl Exp $
+ * $Id: pg_attribute.h,v 1.101 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -25,7 +25,7 @@
 #define PG_ATTRIBUTE_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 0843cbf6fc..715f24c8d1 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.74 2002/09/22 19:42:52 tgl Exp $
+ * $Id: pg_class.h,v 1.75 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_CLASS_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index 80ff185579..ebbf96f619 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_constraint.h,v 1.5 2002/11/15 02:50:10 momjian Exp $
+ * $Id: pg_constraint.h,v 1.6 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_CONSTRAINT_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index bc21d33753..fbdcd6f4a6 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_database.h,v 1.27 2002/09/03 21:45:43 petere Exp $
+ * $Id: pg_database.h,v 1.28 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_DATABASE_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h
index abe61d49bc..87e4698e36 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_description.h,v 1.17 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_description.h,v 1.18 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -37,7 +37,7 @@
 #define PG_DESCRIPTION_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
@@ -64,7 +64,7 @@ CATALOG(pg_description) BKI_WITHOUT_OIDS
 typedef FormData_pg_description *Form_pg_description;
 
 /* ----------------
- *		compiler constants for pg_descrpition
+ *		compiler constants for pg_description
  * ----------------
  */
 #define Natts_pg_description			4
diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h
index c90ede8f72..e8da8a54c7 100644
--- a/src/include/catalog/pg_group.h
+++ b/src/include/catalog/pg_group.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_group.h,v 1.15 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_group.h,v 1.16 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -19,7 +19,7 @@
 #define PG_GROUP_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 092487b7c9..ecdce77f17 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_index.h,v 1.29 2002/09/03 01:04:41 tgl Exp $
+ * $Id: pg_index.h,v 1.30 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_INDEX_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 14fc9f05bf..a1618710ff 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inherits.h,v 1.14 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_inherits.h,v 1.15 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_INHERITS_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 48d9c42c27..259bef62f1 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_language.h,v 1.20 2002/09/04 20:31:37 momjian Exp $
+ * $Id: pg_language.h,v 1.21 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_LANGUAGE_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h
index bc11b5f924..25372509a0 100644
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_largeobject.h,v 1.13 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_largeobject.h,v 1.14 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_LARGEOBJECT_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index 1931a0ce6f..db68815be0 100644
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_listener.h,v 1.13 2002/06/20 20:29:44 momjian Exp $
+ * $Id: pg_listener.h,v 1.14 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -19,7 +19,7 @@
 #define PG_LISTENER_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index e4884b7941..bedd9d72e0 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -26,7 +26,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.46 2002/09/04 20:31:37 momjian Exp $
+ * $Id: pg_opclass.h,v 1.47 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -38,7 +38,7 @@
 #define PG_OPCLASS_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index c97003cf43..9470e55598 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.110 2002/09/18 21:35:23 tgl Exp $
+ * $Id: pg_operator.h,v 1.111 2003/03/10 22:28:19 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -25,7 +25,7 @@
 #include "nodes/pg_list.h"
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index e1d98d5510..01fb540daf 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.285 2003/03/03 03:30:46 tgl Exp $
+ * $Id: pg_proc.h,v 1.286 2003/03/10 22:28:20 tgl Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -26,7 +26,7 @@
 #include "nodes/pg_list.h"
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index e6a3fe7a29..d7316e55fe 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_rewrite.h,v 1.19 2002/06/20 20:29:49 momjian Exp $
+ * $Id: pg_rewrite.h,v 1.20 2003/03/10 22:28:21 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -23,7 +23,7 @@
 #define PG_REWRITE_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 8a596d8bd4..8c8806a159 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_statistic.h,v 1.18 2002/09/04 20:31:42 momjian Exp $
+ * $Id: pg_statistic.h,v 1.19 2003/03/10 22:28:21 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -20,7 +20,7 @@
 #define PG_STATISTIC_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 9eb58ef73a..30c15f5093 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -16,7 +16,7 @@
 #define PG_TRIGGER_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index bcfcc2ceb1..b02f88c603 100644
--- a/src/include/catalog/pg_version.h
+++ b/src/include/catalog/pg_version.h
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_version.h,v 1.15 2002/06/20 20:29:49 momjian Exp $
+ * $Id: pg_version.h,v 1.16 2003/03/10 22:28:21 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -27,7 +27,7 @@
 #define PG_VERSION_H
 
 /* ----------------
- *		postgres.h contains the system type definintions and the
+ *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *		can be read by both genbki.sh and the C compiler.
  * ----------------
diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index 0972c13486..1b2ac3e614 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -17,7 +17,7 @@
 /*------------------------------------------------------------------
  * Function Prototypes --
  *
- * The following protoypes define the public functions of the comment
+ * The following prototypes define the public functions of the comment
  * related routines.  CommentObject() implements the SQL "COMMENT ON"
  * command.  DeleteComments() deletes all comments for an object.
  * CreateComments creates (or deletes, if comment is NULL) a comment
diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h
index cdffb61e90..c723cd6f37 100644
--- a/src/include/port/solaris.h
+++ b/src/include/port/solaris.h
@@ -1,10 +1,10 @@
-/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.7 2001/11/05 17:46:35 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/include/port/solaris.h,v 1.8 2003/03/10 22:28:21 tgl Exp $ */
 
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 
 /*
- * Sort this out for all operting systems some time.  The __xxx
+ * Sort this out for all operating systems some time.  The __xxx
  * symbols are defined on both GCC and Solaris CC, although GCC
  * doesn't document them.  The __xxx__ symbols are only on GCC.
  */
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 2b825ae3a4..921683850e 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.14 2002/06/20 20:29:52 momjian Exp $
+ * $Id: off.h,v 1.15 2003/03/10 22:28:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ typedef uint16 OffsetNumber;
  * OffsetNumberPrev
  *		Increments/decrements the argument.  These macros look pointless
  *		but they help us disambiguate the different manipulations on
- *		OffsetNumbers (e.g., sometimes we substract one from an
+ *		OffsetNumbers (e.g., sometimes we subtract one from an
  *		OffsetNumber to move back, and sometimes we do so to form a
  *		real C array index).
  */
diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h
index 63296348de..0927f0a4d4 100644
--- a/src/interfaces/ecpg/include/sqlca.h
+++ b/src/interfaces/ecpg/include/sqlca.h
@@ -43,7 +43,7 @@ struct sqlca
 	/* stored into a host variable.				*/
 
 	/*
-	 * 2: if 'W' a (hopefully) non-fatal notice occured
+	 * 2: if 'W' a (hopefully) non-fatal notice occurred
 	 */	/* 3: empty */
 	/* 4: empty						*/
 	/* 5: empty						*/
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 567abfa159..b09b1f7c41 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -1,8 +1,8 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.60 2003/02/14 13:17:13 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.61 2003/03/10 22:28:21 tgl Exp $ */
 
 /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
 /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
-/* Placed under the same license as PostgresSQL */
+/* Placed under the same license as PostgreSQL */
 
 #include "postgres_fe.h"
 
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index e5f742e888..4ac99fd76a 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.73 2003/01/29 01:18:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.74 2003/03/10 22:28:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -270,7 +270,7 @@ pg_an_to_ln(char *aname)
 
 
 /*
- * Various krb5 state which is not connection specfic, and a flag to
+ * Various krb5 state which is not connection specific, and a flag to
  * indicate whether we have initialised it yet.
  */
 static int	pg_krb5_initialised;
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 32ef6e115a..d7188adf95 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.224 2003/02/19 14:31:26 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.225 2003/03/10 22:28:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -210,7 +210,7 @@ char *PasswordFromFile(char *hostname, char *port, char *dbname,
  * If it is desired to connect in a synchronous (blocking) manner, use the
  * function PQconnectdb.
  *
- * To connect in an asychronous (non-blocking) manner, use the functions
+ * To connect in an asynchronous (non-blocking) manner, use the functions
  * PQconnectStart, and PQconnectPoll.
  *
  * Internally, the static functions connectDBStart, connectDBComplete
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index bc18aeaf08..878da94cff 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.125 2003/02/19 03:59:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.126 2003/03/10 22:28:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -787,7 +787,7 @@ PQsendQuery(PGconn *conn, const char *query)
 
 		/*
 		 * give the data a push, ignore the return value as ConsumeInput()
-		 * will do any aditional flushing if needed
+		 * will do any additional flushing if needed
 		 */
 		pqFlush(conn);
 	}
@@ -1448,7 +1448,7 @@ PQexec(PGconn *conn, const char *query)
 				pqCatenateResultError(lastResult, result->errMsg);
 				PQclear(result);
 				result = lastResult;
-				/* Make sure PQerrorMessage agrees with catenated result */
+				/* Make sure PQerrorMessage agrees with concatenated result */
 				resetPQExpBuffer(&conn->errorMessage);
 				appendPQExpBufferStr(&conn->errorMessage, result->errMsg);
 			}
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 338cf18385..f3be00ab62 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.87 2002/11/10 00:14:22 momjian Exp $
+ * $Id: libpq-fe.h,v 1.88 2003/03/10 22:28:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -264,7 +264,7 @@ extern void PQfreeNotify(PGnotify *notify);
 extern int	PQsendQuery(PGconn *conn, const char *query);
 extern PGresult *PQgetResult(PGconn *conn);
 
-/* Routines for managing an asychronous query */
+/* Routines for managing an asynchronous query */
 extern int	PQisBusy(PGconn *conn);
 extern int	PQconsumeInput(PGconn *conn);
 
diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c
index c14c57011d..f0194ed0e1 100644
--- a/src/interfaces/python/pgmodule.c
+++ b/src/interfaces/python/pgmodule.c
@@ -1498,7 +1498,7 @@ pgconnect(pgobject * self, PyObject * args, PyObject * dict)
 		return NULL;
 
 #ifdef DEFAULT_VARS
-	/* handles defaults variables (for unintialised vars) */
+	/* handles defaults variables (for uninitialised vars) */
 	if ((!pghost) && (pg_default_host != Py_None))
 		pghost = PyString_AsString(pg_default_host);
 
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 82570ce0dc..544b7e3db6 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.30 2003/02/13 23:06:15 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.31 2003/03/10 22:28:22 tgl Exp $
  *
  *********************************************************************
  */
@@ -644,8 +644,8 @@ PLy_modify_tuple(PLyProcedure * proc, PyObject * pltd, TriggerData *tdata,
 						   modvalues, modnulls);
 
 	/*
-	 * FIXME -- these leak if not explicity pfree'd by other elog calls,
-	 * no?
+	 * FIXME -- these leak if not explicitly pfree'd by other elog
+	 * calls, no?
 	 */
 	pfree(modattrs);
 	pfree(modvalues);
-- 
2.11.0