diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c
index f50ee9d29f..34d73ad442 100644
--- a/contrib/amcheck/verify_heapam.c
+++ b/contrib/amcheck/verify_heapam.c
@@ -1009,7 +1009,7 @@ check_tuple_header(HeapCheckContext *ctx)
  * TOAST tuples -- are eligible for pruning.
  *
  * Sets *xmin_commit_status_ok to true if the commit status of xmin is known
- * and false otherwise. If it's set to true, then also set *xid_commit_status
+ * and false otherwise. If it's set to true, then also set *xmin_commit_status
  * to the actual commit status.
  */
 static bool
diff --git a/contrib/pg_walinspect/pg_walinspect.c b/contrib/pg_walinspect/pg_walinspect.c
index e4dbf15e05..e6f18e1c64 100644
--- a/contrib/pg_walinspect/pg_walinspect.c
+++ b/contrib/pg_walinspect/pg_walinspect.c
@@ -401,7 +401,7 @@ GetWALBlockInfo(FunctionCallInfo fcinfo, XLogReaderState *record,
 							 values, nulls);
 	}
 
-#undef PG_GET_WAL_FPI_BLOCK_COLS
+#undef PG_GET_WAL_BLOCK_INFO_COLS
 }
 
 /*
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 75d93d6ead..da32d503bc 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -1686,7 +1686,7 @@ pgfdw_abort_cleanup(ConnCacheEntry *entry, bool toplevel)
  *
  * Returns true if the abort command or cancel request is successfully issued,
  * false otherwise.  If the abort command is successfully issued, the given
- * connection cache entry is appended to *pending_entries.  Othewise, if the
+ * connection cache entry is appended to *pending_entries.  Otherwise, if the
  * cancel request is successfully issued, it is appended to *cancel_requested.
  */
 static bool
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index d728bd70b3..95dbe8b06c 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -5016,7 +5016,7 @@ postgresGetAnalyzeInfoForForeignTable(Relation relation, bool *can_tablesample)
 			pgfdw_report_error(ERROR, res, conn, false, sql.data);
 
 		if (PQntuples(res) != 1 || PQnfields(res) != 2)
-			elog(ERROR, "unexpected result from deparseAnalyzeTuplesSql query");
+			elog(ERROR, "unexpected result from deparseAnalyzeInfoSql query");
 		reltuples = strtod(PQgetvalue(res, 0, 0), NULL);
 		relkind = *(PQgetvalue(res, 0, 1));
 	}
diff --git a/meson.build b/meson.build
index f1db5455b0..096044628c 100644
--- a/meson.build
+++ b/meson.build
@@ -2963,7 +2963,7 @@ endif
 # generation happens during install, so that's not a real issue.
 nls_mo_targets = []
 if libintl.found() and meson.version().version_compare('>=0.60')
-  # use range() to avoid the flattening of the list that forech() would do
+  # use range() to avoid the flattening of the list that foreach() would do
   foreach off : range(0, nls_targets.length())
     # i18n.gettext() list containing 1) list of built .mo files 2) maintainer
     # -pot target 3) maintainer -pot target
diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
index 6efdefb591..5baea7535b 100644
--- a/src/backend/backup/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -254,7 +254,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink)
 
 	total_checksum_failures = 0;
 
