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

..

ajs-quick-reference.md

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

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

animations.md

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

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

aot-compiler.md

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

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

api-page-class.md

feat(aio): first pass API docs redesign (#21874)

2018-02-09 13:05:16 -08:00

architecture.md

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

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

attribute-directives.md

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

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

bootstrapping.md

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

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

browser-support.md

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

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

change-log.md

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

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

cheatsheet.md

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

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

comparing-observables.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

component-interaction.md

docs(aio): fix broken link in guide/component-interaction (#20411)

2017-11-14 10:00:46 -08:00

component-styles.md

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

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

dependency-injection-in-action.md

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

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

dependency-injection-pattern.md

docs: Dependency Injection guides for CLI (#19892)

2017-11-14 10:00:28 -08:00

dependency-injection.md

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

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

deployment.md

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

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

displaying-data.md

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

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

docs-style-guide.md

docs: add missing underline (#21892)

2018-02-02 07:49:32 -08:00

dynamic-component-loader.md

…

dynamic-form.md

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

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

entry-components.md

docs(aio): several fix for ngmodule guides (#21517)

2018-02-09 13:03:47 -08:00

feature-modules.md

docs(aio): several fix for ngmodule guides (#21517)

2018-02-09 13:03:47 -08:00

form-validation.md

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

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

forms.md

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

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

frequent-ngmodules.md

docs: several minor NgModule guide fixes/improvements (#21589)

2018-01-18 18:22:20 -06:00

glossary.md

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

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

hierarchical-dependency-injection.md

…

http.md

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

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

i18n.md

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

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

language-service.md

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

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

lazy-loading-ngmodules.md

docs: several minor NgModule guide fixes/improvements (#21589)

2018-01-18 18:22:20 -06:00

lifecycle-hooks.md

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

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

module-types.md

docs: several minor NgModule guide fixes/improvements (#21589)

2018-01-18 18:22:20 -06:00

ngmodule-api.md

docs: several minor NgModule guide fixes/improvements (#21589)

2018-01-18 18:22:20 -06:00

ngmodule-faq.md

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

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

ngmodule-vs-jsmodule.md

docs: fix ngmodules-jsmodules pre-req (#22316)

2018-02-22 11:20:47 -08:00

ngmodules.md

docs(aio): several fix for ngmodule guides (#21517)

2018-02-09 13:03:47 -08:00

npm-packages.md

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

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

observables-in-angular.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

observables.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

pipes.md

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

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

practical-observable-usage.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

providers.md

docs(aio): several fix for ngmodule guides (#21517)

2018-02-09 13:03:47 -08:00

quickstart.md

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

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

reactive-forms.md

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

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

router.md

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

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

rx-library.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

security.md

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

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

service-worker-communications.md

docs: change titles to sentence case (#21620)

2018-01-18 18:22:09 -06:00

service-worker-config.md

docs: change titles to sentence case (#21620)

2018-01-18 18:22:09 -06:00

service-worker-devops.md

docs(service-worker): describe safety-worker.js in SW guide (#21921)

2018-01-31 10:25:14 -08:00

service-worker-getting-started.md

docs: change titles to sentence case (#21620)

2018-01-18 18:22:09 -06:00

service-worker-intro.md

docs: change titles to sentence case (#21620)

2018-01-18 18:22:09 -06:00

set-document-title.md

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

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

setup-systemjs-anatomy.md

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

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

setup.md

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

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

sharing-ngmodules.md

docs: several minor NgModule guide fixes/improvements (#21589)

2018-01-18 18:22:20 -06:00

singleton-services.md

docs: fix/improve example for singleton-services guide (#21589)

2018-01-18 18:22:20 -06:00

structural-directives.md

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

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

styleguide.md

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

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

template-syntax.md

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

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

testing-observables.md

docs(aio): add Observable and Rx docs (#21423)

2018-02-27 11:24:31 -08:00

testing.md

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

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

ts-to-js.md

…

typescript-configuration.md

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

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

universal.md

…

upgrade.md

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

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

user-input.md

…

visual-studio-2015.md

…

webpack.md

…