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

..

index.md

Merge remote-tracking branch 'en/master' into aio

2018-02-28 08:08:59 +08:00

toh-pt0.md

docs(aio): typo fix (#20318)

2017-11-10 11:12:07 -08:00

toh-pt1.md

Merge remote-tracking branch 'en/master' into aio

2018-02-28 13:13:29 +08:00

toh-pt2.md

docs(aio): show correct path for mock-heroes code (#20323)

2017-11-10 10:59:25 -08:00

toh-pt3.md

docs(aio): Fix name of component (#22332)

2018-02-20 15:41:35 -08:00

toh-pt4.md

docs(aio): fix TOH inclusion of HeroesService. (#21228)

2018-02-07 12:01:32 -08:00

toh-pt5.md

docs(aio): fix numbering of the three ways to access hero details (#20647)

2017-12-05 21:54:34 -08:00

toh-pt6.md

docs(aio): fix doc typo referring to httpOptions (#22456)

2018-02-26 13:32:44 -08:00