Fix a few errors in comments. Patch by Fujii Masao, plus the one in

visibilitymap.c by me.

diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 01f1b1fa38a666d1568f37088f44682f2b30d857..bbfb58e69a2d374e7282b399b01d107cbc365b4e 100644 (file)
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.23 2009/06/11 14:48:51 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.24 2009/06/18 10:08:08 heikki Exp $
  *
  *
  * pg_standby.c
@@ -448,7 +448,7 @@ CheckForExternalTrigger(void)
        /*
         * Turn it into a "smart" trigger by truncating the file. Otherwise if
         * the server asks us again to restore a segment that was restored
-        * restored already, we would return "not found" and upset the server.
+        * already, we would return "not found" and upset the server.
         */
        if (ftruncate(fd, 0) < 0)
        {

diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
index d425e772b96b20642d4b23e8241bc6d3d794fa37..3fc26bea8b5b22a780e991a4c52ba38238f523af 100644 (file)
--- 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.4 2009/06/11 14:48:54 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.5 2009/06/18 10:08:08 heikki Exp $
  *
  * INTERFACE ROUTINES
  *     visibilitymap_clear - clear a bit in the visibility map
@@ -98,8 +98,8 @@
 
 /*
  * Size of the bitmap on each visibility map page, in bytes. There's no
- * extra headers, so the whole page minus except for the standard page header
- * is used for the bitmap.
+ * extra headers, so the whole page minus the standard page header is
+ * used for the bitmap.
  */
 #define MAPSIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData))
 

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 2ed386a222614729ed94e890af6bc7f4211c9cc4..43e912f5cff3a044e40e7a2c3e0c50b42355dcff 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.567 2009/06/11 14:49:02 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.568 2009/06/18 10:08:08 heikki Exp $
  *
  * NOTES
  *   this is the "main" module of the postgres backend and
@@ -2924,8 +2924,8 @@ PostgresMain(int argc, char *argv[], const char *username)
     *  If the databasename is omitted it is taken to be the user name.
     *
     *  When started from the postmaster, the format is
-    *      postgres [secure switches] -p databasename [insecure switches]
-    *  Switches appearing after -p came from the client (via "options"
+    *      postgres [secure switches] -y databasename [insecure switches]
+    *  Switches appearing after -y came from the client (via "options"
     *  field of connection request).  For security reasons we restrict
     *  what these switches can do.
     * ----------------
@@ -2938,7 +2938,7 @@ PostgresMain(int argc, char *argv[], const char *username)
        argc--;
    }
 
-   /* all options are allowed until '-p' */
+   /* all options are allowed until '-y' */
    secure = true;
    ctx = PGC_POSTMASTER;
    gucsource = PGC_S_ARGV;     /* initial switches came from command line */