| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 thanhpd | 4006c9b6e6 | docs: fix spelling errors (#26213) PR Close #26213 | 2018-10-05 14:18:19 -07:00 |  | 
			
				
					| 
							
							
								 Ro Savage | b8887ddf16 | docs: fix table in comparing observables guide (#22485) PR Close #22485 | 2018-08-06 13:41:15 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 77a2381d0a | fix: sync to 6.0(WIP) | 2018-05-07 13:06:47 +08:00 |  | 
			
				
					| 
							
							
								 Anuj | 010a4efa8c | docs(aio): Fixed typo in 'comparing observables -> Observabled compared (#23407) to arrays' section.
PR Close #23407 | 2018-04-17 13:43:45 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e167fa5229 | refactor: 重构自动翻译代码 | 2018-03-24 20:03:10 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 6c3d57aee9 | fix: 合并了最新版本 | 2018-03-24 13:12:42 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | a4ac40b640 | fix: 翻译了所有遗漏的部分。 | 2018-03-24 11:16:33 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 935fdf30dc | feat: 翻译完了 Observable 与 RxJS | 2018-03-20 11:31:56 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | fc58e0eee0 | fix: 合并第二版的翻译 | 2018-03-07 14:54:27 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 9adeb14f3a | fix: 人工修订自动翻译 | 2018-03-07 12:26:05 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 51bd598826 | fix: 修正自动翻译结果 | 2018-03-07 10:55:42 +08:00 |  | 
			
				
					| 
							
							
								 SangKa.Z | 3aea8fd5f3 | docs(aio): fix table header (#22553) PR Close #22553 | 2018-03-05 10:13:16 -08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 206f6ecc4f | fix: 修正最后一版的全部翻译 | 2018-03-04 09:07:33 +08:00 |  | 
			
				
					| 
							
							
								 Jason Aden | 79656e7f96 | docs(aio): add Observable and Rx docs (#21423) PR Close #21423 | 2018-02-27 11:24:31 -08:00 |  |