| 
							
							
								 rexebin | d9af771f8d | Merge remote-tracking branch 'remotes/angular.io/master' # Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade | 2016-09-23 22:13:02 +01:00 |  | 
			
				
					| 
							
							
								 Patrice Chalin | 0f99a7c130 | docs(cookbook): don't use shredder on intro page (#2418) Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389. | 2016-09-20 10:59:14 -07:00 |  | 
			
				
					| 
							
							
								 Jesús Rodríguez | 693f6ae462 | chore: rename Angular 2 to simply Angular (#2402) | 2016-09-19 20:24:40 -07:00 |  | 
			
				
					| 
							
							
								 Rex | 3659248ee5 | continue review of "我们" keyword. | 2016-06-20 12:29:43 +01:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 335ac9d0a3 | 全部“烹饪书”改名为“烹饪宝典” | 2016-05-22 19:26:23 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | f50b34ad4f | 烹饪书-依赖注入 二审中 | 2016-05-17 20:36:35 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e139c6b561 | 烹饪书-组件通讯 二审完毕 | 2016-05-17 19:29:33 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | cfd794169c | 烹饪书-首页 二审完毕 | 2016-05-17 08:59:15 +08:00 |  | 
			
				
					| 
							
							
								 Zhimin(Rex) YE | 5b81a84a46 | cookbook index.jade review. | 2016-05-14 10:51:05 +01:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 274bfc1202 | 把“Cookbook”翻译成中文。 基础知识首页一审完毕。 | 2016-05-13 18:15:42 +08:00 |  | 
			
				
					| 
							
							
								 Zhimin(Rex) YE | c82e705640 | cookbook/index.jade ./dependency-injection.jade partial. | 2016-04-24 11:21:07 +01:00 |  | 
			
				
					| 
							
							
								 Tero Parviainen | 7f11a6ce05 | docs(cb-ts-to-js): add cookbook about applying TypeScript examples to ES5 closes #893 | 2016-03-27 23:36:51 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | b0f1f3a4b8 | docs: simplify left nav selection/scroll also added some blog posts to resources | 2016-03-04 23:54:44 -08:00 |  | 
			
				
					| 
							
							
								 Josh Otis | 746a6649b2 | chore: new flat left navigation panel (all language tracks) | 2016-03-03 04:51:52 -08:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 2f82a51e0f | chore: rename cookbooks -> cookbook | 2016-02-22 02:08:47 -08:00 |  |