| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Chuck Jazdzewski | b37cee36f9 | fix(language-service): correct instructions to install the language service (#22000) Fixes: #21956
PR Close #22000 | 2018-02-07 12:09:00 -08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 477be082fb | fix: minor improvement | 2017-08-06 08:06:53 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 019cd2e09c | fix: minor improvement | 2017-08-06 08:05:08 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 446b0be846 | fix: minor improvement | 2017-08-05 23:51:25 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e7692d9e6f | fix: translated language service | 2017-08-05 23:49:55 +08:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | 375d598a9f | docs(aio): add George's fixes | 2017-07-17 14:49:19 -07:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | cd67fced1c | docs(aio): add npm install to Sublime instructions | 2017-07-17 14:49:19 -07:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | a77cf7ee37 | docs(aio): add Chuck's comments | 2017-07-17 14:49:19 -07:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | 2150b45954 | docs(aio): add language service doc | 2017-07-17 14:49:19 -07:00 |  |