diff --git a/README.md b/README.md
index 70a15790f..33a14390e 100644
--- a/README.md
+++ b/README.md
@@ -409,7 +409,7 @@ Other C files
 * `sds.c` is the Redis string library, check http://github.com/antirez/sds for more information.
 * `anet.c` is a library to use POSIX networking in a simpler way compared to the raw interface exposed by the kernel.
 * `dict.c` is an implementation of a non-blocking hash table which rehashes incrementally.
-* `scripting.c` implements Lua scripting. It is completely self contained from the rest of the Redis implementation and is simple enough to understand if you are familar with the Lua API.
+* `scripting.c` implements Lua scripting. It is completely self contained from the rest of the Redis implementation and is simple enough to understand if you are familiar with the Lua API.
 * `cluster.c` implements the Redis Cluster. Probably a good read only after being very familiar with the rest of the Redis code base. If you want to read `cluster.c` make sure to read the [Redis Cluster specification][3].
 
 [3]: http://redis.io/topics/cluster-spec
diff --git a/deps/README.md b/deps/README.md
index 0ce480046..d84606b4f 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -28,7 +28,7 @@ This is never upgraded since it's part of the Redis project. If there are change
 Hiredis
 ---
 
-Hiredis uses the SDS string library, that must be the same version used inside Redis itself. Hiredis is also very critical for Sentinel. Historically Redis often used forked versions of hiredis in a way or the other. In order to upgrade it is adviced to take a lot of care:
+Hiredis uses the SDS string library, that must be the same version used inside Redis itself. Hiredis is also very critical for Sentinel. Historically Redis often used forked versions of hiredis in a way or the other. In order to upgrade it is advised to take a lot of care:
 
 1. Check with diff if hiredis API changed and what impact it could have in Redis.
 2. Make sure thet the SDS library inside Hiredis and inside Redis are compatible.
diff --git a/redis.conf b/redis.conf
index 67cd50245..594e8a84a 100644
--- a/redis.conf
+++ b/redis.conf
@@ -588,7 +588,7 @@ slave-priority 100
 #    it with the specified string.
 # 4) During replication, when a slave performs a full resynchronization with
 #    its master, the content of the whole database is removed in order to
-#    load the RDB file just transfered.
+#    load the RDB file just transferred.
 #
 # In all the above cases the default is to delete objects in a blocking way,
 # like if DEL was called. However you can configure each case specifically
