Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							56b11af208 
							
						 
					 
					
						
						
							
							fix: 翻译微调  
						
						
						
						
					 
					
						2019-06-07 23:48:55 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							0fddc95118 
							
						 
					 
					
						
						
							
							Merge branch 'en-master' into aio  
						
						
						
						
					 
					
						2019-06-07 12:29:04 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							df222c3a12 
							
						 
					 
					
						
						
							
							fix: 修订完了 guide 部分  
						
						
						
						
					 
					
						2019-06-04 21:48:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							d5057aec3b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						
						
						
					 
					
						2019-06-03 10:09:20 +08:00 
						 
				 
			
				
					
						
							
							
								Suguru Inatomi 
							
						 
					 
					
						
						
						
						
							
						
						
							a36cacae79 
							
						 
					 
					
						
						
							
							docs: remove core.module.ts from file tree in style guide ( #30679 )  
						
						... 
						
						
						
						PR Close  #30679  
						
						
					 
					
						2019-05-28 09:27:49 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							be0bc799f3 
							
						 
					 
					
						
						
							
							docs: drop coding conventions from style guide ( #30334 )  
						
						... 
						
						
						
						PR Close  #30334  
						
						
					 
					
						2019-05-24 13:46:11 -04:00 
						 
				 
			
				
					
						
							
							
								Fux, Etienne 
							
						 
					 
					
						
						
						
						
							
						
						
							e58e5ec6a6 
							
						 
					 
					
						
						
							
							docs: improve consistency of style guide example ( #30504 )  
						
						... 
						
						
						
						The text for entry Style 04-10 of the style guide talks about
FilterTextService however, the example folder structure has the inversed
filename.
PR Close  #30504  
						
						
					 
					
						2019-05-20 16:42:16 -07:00 
						 
				 
			
				
					
						
							
							
								Trevor Karjanis 
							
						 
					 
					
						
						
						
						
							
						
						
							ad642e31cd 
							
						 
					 
					
						
						
							
							docs: fix grammatical errors in the style guide ( #29769 )  
						
						... 
						
						
						
						Fix grammatical errors in the Style Guide.
There is no associated issue.
PR Close  #29769  
						
						
					 
					
						2019-04-10 12:16:29 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							e8921365b7 
							
						 
					 
					
						
						
							
							docs: remove coremodule references ( #28434 )  
						
						... 
						
						
						
						PR Close  #28434  
						
						
					 
					
						2019-03-29 10:29:51 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon 
							
						 
					 
					
						
						
						
						
							
						
						
							dfcf759e33 
							
						 
					 
					
						
						
							
							docs: drop Coding Conventions section from style guide ( #29331 )  
						
						... 
						
						
						
						Closes  #24153 
PR Close  #29331  
					
						2019-03-21 15:40:20 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec21f77fd 
							
						 
					 
					
						
						
							
							fix: 精修翻译  
						
						
						
						
					 
					
						2019-02-15 07:12:41 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							421fc1a846 
							
						 
					 
					
						
						
							
							fix: 精修翻译  
						
						... 
						
						
						
						恢复一些过度省略的 "Angular"
Angular 模块恢复为 NgModule 
						
						
					 
					
						2019-02-15 07:12:40 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							5a4a7496a4 
							
						 
					 
					
						
						
							
							fix: 补充翻译  
						
						
						
						
					 
					
						2019-01-04 16:06:55 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							e6c232349f 
							
						 
					 
					
						
						
							
							fix: 合并错误  #366  
						
						
						
						
					 
					
						2019-01-02 17:43:56 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng WANG 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd5fd0e45 
							
						 
					 
					
						
						
							
							fix: 修正用词  
						
						
						
						
					 
					
						2019-01-02 15:18:38 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a0d3e9633 
							
						 
					 
					
						
						
							
							docs: 手动解决冲突  
						
						
						
						
					 
					
						2018-10-22 18:16:47 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a9ac90d3df 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts 
						
						
					 
					
						2018-10-21 17:43:29 +08:00 
						 
				 
			
				
					
						
							
							
								jenniferfell 
							
						 
					 
					
						
						
						
						
							
						
						
							0ef1f7ef0d 
							
						 
					 
					
						
						
							
							docs: change links to cli wiki to link to new aio docs files m to z ( #26492 )  
						
						... 
						
						
						
						PR Close  #26492  
						
						
					 
					
						2018-10-17 11:06:07 -07:00 
						 
				 
			
				
					
						
							
							
								William Marques 
							
						 
					 
					
						
						
						
						
							
						
						
							fc6dad40ac 
							
						 
					 
					
						
						
							
							fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips ( #26396 )  
						
						... 
						
						
						
						Closes  #26174 
PR Close  #26396  
					
						2018-10-17 11:05:29 -07:00 
						 
				 
			
				
					
						
							
							
								Kirankumar Sripati 
							
						 
					 
					
						
						
						
						
							
						
						
							245b85f72a 
							
						 
					 
					
						
						
							
							docs: typo fixes ( #26247 )  
						
						... 
						
						
						
						PR Close  #26247  
						
						
					 
					
						2018-10-05 14:00:20 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c0b01ff6f5 
							
						 
					 
					
						
						
							
							chore: 指向 material.angular.cn  
						
						
						
						
					 
					
						2018-09-21 10:14:20 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b37584be 
							
						 
					 
					
						
						
							
							fix: 文字微调  
						
						
						
						
					 
					
						2018-08-03 09:16:30 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							966a29e072 
							
						 
					 
					
						
						
							
							fix: 修正合并时的错误  
						
						
						
						
					 
					
						2018-07-27 20:22:07 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2d485c6589 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/api-page-class.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/elements.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing-observables.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/custom-elements/live-example/live-example.component.html
#	aio/src/app/custom-elements/live-example/live-example.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/styles/main.scss
#	aio/tools/transforms/remark-package/services/renderMarkdown.js 
						
						
					 
					
						2018-07-27 10:51:18 +08:00 
						 
				 
			
				
					
						
							
							
								Stefanie Fluin 
							
						 
					 
					
						
						
						
						
							
						
						
							d523630ea2 
							
						 
					 
					
						
						
							
							docs(aio): cleanup aalert, callout, subsection use and author style ( #24986 )  
						
						... 
						
						
						
						PR Close  #24986  
						
						
					 
					
						2018-07-24 08:22:14 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							d9bf6e37ae 
							
						 
					 
					
						
						
							
							docs: fix wording in 4-10 ( #24385 )  
						
						... 
						
						
						
						PR Close  #24385  
						
						
					 
					
						2018-06-13 11:53:20 -07:00 
						 
				 
			
				
					
						
							
							
								Shaun Grady 
							
						 
					 
					
						
						
						
						
							
						
						
							153ba4dff3 
							
						 
					 
					
						
						
							
							docs(aio): Reorganize style guide sections on prefixing components/directives ( #22571 )  
						
						... 
						
						
						
						Closes https://github.com/angular/angular/issues/22081 
PR Close  #22571  
						
						
					 
					
						2018-06-13 11:20:42 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3684dbdced 
							
						 
					 
					
						
						
							
							fix: 文字微调  
						
						
						
						
					 
					
						2018-06-08 08:22:21 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2867ceecdb 
							
						 
					 
					
						
						
							
							fix: sync to 6.0(WIP)  
						
						
						
						
					 
					
						2018-05-15 13:32:40 +08:00 
						 
				 
			
				
					
						
							
							
								Vani 
							
						 
					 
					
						
						
						
						
							
						
						
							5671ae6a58 
							
						 
					 
					
						
						
							
							docs: add tree-shakable providers doc ( #23027 )  
						
						... 
						
						
						
						PR Close  #23027  
						
						
					 
					
						2018-04-03 12:32:39 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							01ed628717 
							
						 
					 
					
						
						
							
							feat: 翻译完了 architecture-components 和 architecture-modules  
						
						
						
						
					 
					
						2018-03-25 12:36:17 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e167fa5229 
							
						 
					 
					
						
						
							
							refactor: 重构自动翻译代码  
						
						
						
						
					 
					
						2018-03-24 20:03:10 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2b2b537008 
							
						 
					 
					
						
						
							
							fix: 把中文中的_替换成*  
						
						
						
						
					 
					
						2018-03-22 17:24:05 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f75baea397 
							
						 
					 
					
						
						
							
							fix: 把除了 upgrading 之外的 我们 都替换成了 你  
						
						... 
						
						
						
						fix: 翻译了一部分 AOT Compiler 
						
						
					 
					
						2018-03-22 17:19:12 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							37e19cd50b 
							
						 
					 
					
						
						
							
							feat: 自动在中英文之间添加空格,以改善排版  
						
						
						
						
					 
					
						2018-03-20 17:15:36 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							545d4b6c69 
							
						 
					 
					
						
						
							
							feat: 自动在中英文之间添加空格,以改善排版  
						
						
						
						
					 
					
						2018-03-20 17:09:18 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e0fc873240 
							
						 
					 
					
						
						
							
							fix: minor fix and auto translate based on previous result  
						
						
						
						
					 
					
						2018-03-18 07:44:33 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5a7861cb 
							
						 
					 
					
						
						
							
							fix: 翻译了《风格指南》中剩余的部分  
						
						
						
						
					 
					
						2018-03-15 16:08:29 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fc58e0eee0 
							
						 
					 
					
						
						
							
							fix: 合并第二版的翻译  
						
						
						
						
					 
					
						2018-03-07 14:54:27 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a94e7cba14 
							
						 
					 
					
						
						
							
							fix: 人工修订自动翻译  
						
						... 
						
						
						
						fix: 拆解 tr
fix: 特殊拆解 back to top 
						
						
					 
					
						2018-03-07 12:45:12 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0ffa481e 
							
						 
					 
					
						
						
							
							fix: 修正自动翻译结果  
						
						
						
						
					 
					
						2018-03-07 11:25:56 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							206f6ecc4f 
							
						 
					 
					
						
						
							
							fix: 修正最后一版的全部翻译  
						
						
						
						
					 
					
						2018-03-04 09:07:33 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							53a7a4cbf5 
							
						 
					 
					
						
						
							
							feat: add auto checker  
						
						... 
						
						
						
						fix: some translations found by auto checker 
						
						
					 
					
						2018-03-01 22:19:59 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89060a39df 
							
						 
					 
					
						
						
							
							fix: 不正常的中英文段落合并  
						
						
						
						
					 
					
						2018-02-28 13:44:53 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c08a3830df 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/change-log.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/deployment.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/pipes.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/marketing/docs.md
#	aio/content/marketing/features.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts 
						
						
					 
					
						2018-02-28 13:13:29 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1531b0610d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/index.html
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/embedded/api/api-list.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/footer/footer.component.html
#	aio/src/app/layout/toc/toc.component.html
#	aio/src/app/search/search.service.ts
#	aio/src/styles/1-layouts/_marketing-layout.scss
#	aio/yarn.lock 
						
						
					 
					
						2018-02-28 08:08:59 +08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							a4f9e8180b 
							
						 
					 
					
						
						
							
							docs: edit styleguide recommendation on components as elements ( #22074 )  
						
						... 
						
						
						
						Change recommendation on using attributes for components since there are use cases including the use of <button mat-button> in MD
Closes  #19401 .
PR Close  #22074  
						
						
					 
					
						2018-02-22 11:20:21 -08:00 
						 
				 
			
				
					
						
							
							
								Fabian Wiles 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a1a14b87 
							
						 
					 
					
						
						
							
							docs: clarify the use of classes and interfaces in style guide ( #20919 )  
						
						... 
						
						
						
						PR Close  #20919  
						
						
					 
					
						2018-01-18 18:22:55 -06:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0247cddf5e 
							
						 
					 
					
						
						
							
							fix: 文字微调  
						
						
						
						
					 
					
						2017-10-19 17:53:27 +08:00 
						 
				 
			
				
					
						
							
							
								Shai Reznik 
							
						 
					 
					
						
						
						
						
							
						
						
							fcfb1544e8 
							
						 
					 
					
						
						
							
							docs(aio): changed confusing term ( #19762 )  
						
						... 
						
						
						
						Controller should be decorator I believe
PR Close  #19762  
						
						
					 
					
						2017-10-18 11:18:26 -07:00