Merge upstream Redis 2.6.9.2.6.9-1

1 files changed, 6 insertions, 6 deletions

diff --git a/src/scripting.c b/src/scripting.c
index e3f810815..ee3d0405b 100755
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -48,7 +48,7 @@ void sha1hex(char *digest, char *script, size_t len);
 
 /* Take a Redis reply in the Redis protocol format and convert it into a
  * Lua type. Thanks to this function, and the introduction of not connected
- * clients, it is trvial to implement the redis() lua function.
+ * clients, it is trivial to implement the redis() lua function.
  *
  * Basically we take the arguments, execute the Redis command in the context
  * of a non connected client, then take the generated reply and convert it
@@ -58,7 +58,7 @@ void sha1hex(char *digest, char *script, size_t len);
  *
  * Note: in this function we do not do any sanity check as the reply is
  * generated by Redis directly. This allows us to go faster.
- * The reply string can be altered during the parsing as it is discared
+ * The reply string can be altered during the parsing as it is discarded
  * after the conversion is completed.
  *
  * Errors are returned as a table with a single 'err' field set to the
@@ -597,7 +597,7 @@ void scriptingInit(void) {
 
     lua_setglobal(lua,"math");
 
-    /* Add a helper funciton that we use to sort the multi bulk output of non
+    /* Add a helper function that we use to sort the multi bulk output of non
      * deterministic commands, when containing 'false' elements. */
     {
         char *compare_func =    "function __redis__compare_helper(a,b)\n"
@@ -638,7 +638,7 @@ void scriptingReset(void) {
     scriptingInit();
 }
 
-/* Perform the SHA1 of the input string. We use this both for hasing script
+/* Perform the SHA1 of the input string. We use this both for hashing script
  * bodies in order to obtain the Lua function name, and in the implementation
  * of redis.sha1().
  *
@@ -677,7 +677,7 @@ void luaReplyToRedisReply(redisClient *c, lua_State *lua) {
     case LUA_TTABLE:
         /* We need to check if it is an array, an error, or a status reply.
          * Error are returned as a single element table with 'err' field.
-         * Status replies are returned as single elment table with 'ok' field */
+         * Status replies are returned as single element table with 'ok' field */
         lua_pushstring(lua,"err");
         lua_gettable(lua,-2);
         t = lua_type(lua,-1);
@@ -838,7 +838,7 @@ void evalGenericCommand(redisClient *c, int evalsha) {
     if (lua_isnil(lua,1)) {
         lua_pop(lua,1); /* remove the nil from the stack */
         /* Function not defined... let's define it if we have the
-         * body of the funciton. If this is an EVALSHA call we can just
+         * body of the function. If this is an EVALSHA call we can just
          * return an error. */
         if (evalsha) {
             addReply(c, shared.noscripterr);