From dc10387eb17fc0b342faad407d81008f60008a12 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Sun, 12 Nov 2006 06:55:54 +0000
Subject: [PATCH] Fix some typos in comments.

---
 src/backend/access/gin/ginbtree.c     |  8 ++++----
 src/backend/access/gin/gindatapage.c  | 16 ++++++++--------
 src/backend/access/gin/ginentrypage.c | 10 +++++-----
 src/backend/access/gin/ginget.c       |  6 +++---
 src/backend/access/gin/ginvacuum.c    | 14 +++++++-------
 src/backend/access/gist/gist.c        | 12 ++++++------
 src/backend/access/gist/gistget.c     |  4 ++--
 src/backend/commands/comment.c        |  4 ++--
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index fc44a5a0c7f..aee72990bce 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.5 2006/10/04 00:29:47 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.6 2006/11/12 06:55:53 neilc Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -38,7 +38,7 @@ ginTraverseLock(Buffer buffer, bool searchMode)
 			/* But root can become non-leaf during relock */
 			if (!GinPageIsLeaf(page))
 			{
-				/* resore old lock type (very rare) */
+				/* restore old lock type (very rare) */
 				LockBuffer(buffer, GIN_UNLOCK);
 				LockBuffer(buffer, GIN_SHARE);
 			}
@@ -263,7 +263,7 @@ findParents(GinBtree btree, GinBtreeStack *stack,
 }
 
 /*
- * Insert value (stored in GinBtree) to tree descibed by stack
+ * Insert value (stored in GinBtree) to tree described by stack
  */
 void
 ginInsertValue(GinBtree btree, GinBtreeStack *stack)
@@ -316,7 +316,7 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack)
 			Page		newlpage;
 
 			/*
-			 * newlpage is a pointer to memory page, it does'nt assosiates
+			 * newlpage is a pointer to memory page, it doesn't associate
 			 * with buffer, stack->buffer shoud be untouched
 			 */
 			newlpage = btree->splitPage(btree, stack->buffer, rbuffer, stack->off, &rdata);
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
index 94b07f3ed91..9c9712b4465 100644
--- a/src/backend/access/gin/gindatapage.c
+++ b/src/backend/access/gin/gindatapage.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.4 2006/10/04 00:29:47 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.5 2006/11/12 06:55:53 neilc Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -69,8 +69,8 @@ dataIsMoveRight(GinBtree btree, Page page)
 }
 
 /*
- * Find correct PostingItem in non-leaf page. It supposed that
- * page correctly choosen and searching value SHOULD be on page
+ * Find correct PostingItem in non-leaf page. It supposed that page
+ * correctly chosen and searching value SHOULD be on page
  */
 static BlockNumber
 dataLocateItem(GinBtree btree, GinBtreeStack *stack)
@@ -107,7 +107,7 @@ dataLocateItem(GinBtree btree, GinBtreeStack *stack)
 		if (mid == maxoff)
 
 			/*
-			 * Right infinity, page already correctly choosen with a help of
+			 * Right infinity, page already correctly chosen with a help of
 			 * dataIsMoveRight
 			 */
 			result = -1;
@@ -137,7 +137,7 @@ dataLocateItem(GinBtree btree, GinBtreeStack *stack)
 
 /*
  * Searches correct position for value on leaf page.
- * Page should be corrrectly choosen.
+ * Page should be correctly chosen.
  * Returns true if value found on page.
  */
 static bool
@@ -190,7 +190,7 @@ dataLocateLeafItem(GinBtree btree, GinBtreeStack *stack)
 }
 
 /*
- * Finds links to blkno on non-leaf page, retuns
+ * Finds links to blkno on non-leaf page, returns
  * offset of PostingItem
  */
 static OffsetNumber
@@ -236,7 +236,7 @@ dataFindChildPtr(GinBtree btree, Page page, BlockNumber blkno, OffsetNumber stor
 }
 
 /*
- * retunrs blkno of lefmost child
+ * returns blkno of leftmost child
  */
 static BlockNumber
 dataGetLeftMostPage(GinBtree btree, Page page)
