Zhicheng WANG 8744f17f5d Merge remote-tracking branch 'en/master' into aio ...

# Conflicts:
#	aio/content/cli/index.md
#	aio/content/file-not-found.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/build.md
#	aio/content/guide/deployment.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/glossary.md
#	aio/content/guide/i18n.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/testing.md
#	aio/content/guide/upgrade-performance.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/documents/document.service.ts
#	aio/src/app/layout/top-menu/top-menu.component.ts
#	aio/src/index.html
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/cli/cli-container.template.html
#	aio/tools/transforms/templates/lib/githubLinks.html
#	aio/yarn.lock
#	packages/animations/src/animation_metadata.ts
#	packages/common/http/src/backend.ts
#	packages/common/http/src/client.ts
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/module.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/request.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_class.ts
#	packages/common/src/directives/ng_style.ts
#	packages/common/src/directives/ng_switch.ts
#	packages/common/src/i18n/format_date.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/core/src/change_detection/change_detection_util.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/element_ref.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/lifecycle_hooks.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/platform-browser/src/browser.ts
#	packages/platform-browser/src/security/dom_sanitization_service.ts
#	packages/router/src/config.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/shared.ts

2018-12-29 16:04:37 +08:00

..

ajs-quick-reference.md

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

2018-10-21 17:43:29 +08:00

animations.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

aot-compiler.md

docs: 文字微调

2018-10-26 11:33:27 +08:00

architecture-components.md

fix: ssr issue for typescript

2018-10-25 09:55:16 +08:00

architecture-modules.md

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

2018-12-29 16:04:37 +08:00

architecture-next-steps.md

docs: 文字微调

2018-10-26 11:33:27 +08:00

architecture-services.md

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

2018-12-29 16:04:37 +08:00

architecture.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

attribute-directives.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

bootstrapping.md

错别字：又 → 有

2018-12-24 23:23:37 +08:00

browser-support.md

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

2018-10-21 17:43:29 +08:00

build.md

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

2018-12-29 16:04:37 +08:00

change-log.md

docs: 翻译完了表单概览

2018-10-25 09:55:17 +08:00

cheatsheet.md

fix: 修复遗漏的翻译

2018-10-26 09:40:06 +08:00

comparing-observables.md

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

2018-10-21 17:43:29 +08:00

complex-animation-sequences.md

fix: 修改完了复杂动画序列

2018-10-28 12:07:21 +08:00

component-interaction.md

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

2018-10-21 17:43:29 +08:00

component-styles.md

fix: 翻译改进

2018-12-20 09:21:56 +08:00

custom-elements.md

…

dependency-injection-in-action.md

fix:修正错别字

2018-12-09 19:24:29 +08:00

dependency-injection-navtree.md

docs: 翻译完了 DI navtree

2018-10-24 09:27:00 +08:00

dependency-injection-providers.md

docs: 翻译完了 DI providers

2018-10-23 15:26:26 +08:00

dependency-injection.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

deployment.md

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

2018-12-29 16:04:37 +08:00

displaying-data.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

docs-style-guide.md

fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

2018-10-17 11:05:29 -07:00

dynamic-component-loader.md

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

2018-12-29 16:04:37 +08:00

dynamic-form.md

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

2018-10-21 17:43:29 +08:00

elements.md

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

2018-12-29 16:04:37 +08:00

entry-components.md

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

2018-10-21 17:43:29 +08:00

feature-modules.md

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

2018-12-29 16:04:37 +08:00

file-structure.md

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

2018-12-29 16:04:37 +08:00

form-validation.md

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

2018-12-29 16:04:37 +08:00

forms-overview.md

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

2018-12-29 16:04:37 +08:00

forms.md

Merge remote-tracking branch 'origin/aio' into aio

2018-10-22 19:49:22 +08:00

frequent-ngmodules.md

docs: 修复一个错误

2018-10-23 14:45:15 +08:00

glossary.md

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

2018-12-29 16:04:37 +08:00

hierarchical-dependency-injection.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

http.md

docs: 翻译完了表单概览

2018-10-25 09:55:17 +08:00

i18n.md

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

2018-12-29 16:04:37 +08:00

language-service.md

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

2018-07-27 10:51:18 +08:00

lazy-loading-ngmodules.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

lifecycle-hooks.md

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

2018-10-21 17:43:29 +08:00

module-types.md

…

ngmodule-api.md

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

2018-07-27 10:51:18 +08:00

ngmodule-faq.md

Update: ngmodule-faq.md

2018-10-23 15:43:26 +08:00

ngmodule-vs-jsmodule.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

ngmodules.md

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

2018-10-21 17:43:29 +08:00

npm-packages.md

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

2018-12-29 16:04:37 +08:00

observables-in-angular.md

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

2018-10-21 17:43:29 +08:00

observables.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

pipes.md

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

2018-10-21 17:43:29 +08:00

practical-observable-usage.md

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

2018-10-21 17:43:29 +08:00

providers.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

quickstart.md

fix: typo

2018-10-30 09:51:35 +08:00

reactive-forms.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

releases.md

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

2018-12-29 16:04:37 +08:00

reusable-animations.md

fix: 修改完了路由动画

2018-10-28 13:07:05 +08:00

route-animations.md

fix: typo

2018-10-28 15:56:03 +08:00

router.md

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

2018-12-29 16:04:37 +08:00

rx-library.md

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

2018-10-21 17:43:29 +08:00

security.md

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

2018-12-29 16:04:37 +08:00

service-worker-communications.md

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

2018-10-21 17:43:29 +08:00

service-worker-config.md

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

2018-12-29 16:04:37 +08:00

service-worker-devops.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

service-worker-getting-started.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

service-worker-intro.md

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

2018-12-29 16:04:37 +08:00

set-document-title.md

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

2018-10-21 17:43:29 +08:00

setup.md

fix: 文字微调

2018-10-30 13:07:38 +08:00

sharing-ngmodules.md

…

singleton-services.md

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

2018-10-21 17:43:29 +08:00

structural-directives.md

fix: typo

2018-12-05 10:46:08 +08:00

styleguide.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

template-syntax.md

fix: 让表达更清晰

2018-12-17 11:17:59 +08:00

testing.md

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

2018-12-29 16:04:37 +08:00

transition-and-triggers.md

fix: 修改完了路由动画

2018-10-28 13:07:05 +08:00

typescript-configuration.md

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

2018-10-21 17:43:29 +08:00

universal.md

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

2018-12-29 16:04:37 +08:00

updating.md

fix: 修改完了路由动画

2018-10-28 13:07:05 +08:00

upgrade-performance.md

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

2018-12-29 16:04:37 +08:00

upgrade.md

docs: 翻译完了表单概览

2018-10-25 09:55:17 +08:00

user-input.md

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

2018-10-21 17:43:29 +08:00

visual-studio-2015.md

docs: 手动解决冲突

2018-10-22 18:16:47 +08:00

workspace-config.md

docs: Fix links (#27027)

2018-11-09 09:40:44 -08:00