Merging upstream version 1.11.0:

- compatible with mistune 2.0 (Closes: #1003572).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 8 insertions, 8 deletions

diff --git a/iredis/data/commands.json b/iredis/data/commands.json
index 1b0ae22..74093cc 100644
--- a/iredis/data/commands.json
+++ b/iredis/data/commands.json
@@ -2310,7 +2310,7 @@
               "WITHVALUES"
             ],
             "optional": true
-          }    
+          }
         ],
         "optional": true
       }
@@ -4378,7 +4378,7 @@
               "WITHSCORES"
             ],
             "optional": true
-          }    
+          }
         ],
         "optional": true
       }
@@ -5048,7 +5048,7 @@
   },
   "XADD": {
     "summary": "Appends a new entry to a stream",
-    "complexity": "O(1) when adding a new entry, O(N) when trimming where N being the number of entires evicted.",
+    "complexity": "O(1) when adding a new entry, O(N) when trimming where N being the number of entries evicted.",
     "arguments": [
       {
         "name": "key",
diff --git a/iredis/data/commands/eval.md b/iredis/data/commands/eval.md
index 3618ac6..f85d727 100644
--- a/iredis/data/commands/eval.md
+++ b/iredis/data/commands/eval.md
@@ -733,7 +733,7 @@ Valid formats:
 > - big endian
 < - little endian
 ![num] - alignment
-x - pading
+x - padding
 b/B - signed/unsigned byte
 h/H - signed/unsigned short
 l/L - signed/unsigned long
diff --git a/iredis/data/commands/xadd.md b/iredis/data/commands/xadd.md
index aca1de7..8a80556 100644
--- a/iredis/data/commands/xadd.md
+++ b/iredis/data/commands/xadd.md
@@ -52,7 +52,7 @@ to match the one of this other system.
 documentation page for more information. This allows adding new entries and
 keeping the stream's size in check with a single call to `XADD`, effectively
 capping the stream with an arbitrary threshold. Although exact trimming is
-possible and is the default, due to the internal representation of steams it is
+possible and is the default, due to the internal representation of streams it is
 more efficient to add an entry and trim stream with `XADD` using **almost
 exact** trimming (the `~` argument).
 
diff --git a/iredis/data/iredisrc b/iredis/data/iredisrc
index 5baef86..bf79e90 100644
--- a/iredis/data/iredisrc
+++ b/iredis/data/iredisrc
@@ -30,9 +30,9 @@ socket_keepalive = True
 shell = True
 
 # decode redis response, default None
-decode = 
+decode =
 
-# enable pager? defualt to True, you can disable it by changing it to False
+# enable pager? default to True, you can disable it by changing it to False
 enable_pager = True
 
 # pager setting when line is too tall
@@ -52,7 +52,7 @@ bottom_bar = True
 warning = True
 
 # IRedis log for debugging, leave this blank will disable log.
-# You don't need this unless you are debuging iredis.
+# You don't need this unless you are debugging iredis.
 # Be careful this will log your commands input (include AUTH with password) to
 # log file.
 # eg. ~/.iredis.log