@@ -252,7 +252,7 @@ dataGetLeftMostPage(GinBtree btree, Page page)
 }
 
 /*
- * add ItemPointer or PostingItem to page. data should points to
+ * add ItemPointer or PostingItem to page. data should point to
  * correct value! depending on leaf or non-leaf page
  */
 void
diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c
index 129c9550969..5dc3ac57b31 100644
--- a/src/backend/access/gin/ginentrypage.c
+++ b/src/backend/access/gin/ginentrypage.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.4 2006/10/04 00:29:47 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.5 2006/11/12 06:55:53 neilc Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -21,20 +21,20 @@
  * non-traditional layout. Tuple may contain posting list or
  * root blocknumber of posting tree. Macros GinIsPostingTre: (itup) / GinSetPostingTree(itup, blkno)
  * 1) Posting list
- *		- itup->t_info & INDEX_SIZE_MASK contains size of tuple as usial
+ *		- itup->t_info & INDEX_SIZE_MASK contains size of tuple as usual
  *		- ItemPointerGetBlockNumber(&itup->t_tid) contains original
  *		  size of tuple (without posting list).
  *		  Macroses: GinGetOrigSizePosting(itup) / GinSetOrigSizePosting(itup,n)
  *		- ItemPointerGetOffsetNumber(&itup->t_tid) contains number
  *		  of elements in posting list (number of heap itempointer)
  *		  Macroses: GinGetNPosting(itup) / GinSetNPosting(itup,n)
- *		- After usial part of tuple there is a posting list
+ *		- After usual part of tuple there is a posting list
  *		  Macros: GinGetPosting(itup)
  * 2) Posting tree
- *		- itup->t_info & INDEX_SIZE_MASK contains size of tuple as usial
+ *		- itup->t_info & INDEX_SIZE_MASK contains size of tuple as usual
  *		- ItemPointerGetBlockNumber(&itup->t_tid) contains block number of
  *		  root of posting tree
- *		- ItemPointerGetOffsetNumber(&itup->t_tid) contains magick number GIN_TREE_POSTING
+ *		- ItemPointerGetOffsetNumber(&itup->t_tid) contains magic number GIN_TREE_POSTING
  */
 IndexTuple
 GinFormTuple(GinState *ginstate, Datum key, ItemPointerData *ipd, uint32 nipd)
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index 090bbe4f256..09b78ac118c 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.3 2006/10/04 00:29:47 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.4 2006/11/12 06:55:53 neilc Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -389,7 +389,7 @@ scanGetItem(IndexScanDesc scan, ItemPointerData *item)
 				*item = key->curItem;
 		}
 		else
-			return FALSE;		/* finshed one of keys */
+			return FALSE;		/* finished one of keys */
 	}
 
 	for (i = 1; i <= so->nkeys; i++)
@@ -405,7 +405,7 @@ scanGetItem(IndexScanDesc scan, ItemPointerData *item)
 			else if (cmp > 0)
 			{
 				if (keyGetItem(scan->indexRelation, &so->ginstate, so->tempCtx, key) == TRUE)
-					return FALSE;		/* finshed one of keys */
+					return FALSE;		/* finished one of keys */
 			}
 			else
 			{					/* returns to begin */
diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
index e0718862c51..c3415ffe44f 100644
--- a/src/backend/access/gin/ginvacuum.c
+++ b/src/backend/access/gin/ginvacuum.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.7 2006/10/04 00:29:48 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.8 2006/11/12 06:55:53 neilc Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -34,9 +34,9 @@ typedef struct
 /*
  * Cleans array of ItemPointer (removes dead pointers)
  * Results are always stored in *cleaned, which will be allocated
- * if its needed. In case of *cleaned!=NULL caller is resposible to
+ * if its needed. In case of *cleaned!=NULL caller is responsible to
  * enough space. *cleaned and items may point to the same
- * memory addres.
+ * memory address.
  */
 
 static uint32
@@ -195,7 +195,7 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot,
 			MarkBufferDirty(buffer);
 			END_CRIT_SECTION();
 
-			/* if root is a leaf page, we don't desire futher processing */
+			/* if root is a leaf page, we don't desire further processing */
 			if (!isRoot && GinPageGetOpaque(page)->maxoff < FirstOffsetNumber)
 				hasVoidPage = TRUE;
 		}