-	/* Allocate backup related varilables. */
+	/* Allocate backup related variables. */
 	backup_state = (BackupState *) palloc0(sizeof(BackupState));
 	tablespace_map = makeStringInfo();
 
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 5ce8a0831b..872cbd454d 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -1403,7 +1403,7 @@ GetResultRTEPermissionInfo(ResultRelInfo *relinfo, EState *estate)
 }
 
 /*
- * GetResultRelCheckAsUser
+ * ExecGetResultRelCheckAsUser
  *		Returns the user to modify passed-in result relation as
  *
  * The user is chosen by looking up the relation's or, if a child table, its
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 3a67389508..5b596f1e7a 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -904,7 +904,7 @@ ExecInsert(ModifyTableContext *context,
 			 * If these are the first tuples stored in the buffers, add the
 			 * target rel and the mtstate to the
 			 * es_insert_pending_result_relations and
-			 * es_insert_pending_modifytables lists respectively, execpt in
+			 * es_insert_pending_modifytables lists respectively, except in
 			 * the case where flushing was done above, in which case they
 			 * would already have been added to the lists, so no need to do
 			 * this.
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index d28d0da621..52b3f77078 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -343,7 +343,7 @@ contains_multiexpr_param(Node *node, void *context)
  * the RTEs in 'src_rtable' to now point to the perminfos' indexes in
  * *dst_perminfos.
  *
- * Note that this changes both 'dst_rtable' and 'dst_perminfo' destructively,
+ * Note that this changes both 'dst_rtable' and 'dst_perminfos' destructively,
  * so the caller should have better passed safe-to-modify copies.
  */
 void
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index ee6244f9bc..1fa689052e 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -2046,7 +2046,7 @@ ExtendBufferedRelShared(ExtendBufferedWhat eb,
 	io_start = pgstat_prepare_io_time();
 
 	/*
-	 * Note: if smgzerorextend fails, we will end up with buffers that are
+	 * Note: if smgrzeroextend fails, we will end up with buffers that are
 	 * allocated but not marked BM_VALID.  The next relation extension will
 	 * still select the same block number (because the relation didn't get any
 	 * longer on disk) and so future attempts to extend the relation will find
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 23461b46f6..203b189559 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -164,7 +164,7 @@
  *		PredicateLockPage(Relation relation, BlockNumber blkno,
  *						Snapshot snapshot)
  *		PredicateLockTID(Relation relation, ItemPointer tid, Snapshot snapshot,
- *						 TransactionId insert_xid)
+ *						 TransactionId tuple_xid)
  *		PredicateLockPageSplit(Relation relation, BlockNumber oldblkno,
  *							   BlockNumber newblkno)
  *		PredicateLockPageCombine(Relation relation, BlockNumber oldblkno,
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index f1316eb4ce..e982a8dd7f 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -597,7 +597,7 @@ mdzeroextend(SMgrRelation reln, ForkNumber forknum,
 			/*
 			 * Even if we don't want to use fallocate, we can still extend a
 			 * bit more efficiently than writing each 8kB block individually.
-			 * pg_pwrite_zeroes() (via FileZero()) uses
+			 * pg_pwrite_zeros() (via FileZero()) uses
 			 * pg_pwritev_with_retry() to avoid multiple writes or needing a
 			 * zeroed buffer for the whole length of the extension.
 			 */
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 8f7522d103..c5a6babccc 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -4825,7 +4825,7 @@ RoleMembershipCacheCallback(Datum arg, int cacheid, uint32 hashvalue)
  * Get a list of roles that the specified roleid is a member of
  *
  * Type ROLERECURSE_MEMBERS recurses through all grants; ROLERECURSE_PRIVS
- * recurses only through inheritable grants; and ROLERECURSE_SETROLe recurses
+ * recurses only through inheritable grants; and ROLERECURSE_SETROLE recurses
  * only through grants with set_option.
  *
  * Since indirect membership testing is relatively expensive, we cache
@@ -5020,7 +5020,7 @@ member_can_set_role(Oid member, Oid role)
 }
 
 /*
- * Permission violation eror unless able to SET ROLE to target role.
+ * Permission violation error unless able to SET ROLE to target role.
  */
 void
 check_can_set_role(Oid member, Oid role)
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c
index 33e2b98307..171fdc67bb 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -1043,7 +1043,7 @@ array_agg_array_combine(PG_FUNCTION_ARGS)
 		state1->nitems += state2->nitems;
 
 		state1->dims[0] += state2->dims[0];
