diff --git a/.codespell/requirements.txt b/.codespell/requirements.txt
index 407f17489..ddff45468 100644
--- a/.codespell/requirements.txt
+++ b/.codespell/requirements.txt
@@ -1 +1 @@
-codespell==2.2.4
+codespell==2.2.5
diff --git a/src/acl.c b/src/acl.c
index 900746ece..607512beb 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -309,7 +309,7 @@ void *ACLListDupSds(void *item) {
 /* Structure used for handling key patterns with different key
  * based permissions. */
 typedef struct {
-    int flags; /* The CMD_KEYS_* flags for this key pattern */
+    int flags; /* The ACL key permission types for this key pattern */
     sds pattern; /* The pattern to match keys against */
 } keyPattern;
 
@@ -963,7 +963,7 @@ void ACLResetFirstArgs(aclSelector *selector) {
     selector->allowed_firstargs = NULL;
 }
 
-/* Add a first-arh to the list of subcommands for the user 'u' and
+/* Add a first-arg to the list of subcommands for the user 'u' and
  * the command id specified. */
 void ACLAddAllowedFirstArg(aclSelector *selector, unsigned long id, const char *sub) {
     /* If this is the first first-arg to be configured for
@@ -1458,7 +1458,7 @@ void ACLInit(void) {
  * otherwise C_ERR is returned and errno is set to:
  *
  *  EINVAL: if the username-password do not match.
- *  ENONENT: if the specified user does not exist at all.
+ *  ENOENT: if the specified user does not exist at all.
  */
 int ACLCheckUserCredentials(robj *username, robj *password) {
     user *u = ACLGetUserByName(username->ptr,sdslen(username->ptr));
diff --git a/src/db.c b/src/db.c
index a7cb4dbd3..a913044ab 100644
--- a/src/db.c
+++ b/src/db.c
@@ -188,8 +188,8 @@ robj *lookupKeyWriteOrReply(client *c, robj *key, robj *reply) {
 /* Add the key to the DB. It's up to the caller to increment the reference
  * counter of the value if needed.
  *
- * If the update_if_existing argument is false, the the program is aborted
- * if the key already exists, otherwise, it can fall back to dbOverwite. */
+ * If the update_if_existing argument is false, the program is aborted
+ * if the key already exists, otherwise, it can fall back to dbOverwrite. */
 static void dbAddInternal(redisDb *db, robj *key, robj *val, int update_if_existing) {
     dictEntry *existing;
     dictEntry *de = dictAddRaw(db->dict, key->ptr, &existing);
diff --git a/src/debug.c b/src/debug.c
index 809822f96..1e915a1e1 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -2260,7 +2260,7 @@ void bugReportEnd(int killViaSignal, int sig) {
     if (server.daemonize && server.supervised == 0 && server.pidfile) unlink(server.pidfile);
 
     if (!killViaSignal) {
-        /* To avoid issues with valgrind, we may wanna exit rahter than generate a signal */
+        /* To avoid issues with valgrind, we may wanna exit rather than generate a signal */
         if (server.use_exit_on_panic) {
              /* Using _exit to bypass false leak reports by gcc ASAN */
              fflush(stdout);
diff --git a/src/sentinel.c b/src/sentinel.c
index 238be905f..cce5cc3b9 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -4129,7 +4129,7 @@ NULL
         else if (!strcasecmp(c->argv[2]->ptr,"get") && c->argc >= 4)
             sentinelConfigGetCommand(c);
         else
-            addReplyError(c, "Only SENTINEL CONFIG GET <param> [<param> <param> ...]/ SET <param> <value> [<param> <value> ...] are supported.");
+            addReplyError(c, "Only SENTINEL CONFIG GET <param> [<param> <param> ...] / SET <param> <value> [<param> <value> ...] are supported.");
     } else if (!strcasecmp(c->argv[1]->ptr,"info-cache")) {
         /* SENTINEL INFO-CACHE <name> */
         if (c->argc < 2) goto numargserr;
diff --git a/src/server.h b/src/server.h
index 52a2f8584..4634cbdf5 100644
--- a/src/server.h
+++ b/src/server.h
@@ -2003,7 +2003,7 @@ struct redisServer {
     /* Scripting */
     mstime_t busy_reply_threshold;  /* Script / module timeout in milliseconds */
     int pre_command_oom_state;         /* OOM before command (script?) was started */
-    int script_disable_deny_script;    /* Allow running commands marked "no-script" inside a script. */
+    int script_disable_deny_script;    /* Allow running commands marked "noscript" inside a script. */
     /* Lazy free */
     int lazyfree_lazy_eviction;
     int lazyfree_lazy_expire;
diff --git a/tests/unit/expire.tcl b/tests/unit/expire.tcl
index fc0ef61e2..15dae20e4 100644
--- a/tests/unit/expire.tcl
+++ b/tests/unit/expire.tcl
@@ -350,7 +350,7 @@ start_server {tags {"expire"}} {
             r restore foo17 100000 $encoded
             r restore foo18 [expr [clock milliseconds]+100000] $encoded absttl
 
-            # Assert that each TTL-relatd command are persisted with absolute timestamps in AOF
+            # Assert that each TTL-related command are persisted with absolute timestamps in AOF
             assert_aof_content $aof {
                 {select *}
                 {set foo1 bar PXAT *}
diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl
index d821c7adc..564f1e4b2 100644
--- a/tests/unit/memefficiency.tcl
+++ b/tests/unit/memefficiency.tcl
@@ -493,7 +493,7 @@ start_server {tags {"defrag external:skip"} overrides {appendonly yes auto-aof-r
                 set expected_frag 1.3
 
                 r debug mallctl-str thread.tcache.flush VOID
-                # fill the first slab containin 32 regs of 640 bytes.
+                # fill the first slab containing 32 regs of 640 bytes.
                 for {set j 0} {$j < 32} {incr j} {
                     r setrange "_$j" 600 x
                     r debug mallctl-str thread.tcache.flush VOID
diff --git a/tests/unit/tracking.tcl b/tests/unit/tracking.tcl
index bea8508b1..666b5930e 100644
--- a/tests/unit/tracking.tcl
+++ b/tests/unit/tracking.tcl
@@ -876,7 +876,7 @@ start_server {tags {"tracking network logreqres:skip"}} {
     $rd close
 }
 
-# Just some extra covergae for --log-req-res, because we do not
+# Just some extra coverage for --log-req-res, because we do not
 # run the full tracking unit in that mode
 start_server {tags {"tracking network"}} {
     test {Coverage: Basic CLIENT CACHING} {
diff --git a/tests/unit/type/list.tcl b/tests/unit/type/list.tcl
index 993b6d135..586d3d308 100644
--- a/tests/unit/type/list.tcl
+++ b/tests/unit/type/list.tcl
@@ -1120,7 +1120,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
         assert_equal {} [$rd read]
         $rd deferred 0
         # We want to force key deletion to be propagated to the replica 
-        # in order to verify it was expiered on the replication stream. 
+        # in order to verify it was expired on the replication stream.
         $rd set somekey1 someval1
         $rd exists k
         r set somekey2 someval2
@@ -1168,7 +1168,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
         r client unblock $id
         assert_equal {} [$rd read]
         # We want to force key deletion to be propagated to the replica 
-        # in order to verify it was expiered on the replication stream. 
+        # in order to verify it was expired on the replication stream.
         $rd exists k
         assert_equal {0} [$rd read]
         assert_replication_stream $repl {