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

# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

2016-06-01 09:51:27 +01:00

..

api

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

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

cookbook

开发指南-生命周期钩子 翻译完毕

2016-05-26 19:02:38 +08:00

guide

docs: fix numerous typos in many doc files.

2016-06-01 01:08:56 -07:00

testing

chore: new flat left navigation panel (all language tracks)

2016-03-03 04:51:52 -08:00

tutorial

chore: fix broken devguide links as of May 31

2016-06-01 00:52:22 -07:00

_data.json

docs(ts/js): update to rc1

2016-05-03 17:29:00 -06:00

_util-fns.jade

improved infrastructure for devguide and revised getting started (TS)

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

cheatsheet.jade

docs(cheatsheet): remove outdated beta warning

2016-05-22 19:56:38 -07:00

glossary.jade

docs(sidenav reorg): remove glossary and cheatsheet from REFERENCE. Move glossary to BASICS. Rename REFERENCE to API REFERENCE

2016-04-25 14:10:57 -07:00

help.jade

fixed duplication for help

2015-03-04 19:33:12 -08:00

index.jade

converts docs landing template to use layout classnames rather than attribute syntax

2016-05-02 19:55:59 -07:00

quickstart.jade

docs: fix numerous typos in many doc files.

2016-06-01 01:08:56 -07:00

resources.jade

docs: simplify left nav selection/scroll

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

styleguide.jade

docs: temporary TS-referencing chapters for gaps in JS/Dart

2016-03-01 11:22:04 -08:00