diff --git a/src/aof.c b/src/aof.c
index aa726d33b..c80ba001d 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -986,7 +986,7 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
 }
 
 /* Call the module type callback in order to rewrite a data type
- * taht is exported by a module and is not handled by Redis itself.
+ * that is exported by a module and is not handled by Redis itself.
  * The function returns 0 on error, 1 on success. */
 int rewriteModuleObject(rio *r, robj *key, robj *o) {
     RedisModuleIO io;
diff --git a/src/atomicvar.h b/src/atomicvar.h
index 3489972d2..313d83dd5 100644
--- a/src/atomicvar.h
+++ b/src/atomicvar.h
@@ -7,7 +7,7 @@
  * atomicDecr(var,count,mutex) -- Decrement the atomic counter
  * atomicGet(var,dstvar,mutex) -- Fetch the atomic counter value
  *
- * If atomic primitives are availble (tested in config.h) the mutex
+ * If atomic primitives are available (tested in config.h) the mutex
  * is not used.
  *
  * Never use return value from the macros. To update and get use instead:
diff --git a/src/cluster.c b/src/cluster.c
index 9289f6782..7592827b7 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -2949,7 +2949,7 @@ void clusterHandleSlaveFailover(void) {
  * the nodes anyway, so we spend time into clusterHandleSlaveMigration()
  * if definitely needed.
  *
- * The fuction is called with a pre-computed max_slaves, that is the max
+ * The function is called with a pre-computed max_slaves, that is the max
  * number of working (not in FAIL state) slaves for a single master.
  *
  * Additional conditions for migration are examined inside the function.
diff --git a/src/config.h b/src/config.h
index 9fd53626e..ac906f90a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -163,7 +163,7 @@ void setproctitle(const char *fmt, ...);
 #endif /* BYTE_ORDER */
 
 /* Sometimes after including an OS-specific header that defines the
- * endianess we end with __BYTE_ORDER but not with BYTE_ORDER that is what
+ * endianness we end with __BYTE_ORDER but not with BYTE_ORDER that is what
  * the Redis code uses. In this case let's define everything without the
  * underscores. */
 #ifndef BYTE_ORDER
diff --git a/src/db.c b/src/db.c
index 4db7d890f..f16871cd8 100644
--- a/src/db.c
+++ b/src/db.c
@@ -281,14 +281,14 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o) {
  * If callback is given the function is called from time to time to
  * signal that work is in progress.
  *
- * The dbnum can be -1 if all teh DBs should be flushed, or the specified
+ * The dbnum can be -1 if all the DBs should be flushed, or the specified
  * DB number if we want to flush only a single Redis database number.
  *
  * Flags are be EMPTYDB_NO_FLAGS if no special flags are specified or
  * EMPTYDB_ASYNC if we want the memory to be freed in a different thread
  * and the function to return ASAP.
  *
- * On success the fuction returns the number of keys removed from the
+ * On success the function returns the number of keys removed from the
  * database(s). Otherwise -1 is returned in the specific case the
  * DB number is out of range, and errno is set to EINVAL. */
 long long emptyDb(int dbnum, int flags, void(callback)(void*)) {
diff --git a/src/module.c b/src/module.c
index e3603e1d7..f33b7a56c 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1999,7 +1999,7 @@ void moduleParseCallReply_SimpleString(RedisModuleCallReply *reply);
 void moduleParseCallReply_Array(RedisModuleCallReply *reply);
 
 /* Do nothing if REDISMODULE_REPLYFLAG_TOPARSE is false, otherwise
- * use the protcol of the reply in reply->proto in order to fill the
+ * use the protocol of the reply in reply->proto in order to fill the
  * reply with parsed data according to the reply type. */
 void moduleParseCallReply(RedisModuleCallReply *reply) {
     if (!(reply->flags & REDISMODULE_REPLYFLAG_TOPARSE)) return;
diff --git a/src/modules/TYPES.md b/src/modules/TYPES.md
index 1c31950fa..586f03322 100644
--- a/src/modules/TYPES.md
+++ b/src/modules/TYPES.md
@@ -128,7 +128,7 @@ course this is not enough, we need the information needed to link a specific
 value with a specific module type that is able to load and handle it.
 
 So when we save a `type specific value` about a module, we prefix it with
-a 64 bit integer. 64 bits is large enough to store the informations needed
+a 64 bit integer. 64 bits is large enough to store the information needed
 in order to lookup the module that can handle that specific type, but is
 short enough that we can prefix each module value we store inside the RDB
 without making the final RDB file too big. At the same time, this solution
@@ -264,7 +264,7 @@ that can automatically store inside the RDB file the following types:
 
 It is up to the module to find a viable representation using the above base
 types. However note that while the integer and double values are stored
-and loaded in an architecture and *endianess* agnostic way, if you use
+and loaded in an architecture and *endianness* agnostic way, if you use
 the raw string saving API to, for example, save a structure on disk, you
 have to care those details yourself.
 
diff --git a/src/rdb.c b/src/rdb.c
index 6d29f80ce..645078eaf 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1568,7 +1568,7 @@ void backgroundSaveDoneHandlerSocket(int exitcode, int bysignal) {
      * in error state.
      *
      * If the process returned an error, consider the list of slaves that
-     * can continue to be emtpy, so that it's just a special case of the
+     * can continue to be empty, so that it's just a special case of the
      * normal code path. */
     ok_slaves = zmalloc(sizeof(uint64_t)); /* Make space for the count. */
     ok_slaves[0] = 0;
diff --git a/src/redis-cli.c b/src/redis-cli.c
index 17fb53394..3931a8370 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -2039,7 +2039,7 @@ static void getKeySizes(redisReply *keys, int *types,
             keys->element[i]->str);
     }
 
-    /* Retreive sizes */
+    /* Retrieve sizes */
     for(i=0;i<keys->elements;i++) {
         /* Skip keys that dissapeared between SCAN and TYPE */
         if(types[i] == TYPE_NONE) {
@@ -2047,7 +2047,7 @@ static void getKeySizes(redisReply *keys, int *types,
             continue;
         }
 
-        /* Retreive size */
+        /* Retrieve size */
         if(redisGetReply(context, (void**)&reply)!=REDIS_OK) {
             fprintf(stderr, "Error getting size for key '%s' (%d: %s)\n",
                 keys->element[i]->str, context->err, context->errstr);
@@ -2117,7 +2117,7 @@ static void findBigKeys(void) {
             arrsize = keys->elements;
         }
 
-        /* Retreive types and then sizes */
+        /* Retrieve types and then sizes */
         getKeyTypes(keys, types);
         getKeySizes(keys, types, sizes);
 
diff --git a/src/replication.c b/src/replication.c
index 8aa0d807a..bd5200250 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -494,7 +494,7 @@ need_full_resync:
  * Side effects, other than starting a BGSAVE:
  *
  * 1) Handle the slaves in WAIT_START state, by preparing them for a full
- *    sync if the BGSAVE was succesfully started, or sending them an error
+ *    sync if the BGSAVE was successfully started, or sending them an error
  *    and dropping them from the list of slaves.
  *
  * 2) Flush the Lua scripting script cache if the BGSAVE was actually
@@ -804,7 +804,7 @@ void sendBulkToSlave(aeEventLoop *el, int fd, void *privdata, int mask) {
         }
     }
 
-    /* If the preamble was already transfered, send the RDB bulk data. */
+    /* If the preamble was already transferred, send the RDB bulk data. */
     lseek(slave->repldbfd,slave->repldboff,SEEK_SET);
     buflen = read(slave->repldbfd,buf,PROTO_IOBUF_LEN);
     if (buflen <= 0) {
@@ -873,7 +873,7 @@ void updateSlavesWaitingBgsave(int bgsaveerr, int type) {
                         replicationGetSlaveName(slave));
                 /* Note: we wait for a REPLCONF ACK message from slave in
                  * order to really put it online (install the write handler
-                 * so that the accumulated data can be transfered). However
+                 * so that the accumulated data can be transferred). However
                  * we change the replication state ASAP, since our slave
                  * is technically online now. */
                 slave->replstate = SLAVE_STATE_ONLINE;
diff --git a/src/sds.c b/src/sds.c
index 26e90a6db..85105de98 100644
--- a/src/sds.c
+++ b/src/sds.c
@@ -268,7 +268,7 @@ sds sdsRemoveFreeSpace(sds s) {
     return s;
 }
 
-/* Return the total size of the allocation of the specifed sds string,
+/* Return the total size of the allocation of the specified sds string,
  * including:
  * 1) The sds header before the pointer.
  * 2) The string.
diff --git a/src/sentinel.c b/src/sentinel.c
index f8ebd0c6f..7c6be967b 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -2903,7 +2903,7 @@ void sentinelCommand(client *c) {
          * ip and port are the ip and port of the master we want to be
          * checked by Sentinel. Note that the command will not check by
          * name but just by master, in theory different Sentinels may monitor
-         * differnet masters with the same name.
+         * different masters with the same name.
          *
          * current-epoch is needed in order to understand if we are allowed
          * to vote for a failover leader or not. Each Sentinel can vote just
@@ -3258,7 +3258,7 @@ void sentinelInfoCommand(client *c) {
     addReplyBulkSds(c, info);
 }
 
-/* Implements Sentinel verison of the ROLE command. The output is
+/* Implements Sentinel version of the ROLE command. The output is
  * "sentinel" and the list of currently monitored master names. */
 void sentinelRoleCommand(client *c) {
     dictIterator *di;
@@ -3588,7 +3588,7 @@ void sentinelSimFailureCrash(void) {
 }
 
 /* Vote for the sentinel with 'req_runid' or return the old vote if already
- * voted for the specifed 'req_epoch' or one greater.
+ * voted for the specified 'req_epoch' or one greater.
  *
  * If a vote is not available returns NULL, otherwise return the Sentinel
  * runid and populate the leader_epoch with the epoch of the vote. */
diff --git a/src/server.c b/src/server.c
index 06244081f..121eebcd8 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4061,7 +4061,7 @@ int main(int argc, char **argv) {
             configfile = argv[j];
             server.configfile = getAbsolutePath(configfile);
             /* Replace the config file in server.exec_argv with
-             * its absoulte path. */
+             * its absolute path. */
             zfree(server.exec_argv[j]);
             server.exec_argv[j] = zstrdup(server.configfile);
             j++;
diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl
index 1c559b706..6654140ac 100644
--- a/tests/integration/replication-4.tcl
+++ b/tests/integration/replication-4.tcl
@@ -25,7 +25,7 @@ start_server {tags {"repl"}} {
             s 0 role
         } {slave}
 
-        test {Test replication with parallel clients writing in differnet DBs} {
+        test {Test replication with parallel clients writing in different DBs} {
             after 5000
             stop_bg_complex_data $load_handle0
             stop_bg_complex_data $load_handle1