Merge remote-tracking branch 'remotes/angular.io/master'

# Conflicts: # public/docs/ts/latest/quickstart.jade
2016-05-26 14:10:36 +01:00 · 2016-05-26 14:10:36 +01:00 · 21b13126da
commit 21b13126da
parent 7e2d7a2a9e 551ac6dc9d
1 changed files with 1 additions and 1 deletions
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@ -685,7 +685,7 @@ h2#index 步骤4：添加#[code index.html]

        * 我们可以看到编译器的警告和错误，但浏览器中不行。
        
-        * Precompilation simpifies the module loading process and
+        * Precompilation simplifies the module loading process and
        it's much easier to diagnose problems when this is a separate, external step.

        * 预编译简化了模块加载过程，而且当它成为分离、外部的步骤时，更容易诊断问题。