Fix a few typos in comments in snapmgr.c, and sort header inclusions

alphabetically.

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 71a35bf6fa08924d0cf92be5e0e304bcc4c1d6f6..c0f6a97847e13e00315426f26c69db80b7b150f2 100644 (file)
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -23,20 +23,20 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/time/snapmgr.c,v 1.2 2008/05/12 20:02:02 alvherre Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/time/snapmgr.c,v 1.3 2008/07/11 00:00:29 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/xact.h"
 #include "access/transam.h"
+#include "access/xact.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
 #include "utils/memutils.h"
+#include "utils/memutils.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
-#include "utils/memutils.h"
 
 
 /*
@@ -70,7 +70,7 @@ TransactionId RecentGlobalXmin = FirstNormalTransactionId;
  *
  * Note that we keep refcounts both here and in SnapshotData.  This is because
  * the same snapshot may be registered more than once in a subtransaction, and
- * if a subxact aborts we want to be able to substract the correct amount of
+ * if a subxact aborts we want to be able to subtract the correct amount of
  * counts from SnapshotData.  (Another approach would be keeping one
  * RegdSnapshotElt each time a snapshot is registered, but that seems
  * unnecessary wastage.)
@@ -350,7 +350,7 @@ GetActiveSnapshot(void)
 
 /*
  * ActiveSnapshotSet
- *         Return whether there is at least one snapsho in the Active stack
+ *         Return whether there is at least one snapshot in the Active stack
  */
 bool
 ActiveSnapshotSet(void)
@@ -628,7 +628,7 @@ AtEOXact_Snapshot(bool isCommit)
    }
 
    /*
-    * And reset our state.  We don't need to free the memory explicitely --
+    * And reset our state.  We don't need to free the memory explicitly --
     * it'll go away with TopTransactionContext.
     */
    ActiveSnapshot = NULL;