| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Judy Bogart | f1ab394218 | docs: add api doc to commonly queried elements | 2018-07-20 12:39:10 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | b433d2148c | fix: change some angular.io to angular.cn | 2018-03-26 16:34:57 +08: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 | 2b6e7c8ca1 | feat: 翻译完了 NgModule 部分 | 2018-03-21 14:02:05 +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 | 524bb11cd5 | fix: 公开改为公共 | 2018-03-09 13:23:04 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 964266f4b0 | fix: 合并第一版的翻译 | 2018-03-07 15:42:49 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | fc58e0eee0 | fix: 合并第二版的翻译 | 2018-03-07 14:54:27 +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 |  | 
			
				
					| 
							
							
								 George Kalpakas | 81e87095b4 | docs: several minor NgModuleguide fixes/improvements (#21589)PR Close #21589 | 2018-01-18 18:22:20 -06:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | 53f91189a1 | docs(aio): add NgModule docs (#20306) PR Close #20306 | 2018-01-10 16:26:46 -08:00 |  |