Merge pull request #102 from angular/master

GulajavaMinistudio · web-flow · commit 2d97d4838044 · 2018-07-02T07:32:56.000+07:00
Update upstream
diff --git a/docs/content/guide/component.ngdoc b/docs/content/guide/component.ngdoc
@@ -143,7 +143,7 @@ components should follow a few simple conventions:
       }
     ```
 
-- **Components have a well-defined lifecycle**
+- **Components have a well-defined lifecycle:**
 Each component can implement "lifecycle hooks". These are methods that will be called at certain points in the life
 of the component. The following hook methods can be implemented:
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ components should follow a few simple conventions:`
`143`	`143`	`}`
`144`	`144`	```
`145`	`145`
`146`		`-- Components have a well-defined lifecycle`
	`146`	`+- Components have a well-defined lifecycle:`
`147`	`147`	`Each component can implement "lifecycle hooks". These are methods that will be called at certain points in the life`
`148`	`148`	`of the component. The following hook methods can be implemented:`
`149`	`149`