Fix typos in code comments and test data

The typos in 005_negotiate_encryption.pl and pg_combinebackup.c
shall be backported to v17 where they were introduced.

Backpatch-through: v17
Discussion: https://postgr.es/m/[email protected]

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 5cdd2f10fc8aade7e8f6a490216a1d1efffe9003..71d2ab8b49f6872ae710f473af7e30b3443a362d 100644 (file)
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -4741,7 +4741,7 @@ RelationCopyStorageUsingBuffer(RelFileLocator srclocator,
    bstrategy_src = GetAccessStrategy(BAS_BULKREAD);
    bstrategy_dst = GetAccessStrategy(BAS_BULKWRITE);
 
-   /* Initalize streaming read */
+   /* Initialize streaming read */
    p.blocknum = 0;
    p.nblocks = nblocks;
    src_smgr = smgropen(srclocator, INVALID_PROC_NUMBER);

diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c
index 05a2ff905b0b77ddc5281ac2721f9dacd1f2ce91..6183d3171510d9bd398f062e53d3e6cd9c31a0a7 100644 (file)
--- a/src/bin/pg_combinebackup/pg_combinebackup.c
+++ b/src/bin/pg_combinebackup/pg_combinebackup.c
@@ -849,7 +849,7 @@ process_directory_recursively(Oid tsoid,
     *
     * We set is_pg_wal for the toplevel WAL directory and all of its
     * subdirectories, because those files are not included in the backup
-    * manifest and hence need special treatement. (Since incremental backup
+    * manifest and hence need special treatment. (Since incremental backup
     * does not exist in pre-v10 versions, we don't have to worry about the
     * old pg_xlog naming.)
     *

diff --git a/src/interfaces/libpq/t/005_negotiate_encryption.pl b/src/interfaces/libpq/t/005_negotiate_encryption.pl
index 157f23b8e831bae8cf8a35bb14655564e1bb6e56..73f0056f10c58cb682e930e1420764f98cd1eab8 100644 (file)
--- a/src/interfaces/libpq/t/005_negotiate_encryption.pl
+++ b/src/interfaces/libpq/t/005_negotiate_encryption.pl
@@ -240,7 +240,7 @@ testuser    disable      disable      postgres       connect, authok
 .           .            require      postgres       connect, sslreject          -> fail
 .           .            .            direct         connect, directsslreject    -> fail
 
-# sslnegotiation=direct is not acccepted unless sslmode=require or stronger
+# sslnegotiation=direct is not accepted unless sslmode=require or stronger
 *           *            disable      direct         -     -> fail
 *           *            allow        direct         -     -> fail
 *           *            prefer       direct         -     -> fail
@@ -303,7 +303,7 @@ nossluser   .            disable      postgres       connect, authok
 .           .            require      postgres       connect, sslaccept, authfail                    -> fail
 .           .            require      direct         connect, directsslaccept, authfail              -> fail
 
-# sslnegotiation=direct is not acccepted unless sslmode=require or stronger
+# sslnegotiation=direct is not accepted unless sslmode=require or stronger
 *           *            disable      direct         -     -> fail
 *           *            allow        direct         -     -> fail
 *           *            prefer       direct         -     -> fail
@@ -405,7 +405,7 @@ nogssuser   disable      disable      postgres       connect, authok
 .           .            require      postgres       connect, gssaccept, authfail -> fail   # If both GSSAPI and sslmode are required, and GSS is not available -> fail
 .           .            .            direct         connect, gssaccept, authfail -> fail   # If both GSSAPI and sslmode are required, and GSS is not available -> fail
 
-# sslnegotiation=direct is not acccepted unless sslmode=require or stronger
+# sslnegotiation=direct is not accepted unless sslmode=require or stronger
 *           *            disable      direct         -     -> fail
 *           *            allow        direct         -     -> fail
 *           *            prefer       direct         -     -> fail
@@ -562,7 +562,7 @@ nossluser   disable      disable      postgres       connect, authok
 .           require      *            postgres       connect, gssaccept, authok   -> gss
 .           .            require      direct         connect, gssaccept, authok   -> gss
 
-# sslnegotiation=direct is not acccepted unless sslmode=require or stronger
+# sslnegotiation=direct is not accepted unless sslmode=require or stronger
 *           *            disable      direct         -     -> fail
 *           *            allow        direct         -     -> fail
 *           *            prefer       direct         -     -> fail