Merge branch 'dev' of github.com:vuejs/vue-router into dev

yyx990803 · yyx990803 · commit bd416c0d847a · 2015-10-18T20:45:39.000-04:00
diff --git a/docs/zh-cn/api/redirect.md b/docs/zh-cn/api/redirect.md
@@ -11,7 +11,7 @@
 ### Example
 
 ``` js
-router.rediect({
+router.redirect({
 
   // 重定向 /a 到 /b
   '/a': '/b',
