From 6a99521f8bfe6daedc48318feca3f71627c44bcd Mon Sep 17 00:00:00 2001
From: Zhicheng WANG <zcwang@thoughtworks.com>
Date: Wed, 5 Feb 2020 14:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/angular-compiler-options.md
#	aio/content/guide/aot-metadata-errors.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/glossary.md
#	aio/content/guide/ivy.md
#	aio/content/guide/observables.md
#	aio/content/guide/router.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/template-typecheck.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/updating-to-version-9.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/layout/footer/footer.component.html
#	aio/yarn.lock
#	packages/common/src/pipes/number_pipe.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/model.ts
---
 aio/content/guide/glossary.md        | 2 ++
 aio/content/guide/template-syntax.md | 2 ++
 aio/content/tutorial/toh-pt6.md      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/aio/content/guide/glossary.md b/aio/content/guide/glossary.md
index b047c88bc4..6d7d70dabd 100644
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@@ -1607,6 +1607,8 @@ The translation process that transforms one version of JavaScript to another ver
 
 ## tree
 
+## 目录树（tree）
+
 In [schematics](#schematic), a virtual file system represented by the `Tree` class.
 Schematic [rules](#rule) take a tree object as input, operate on them, and return a new tree object.
 
diff --git a/aio/content/guide/template-syntax.md b/aio/content/guide/template-syntax.md
index 53ebfa7bc0..575b41b1e1 100644
--- a/aio/content/guide/template-syntax.md
+++ b/aio/content/guide/template-syntax.md
@@ -2438,6 +2438,8 @@ You can also apply an `NgFor` to a component element, as in the following exampl
 
 <header>*ngFor microsyntax</header>
 
+<header>`*ngFor` 微语法</header>
+
 The string assigned to `*ngFor` is not a [template expression](guide/template-syntax#template-expressions). Rather,
 it's a *microsyntax*&mdash;a little language of its own that Angular interprets.
 The string `"let item of items"` means:
diff --git a/aio/content/tutorial/toh-pt6.md b/aio/content/tutorial/toh-pt6.md
index 542c2d27a8..15785d12a1 100644
--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@@ -1,5 +1,7 @@
 # Get data from a server
 
+# 从服务端获取数据
+
 In this tutorial, you'll add the following data persistence features with help from
 Angular's `HttpClient`.