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 8ac99219ec9f7392a851309ba43896ebfdbe62da..4460255376ea057eb1a9704931cb9e424efe3c8e 100644 (file)
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/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 ea8e3a20f83b411935ca7a5cbf9979eeacb3242f..70f6a564b24ad958d03edfa5723912d4c1320bef 100644 (file)
--- a/src/backend/access/heap/visibilitymap.c
+++ b/src/backend/access/heap/visibilitymap.c
@@ -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 790eee8521bdbc30114b009b0878e7bc2d6858f9..edd6ffe99b5c518195dce0dc7586cd41a77d0b80 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -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 */