@@ -459,7 +459,7 @@ ginVacuumPostingTree(GinVacuumState *gvs, BlockNumber rootBlkno)
 /*
  * returns modified page or NULL if page isn't modified.
  * Function works with original page until first change is occured,
- * then page is copied into temprorary one.
+ * then page is copied into temporary one.
  */
 static Page
 ginVacuumEntryPage(GinVacuumState *gvs, Buffer buffer, BlockNumber *roots, uint32 *nroot)
@@ -489,7 +489,7 @@ ginVacuumEntryPage(GinVacuumState *gvs, Buffer buffer, BlockNumber *roots, uint3
 		else if (GinGetNPosting(itup) > 0)
 		{
 			/*
-			 * if we already create temrorary page, we will make changes in
+			 * if we already create temporary page, we will make changes in
 			 * place
 			 */
 			ItemPointerData *cleaned = (tmppage == origpage) ? NULL : GinGetPosting(itup);
@@ -508,7 +508,7 @@ ginVacuumEntryPage(GinVacuumState *gvs, Buffer buffer, BlockNumber *roots, uint3
 				if (tmppage == origpage)
 				{
 					/*
-					 * On first difference we create temprorary page in memory
+					 * On first difference we create temporary page in memory
 					 * and copies content in to it.
 					 */
 					tmppage = GinPageGetCopyPage(origpage);
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 60d0affbfcf..987d8c702a8 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
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.143 2006/10/04 00:29:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.144 2006/11/12 06:55:53 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -360,8 +360,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate)
 			ptr->block.blkno = BufferGetBlockNumber(ptr->buffer);
 
 			/*
-			 * fill page, we can do it becouse all this pages are new (ie not
-			 * linked in tree or masked by temp page
+			 * fill page, we can do it because all these pages are new
+			 * (ie not linked in tree or masked by temp page
 			 */
 			data = (char *) (ptr->list);
 			for (i = 0; i < ptr->block.num; i++)
@@ -371,7 +371,7 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate)
 				data += IndexTupleSize((IndexTuple) data);
 			}
 
-			/* set up ItemPointer and remmeber it for parent */
+			/* set up ItemPointer and remember it for parent */
 			ItemPointerSetBlockNumber(&(ptr->itup->t_tid), ptr->block.blkno);
 			state->itup[state->ituplen] = ptr->itup;
 			state->ituplen++;
@@ -646,7 +646,7 @@ gistfindleaf(GISTInsertState *state, GISTSTATE *giststate)
 /*
  * Traverse the tree to find path from root page to specified "child" block.
  *
- * returns from the begining of closest parent;
+ * returns from the beginning of closest parent;
  *
  * To prevent deadlocks, this should lock only one page simultaneously.
  */
@@ -953,7 +953,7 @@ gistSplit(Relation r,
 	for (i = 0; i < v.splitVector.spl_nright; i++)
 		rvectup[i] = itup[v.splitVector.spl_right[i] - 1];
 
-	/* finalyze splitting (may need another split) */
+	/* finalize splitting (may need another split) */
 	if (!gistfitpage(rvectup, v.splitVector.spl_nright))
 	{
 		res = gistSplit(r, page, rvectup, v.splitVector.spl_nright, giststate);
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 68a4c18bb87..da5c5e85d77 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.61 2006/10/04 00:29:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.62 2006/11/12 06:55:53 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,7 +243,7 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids, int maxtids, b
 				n = OffsetNumberNext(n);
 		}
 
-		/* wonderfull, we can look at page */
+		/* wonderful, we can look at page */
 
 		for (;;)
 		{
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index df4416d37c2..2a4895cb971 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.92 2006/10/04 00:29:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.93 2006/11/12 06:55:54 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,7 @@
 /*
  * Static Function Prototypes --
  *
- * The following protoypes are declared static so as not to conflict
+ * The following prototypes are declared static so as not to conflict
  * with any other routines outside this module. These routines are
  * called by the public function CommentObject() routine to create
  * the appropriate comment for the specific object type.
-- 
GitLab