fix: merge PRs

This commit is contained in:
Zhicheng Wang
2018-03-09 15:30:16 +08:00
parent 61e0f4fbcd
commit 69908c35f6
3 changed files with 9 additions and 2 deletions
+1 -1
View File
@@ -873,7 +873,7 @@ clear the container which also destroys the view.
Nobody reads the `appUnless` property so it doesn't need a getter.
没有人会读取`appUnless`属性,因此它不需要定义设置器(getter
没有人会读取`appUnless`属性,因此它不需要定义 getter。
The completed directive code looks like this:
+1 -1
View File
@@ -2344,7 +2344,7 @@ where you'll learn:
* to use [`<ng-container>`](guide/structural-directives#ngcontainer "<ng-container>")
to group elements when there is no suitable host element for the directive.
当没有合适的宿主元素放置指令时,可用`<ng-container>`](structural-directives.html#ngcontainer "<ng-container>对元素进行分组。
当没有合适的宿主元素放置指令时,可用 [`<ng-container>`](guide/structural-directives#ngcontainer "<ng-container>") 对元素进行分组。
* how to write your own structural directive.
+7
View File
@@ -79,6 +79,13 @@ Angular 和 Grails 开发高校[教务管理系统](http://www.github.com/jwgl)
- jiabiao(来自Github
- perry2008084(来自Github
- fnpac(来自Github
- WittBulter(来自Github
- buzzerrookie(来自Github
- ananiy(来自Github
- zdouble(来自Github
- OuYancey(来自Github
- GenweiWu(来自Github
- dxyqqs(来自Github
- 另外还有一些做好事不留名的活雷锋
想让你的名字也出现在这里吗?请提供[反馈、纠错](https://github.com/angular/angular-cn/issues)。