From 65a3fdb9f3bcaf40f70815907684e9e2582f78a1 Mon Sep 17 00:00:00 2001
From: Zhicheng Wang <zcwang@thoughtworks.com>
Date: Mon, 9 May 2016 21:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Javascript=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/docs/ts/latest/glossary.jade                    | 10 +++++-----
 public/docs/ts/latest/testing/jasmine-testing-101.jade |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/docs/ts/latest/glossary.jade b/public/docs/ts/latest/glossary.jade
index a72c81b057..0d730a3780 100644
--- a/public/docs/ts/latest/glossary.jade
+++ b/public/docs/ts/latest/glossary.jade
@@ -479,7 +479,7 @@ include _util-fns
     either in this version of the language or a dialect that strives to be
     compatible with it such as [TypeScript](#typesScript).
     
-    最新的被认可的Javascript版本是[ECMAScript 2015](http://www.ecma-international.org/ecma-262/6.0/)，（也交“ES2015”或“ES6”）。Angular 2的开发者要么这个版本的Javascript，要么使用与这个版本兼容的语言，比如[TypeScript](#typesScript)。
+    最新的被认可的JavaScript版本是[ECMAScript 2015](http://www.ecma-international.org/ecma-262/6.0/)，（也叫“ES2015”或“ES6”）。Angular 2的开发者要么使用这个版本的JavaScript，要么使用与这个版本兼容的语言，比如[TypeScript](#typesScript)。
    
     Most modern browsers today only support the prior "ECMAScript 5" (AKA ES5) standard.
     Applications written in ES2015 or one of its dialects must be "[transpiled](#transpile)"
@@ -499,7 +499,7 @@ include _util-fns
     [ECMAScript 2015](http://www.ecma-international.org/ecma-262/6.0/)
     (AKA "ES2015" or "ES6")
     
-    最新发布的Javascript版本，[ECMAScript 2015](http://www.ecma-international.org/ecma-262/6.0/)
+    最新发布的JavaScript版本，[ECMAScript 2015](http://www.ecma-international.org/ecma-262/6.0/)
     (即 "ES2015" 或 "ES6")
 :marked
   ## ES2015
@@ -522,7 +522,7 @@ include _util-fns
     Short hand for "ECMAScript 5", the version of JavaScript run by most modern browsers.
     See [ECMAScript](#ecmascript).
     
-    “ECMAScript 5”的简写，大部分现代浏览器使用的Javascript版本。请看[ECMAScript](#ecmascript)。
+    “ECMAScript 5”的简写，大部分现代浏览器使用的JavaScript版本。请看[ECMAScript](#ecmascript)。
 // #enddocregion e2
 
 // #docregion f-l
@@ -901,7 +901,7 @@ include _util-fns
     a [data binding](#data-binding).  Learn how to write template expressions
     in the [Template Syntax](guide/template-syntax.html#template-expressions) chapter.
 
-    Angular在[数据绑定data binding](#data-binding)内评估的类似Javascript语法的表达式。在[模板语法Template Syntax](guide/template-syntax.html#template-expressions)章节了解更多模板表达式的知识。
+    Angular在[数据绑定data binding](#data-binding)内求值的类似JavaScript语法的表达式。在[模板语法Template Syntax](guide/template-syntax.html#template-expressions)章节了解更多模板表达式的知识。
 // #enddocregion t1
 // #docregion t2
 :marked
@@ -912,7 +912,7 @@ include _util-fns
     The process of transforming code written in one form of JavaScript
     (e.g., TypeScript) into another form of JavaScript  (e.g., [ES5](#es5)).
 
-    把用Javascript形式语言（比如TypeScript）编写的程序转换到另一个形式的JavaScript（例如[ES5](#es5))。
+    把用JavaScript形式语言（比如TypeScript）编写的程序转换到另一个形式的JavaScript（例如[ES5](#es5))。
  :marked
   ## TypeScript
 .l-sub-section
diff --git a/public/docs/ts/latest/testing/jasmine-testing-101.jade b/public/docs/ts/latest/testing/jasmine-testing-101.jade
index d9d97bf683..aa9862e7b8 100644
--- a/public/docs/ts/latest/testing/jasmine-testing-101.jade
+++ b/public/docs/ts/latest/testing/jasmine-testing-101.jade
@@ -123,7 +123,7 @@ figure.image-display
 :marked
   Hold on! We wrote a TypeScript file but we’re loading a JavaScript file?
   
-  等等！我们编写了TypeScript文件，但是我们却加载了一个Javascript文件？
+  等等！我们编写了TypeScript文件，但是我们却加载了一个JavaScript文件？
   
   That’s a reminder that we need to compile our TypeScript test files as we do our TypeScript application files.  Do that next.