-		/* remaing dims already match, per test above */
+		/* remaining dims already match, per test above */
 
 		Assert(state1->array_type == state2->array_type);
 		Assert(state1->element_type == state2->element_type);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 7d3b20168a..9dd624b3ae 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1387,7 +1387,7 @@ check_GUC_name_for_parameter_acl(const char *name)
  *
  * This performs two sanity checks.  First, it checks that the initial
  * value of a GUC is the same when declared and when loaded to prevent
- * anybody looking at the C declarations of these GUCS from being fooled by
+ * anybody looking at the C declarations of these GUCs from being fooled by
  * mismatched values.  Second, it checks for incorrect flag combinations.
  *
  * The following validation rules apply for the values:
@@ -6272,7 +6272,7 @@ ProcessGUCArray(ArrayType *array, ArrayType *usersetArray,
 			userSetDatum = BoolGetDatum(false);
 
 		/*
-		 * USER SET values are appliciable only for PGC_USERSET parameters. We
+		 * USER SET values are applicable only for PGC_USERSET parameters. We
 		 * use InvalidOid as role in order to evade possible privileges of the
 		 * current user.
 		 */
@@ -6365,8 +6365,8 @@ GUCArrayAdd(ArrayType *array, ArrayType **usersetArray,
 				}
 
 				/*
-				 * Recheck permissons if we found an option without USER SET
-				 * flag while we're setting an optionn with USER SET flag.
+				 * Recheck permissions if we found an option without USER SET
+				 * flag while we're setting an option with USER SET flag.
 				 */
 				if (!currentUserSet && user_set)
 					(void) validate_option_array_item(name, value,
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 3894a017f3..104c01d966 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -87,7 +87,7 @@ static size_t ps_buffer_cur_len;	/* nominal strlen(ps_buffer) */
 static size_t ps_buffer_fixed_size; /* size of the constant prefix */
 
 /*
- * Length of ps_buffer before the suffix was appeneded to the end, or 0 if we
+ * Length of ps_buffer before the suffix was appended to the end, or 0 if we
  * didn't set a suffix.
  */
 static size_t ps_buffer_nosuffix_len;
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 88f97ea246..42b90e4d4f 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -1382,7 +1382,7 @@ MemoryContextAllocAligned(MemoryContext context,
 	alloc_size = size + PallocAlignedExtraBytes(alignto);
 
 #ifdef MEMORY_CONTEXT_CHECKING
-	/* ensure there's space for a sentinal byte */
+	/* ensure there's space for a sentinel byte */
 	alloc_size += 1;
 #endif
 
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index 4357dd0870..7dec652106 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -521,7 +521,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 	{
 		/*
 		 * Abort failed buffer IO. AbortBufferIO()->TerminateBufferIO() calls
-		 * ResourceOwnerForgetBufferIOs(), so we just have to iterate till
+		 * ResourceOwnerForgetBufferIO(), so we just have to iterate till
 		 * there are none.
 		 *
 		 * Needs to be before we release buffer pins.
diff --git a/src/bin/pg_dump/compress_lz4.c b/src/bin/pg_dump/compress_lz4.c
index 5aca9c1f06..423e1b7976 100644
--- a/src/bin/pg_dump/compress_lz4.c
+++ b/src/bin/pg_dump/compress_lz4.c
@@ -342,7 +342,7 @@ LZ4Stream_get_error(CompressFileHandle *CFH)
 /*
  * Initialize an already alloc'ed LZ4State struct for subsequent calls.
  *
- * Creates the necessary contexts for either compresion or decompression. When
+ * Creates the necessary contexts for either compression or decompression. When
  * compressing data (indicated by compressing=true), it additionally writes the
  * LZ4 header in the output stream.
  *
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 8266c117a3..745578d855 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -137,7 +137,7 @@ static const int dbObjectTypePriority[] =
 	PRIO_DEFAULT_ACL,			/* DO_DEFAULT_ACL */
 	PRIO_TRANSFORM,				/* DO_TRANSFORM */
 	PRIO_LARGE_OBJECT,			/* DO_LARGE_OBJECT */
-	PRIO_LARGE_OBJECT_DATA,		/* DO_LARGE_OJECT_DATA */
+	PRIO_LARGE_OBJECT_DATA,		/* DO_LARGE_OBJECT_DATA */
 	PRIO_PRE_DATA_BOUNDARY,		/* DO_PRE_DATA_BOUNDARY */
 	PRIO_POST_DATA_BOUNDARY,	/* DO_POST_DATA_BOUNDARY */
 	PRIO_EVENT_TRIGGER,			/* DO_EVENT_TRIGGER */
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index cd421c5944..7b7acc8044 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1923,7 +1923,7 @@ dumpTimestamp(const char *msg)
 }
 
 /*
- * Helper function for rolenamehash hash table.
+ * Helper function for rolename_hash hash table.
  */
 static uint32
 hash_string_pointer(char *s)
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index 46101899ae..4788c313a7 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -71,7 +71,7 @@ $node->issues_sql_like(
 	'vacuumdb --no-process-main');
 $node->command_fails(
 	[ 'vacuumdb', '--analyze-only', '--no-process-main', 'postgres' ],
-	'--analyze-only and --no-process_main specified together');
+	'--analyze-only and --no-process-main specified together');
 $node->issues_sql_like(
 	[ 'vacuumdb', '--no-process-toast', 'postgres' ],
 	qr/statement: VACUUM \(PROCESS_TOAST FALSE, SKIP_DATABASE_STATS\).*;/,
diff --git a/src/include/access/rmgrdesc_utils.h b/src/include/access/rmgrdesc_utils.h
index e09b112674..bd414699f2 100644
--- a/src/include/access/rmgrdesc_utils.h
+++ b/src/include/access/rmgrdesc_utils.h
@@ -63,4 +63,4 @@ extern void offset_elem_desc(StringInfo buf, void *offset, void *data);
 extern void redirect_elem_desc(StringInfo buf, void *offset, void *data);
 extern void oid_elem_desc(StringInfo buf, void *relid, void *data);
 
-#endif							/* RMGRDESC_UTILS_H */
+#endif							/* RMGRDESC_UTILS_H_ */
diff --git a/src/include/port/pg_iovec.h b/src/include/port/pg_iovec.h
index 2a0e2c0123..689799c425 100644
--- a/src/include/port/pg_iovec.h
+++ b/src/include/port/pg_iovec.h
@@ -36,7 +36,7 @@ struct iovec
 #define PG_IOV_MAX Min(IOV_MAX, 32)
 
 /*
- * Note that pg_preadv and pg_writev have a pg_ prefix as a warning that the
+ * Note that pg_preadv and pg_pwritev have a pg_ prefix as a warning that the
  * Windows implementations have the side-effect of changing the file position.
  */
 
diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h
index bedee1e9ca..af0fe97c79 100644
--- a/src/include/regex/regcustom.h
+++ b/src/include/regex/regcustom.h
@@ -44,7 +44,7 @@
 
 #include "mb/pg_wchar.h"
 
-#include "miscadmin.h"			/* needed by stacktoodeep */
+#include "miscadmin.h"			/* needed by rstacktoodeep */
 
 
 /* overrides for regguts.h definitions, if any */
diff --git a/src/include/utils/memutils_memorychunk.h b/src/include/utils/memutils_memorychunk.h
index 2439ba4e96..ffa91131c8 100644
--- a/src/include/utils/memutils_memorychunk.h
+++ b/src/include/utils/memutils_memorychunk.h
@@ -37,8 +37,8 @@
  * In some cases, for example when memory allocations become large, it's
  * possible fields 3 and 4 above are not large enough to store the values
  * required for the chunk.  In this case, the MemoryContext can choose to mark
- * the chunk as "external" by calling the MemoryChunkSetExternal() function.
- * When this is done, fields 3 and 4 are unavailable for use by the
+ * the chunk as "external" by calling the MemoryChunkSetHdrMaskExternal()
+ * function.  When this is done, fields 3 and 4 are unavailable for use by the
  * MemoryContext and it's up to the MemoryContext itself to devise its own
  * method for getting the reference to the block.
  *
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index 395abfe596..656a2e9897 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -146,7 +146,7 @@ typedef int (*SortTupleComparator) (const SortTuple *a, const SortTuple *b,
 
 /*
  * The public part of a Tuple sort operation state.  This data structure
- * containsthe  definition of sort-variant-specific interface methods and
+ * contains the definition of sort-variant-specific interface methods and
  * the part of Tuple sort operation state required by their implementations.
  */
 typedef struct
@@ -189,7 +189,7 @@ typedef struct
 	 * Function to do some specific release of resources for the sort variant.
 	 * In particular, this function should free everything stored in the "arg"
 	 * field, which wouldn't be cleared on reset of the Tuple sort memory
-	 * contextes.  This can be NULL if nothing specific needs to be done.
+	 * contexts.  This can be NULL if nothing specific needs to be done.
 	 */
 	void		(*freestate) (Tuplesortstate *state);
 
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index bf87ae3fd1..95ded9eeaa 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -624,7 +624,7 @@ pqsecure_open_gss(PGconn *conn)
 
 	if (conn->gssdeleg && pg_strcasecmp(conn->gssdeleg, "enable") == 0)
 	{
-		/* Acquire credentials if possbile */
+		/* Acquire credentials if possible */
 		if (conn->gcred == GSS_C_NO_CREDENTIAL)
 			(void) pg_GSS_have_cred_cache(&conn->gcred);
 
diff --git a/src/interfaces/libpq/t/004_load_balance_dns.pl b/src/interfaces/libpq/t/004_load_balance_dns.pl
index f914916dd2..d9b382dba9 100644
--- a/src/interfaces/libpq/t/004_load_balance_dns.pl
+++ b/src/interfaces/libpq/t/004_load_balance_dns.pl
@@ -14,17 +14,17 @@ if ($ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)
 
 # This tests loadbalancing based on a DNS entry that contains multiple records
 # for different IPs. Since setting up a DNS server is more effort than we
-# consider reasonable to run this test, this situation is instead immitated by
+# consider reasonable to run this test, this situation is instead imitated by
 # using a hosts file where a single hostname maps to multiple different IP
-# addresses. This test requires the adminstrator to add the following lines to
-# the hosts file (if we detect that this hasn't happend we skip the test):
+# addresses. This test requires the administrator to add the following lines to
+# the hosts file (if we detect that this hasn't happened we skip the test):
 #
 # 127.0.0.1 pg-loadbalancetest
 # 127.0.0.2 pg-loadbalancetest
 # 127.0.0.3 pg-loadbalancetest
 #
 # Windows or Linux are required to run this test because these OSes allow
-# binding to 127.0.0.2 and 127.0.0.3 addresess by default, but other OSes
+# binding to 127.0.0.2 and 127.0.0.3 addresses by default, but other OSes
 # don't. We need to bind to different IP addresses, so that we can use these
 # different IP addresses in the hosts file.
 #
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index bf7f06885e..6557cf8785 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -400,7 +400,7 @@ pgreadlink(const char *path, char *buf, size_t size)
 	 * If the path starts with "\??\" followed by a "drive absolute" path
 	 * (known to Windows APIs as RtlPathTypeDriveAbsolute), then strip that
 	 * prefix.  This undoes some of the transformation performed by
-	 * pqsymlink(), to get back to a format that users are used to seeing.  We
+	 * pgsymlink(), to get back to a format that users are used to seeing.  We
 	 * don't know how to transform other path types that might be encountered
 	 * outside PGDATA, so we just return them directly.
 	 */
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
index bf12752529..a5b79a1982 100644
--- a/src/test/kerberos/t/001_auth.pl
+++ b/src/test/kerberos/t/001_auth.pl
@@ -413,7 +413,7 @@ test_query(
 $node->connect_ok(
 	$node->connstr('postgres')
 	  . " user=test1 host=$host hostaddr=$hostaddr gssencmode=disable require_auth=gss",
-	"GSS authentication requested, works with non-encyrpted GSS");
+	"GSS authentication requested, works with non-encrypted GSS");
 $node->connect_ok(
 	$node->connstr('postgres')
 	  . " user=test1 host=$host hostaddr=$hostaddr gssencmode=require require_auth=gss",
diff --git a/src/test/ldap/LdapServer.pm b/src/test/ldap/LdapServer.pm
index 8c69f660f5..3cc05b8255 100644
--- a/src/test/ldap/LdapServer.pm
+++ b/src/test/ldap/LdapServer.pm
@@ -19,7 +19,7 @@ LdapServer - class for an LDAP server for testing pg_hba.conf authentication
 
   use LdapServer;
 
-  # have we found openldap binaies suitable for setting up a server?
+  # have we found openldap binaries suitable for setting up a server?
   my $ldap_binaries_found = $LdapServer::setup;
 
   # create a server with the given root password and auth type
@@ -254,7 +254,7 @@ sub _ldapenv
 
 =over
 
-=item ldap_add(filename)
+=item ldapadd_file(filename)
 
 filename is the path to a file containing LDIF data which is added to the LDAP
 server.
diff --git a/src/test/modules/ldap_password_func/meson.build b/src/test/modules/ldap_password_func/meson.build
index 653a5e9479..63dc852bf3 100644
--- a/src/test/modules/ldap_password_func/meson.build
+++ b/src/test/modules/ldap_password_func/meson.build
@@ -9,7 +9,7 @@ ldap_password_func_sources = files(
 if host_system == 'windows'
   ldap_password_func_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
     '--NAME', 'ldap_password_func',
-    '--FILEDESC', 'set hook to mutate ldapbindpassw',])
+    '--FILEDESC', 'set hook to mutate ldapbindpasswd',])
 endif
 
 ldap_password_func = shared_module('ldap_password_func',
diff --git a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
index d767e284a2..a9c102949f 100644
--- a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
+++ b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm
@@ -68,7 +68,7 @@ use Test::More;
 
 =over
 
-=item PostgreSQL::Test::BackroundPsql->new(interactive, @params)
+=item PostgreSQL::Test::BackgroundPsql->new(interactive, @params)
 
 Builds a new object of class C<PostgreSQL::Test::BackgroundPsql> for either
 an interactive or background session and starts it. If C<interactive> is
@@ -201,7 +201,7 @@ sub query
 	$self->{timeout}->start() if (defined($self->{query_timer_restart}));
 
 	# Feed the query to psql's stdin, followed by \n (so psql processes the
-	# line), by a ; (so that psql issues the query, if it doesnt't include a ;
+	# line), by a ; (so that psql issues the query, if it doesn't include a ;
 	# itself), and a separator echoed with \echo, that we can wait on.
 	my $banner = "background_psql: QUERY_SEPARATOR";
 	$self->{stdin} .= "$query\n;\n\\echo $banner\n";
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index f7bcb30ca4..48008fa8c3 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -276,7 +276,7 @@ test_status_print(bool ok, const char *testname, double runtime, bool parallel)
 	 * Testnumbers are padded to 5 characters to ensure that testnames align
 	 * vertically (assuming at most 9999 tests).  Testnames are prefixed with
 	 * a leading character to indicate being run in parallel or not. A leading
-	 * '+' indicates a parellel test, '-' indicates a single test.
+	 * '+' indicates a parallel test, '-' indicates a single test.
 	 */
 	emit_tap_output(TEST_STATUS, "%sok %-5i%*s %c %-*s %8.0f ms",
 					(ok ? "" : "not "),