Merge branch 'master' of https://github.com/angular/angular-cn

public/docs/ts/latest/guide/testing.jade

@@ -528,7 +528,7 @@ table(width="100%")
   for reasons explained [below](#spec-file-location).
 
   **将测试spec放到`app/`文件夹下的任何位置。**
-  `karma.conf.js`告诉`Karma`在这个文件夹中寻找测试spec文件，原因[如下](#spec-file-location)。
+  `karma.conf.js`告诉`Karma`在这个文件夹中寻找测试spec文件，原因在 [这里](#spec-file-location) 有所解释。
 
   Add the following code to `app/1st.spec.ts`.
 
@@ -1495,7 +1495,7 @@ a(href="#top").to-top 回到顶部
   The `TestBed.createComponent` is a synchronous method. 
   It assumes that everything it could need is already in memory.
 
-  `TestBed.createComponent`时一种同步的方法。它假设所有它需要的资源已经全部在内存。
+  `TestBed.createComponent`是一种同步的方法。它假设所有它需要的资源已经全部在内存。
 
   That has been true so far. 
   Each tested component's `@Component` metadata has a `template` property specifying an _inline templates_.