Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master' ...

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

2016-09-26 15:14:39 +01:00

..

api

refact(docs-app): move filtered API list into a directive

2015-12-10 21:35:02 -08:00

cookbook

fix： change all 他 > 它

2016-09-25 19:50:45 +01:00

guide

docs(js/guide): don't use shredder & _data.json fixes (#2467)

2016-09-24 14:30:06 -07:00

testing

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00

tutorial

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00

_data.json

docs: fix {ts,dart,js}/latest/_data.json (#2387)

2016-09-20 00:52:41 +02:00

_util-fns.jade

improved infrastructure for devguide and revised getting started (TS)

2015-09-10 13:32:57 -07:00

cheatsheet.jade

chore(cheatsheet): fix double banner issue (#2293)

2016-09-08 15:01:39 -07:00

glossary.jade

docs(glossary): general cleanup and fix links (#2100)

2016-08-17 17:50:42 -07:00

help.jade

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00

index.jade

docs(lang/latest): parameterize landing page Jade by language (#2389)

2016-09-19 20:14:31 -07:00

quickstart.jade

docs(quickstart): Change Npm to npm (#2398)

2016-09-21 11:32:36 -07:00

resources.jade

docs: simplify left nav selection/scroll

2016-03-04 23:54:44 -08:00

styleguide.jade

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00