@@ -507,11 +507,11 @@ If you remove the placeholder, the ICU expression will not appear in your transl
The second translation unit contains the `select` clause:
-
+
The following example shows both translation units after translating:
-
+
{@a translate-nested}
@@ -519,15 +519,15 @@ The following example shows both translation units after translating:
Angular treats a nested expression in the same manner as an alternate expression, extracting it into two translation units. The first contains the text outside of the nested expression:
-
+
The second translation unit contains the complete nested expression:
-
+
The following example shows both translation units after translating:
-
+
{@a merge}
{@a merge-aot}
diff --git a/aio/content/guide/lifecycle-hooks.md b/aio/content/guide/lifecycle-hooks.md
index 0138da9ee5..3cfa3f2414 100644
--- a/aio/content/guide/lifecycle-hooks.md
+++ b/aio/content/guide/lifecycle-hooks.md
@@ -55,7 +55,7 @@ You don't have to implement all (or any) of the lifecycle hooks, just the ones y
### Lifecycle event sequence
-## 生命周期的顺序
+### 生命周期的顺序
After your application instantiates a component or directive by calling its constructor, Angular calls the hook methods you have implemented at the appropriate point in the lifecycle of that instance.
@@ -310,7 +310,7 @@ Angular 会按以下顺序执行钩子方法。你可以用它来执行以下类
### Lifecycle example set
-## 生命周期范例
+### 生命周期范例
The
demonstrates the use of lifecycle hooks through a series of exercises
@@ -933,7 +933,7 @@ which can only be reached by querying for them via the property decorated with
{@a no-unidirectional-flow-worries}
-
No need to wait for content updates
diff --git a/aio/content/guide/setup-local.md b/aio/content/guide/setup-local.md
index 2e1d136ede..1ce5c1130b 100644
--- a/aio/content/guide/setup-local.md
+++ b/aio/content/guide/setup-local.md
@@ -74,7 +74,7 @@ To install Angular on your local system, you need the following:
This guide uses the [npm client](https://docs.npmjs.com/cli/install) command line interface, which is installed with `Node.js` by default.
To check that you have the npm client installed, run `npm -v` in a terminal window.
-Angular、Angular CLI 以及 Angular 应用都要依赖 [npm 包](https://docs.npmjs.com/getting-started/what-is-npm)来实现很多特性和功能。要下载并安装 npm 包，你需要一个 npm 包管理器。本指南使用 [npm 客户端](https://docs.npmjs.com/cli/install)命令行界面，该界面默认安装在 `Node.js`。要检查你是否安装了 npm 客户端，请在终端窗口中运行 `npm -v` 。
+ Angular、Angular CLI 以及 Angular 应用都要依赖 [npm 包](https://docs.npmjs.com/getting-started/what-is-npm)来实现很多特性和功能。要下载并安装 npm 包，你需要一个 npm 包管理器。本指南使用 [npm 客户端](https://docs.npmjs.com/cli/install)命令行界面，该界面默认安装在 `Node.js`。要检查你是否安装了 npm 客户端，请在终端窗口中运行 `npm -v` 。
{@a install-cli}
diff --git a/aio/content/tutorial/toh-pt6.md b/aio/content/tutorial/toh-pt6.md
index a04908d8ae..bf57d7b8a0 100644
--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@@ -26,6 +26,7 @@ Angular's `HttpClient`.
要查看本页所讲的范例程序，参见。
+
## Enable HTTP services
## 启用 HTTP 服务
diff --git a/temp.md b/temp.md
deleted file mode 100644
index 4617f533ad..0000000000
--- a/temp.md
+++ /dev/null
@@ -1,36 +0,0 @@
-### Using absolute URLs for HTTP (data) requests on the server
-
-### 在服务器端使用HTTP（数据）请求的绝对URL
-
-
-The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
-These services send requests to *relative* URLs such as `api/heroes`.
-In a server-side rendered app, HTTP URLs must be *absolute* (for example, `https://my-server.com/api/heroes`).
-This means that the URLs must be somehow converted to absolute when running on the server and be left relative when running in the browser.
-
-本教程的`HeroService`和`HeroSearchService`委托给Angular `HttpClient`模块来获取应用数据。这些服务会向`api/heroes`类的*相对* URL发送请求。在服务器端呈现的应用中，HTTP URL必须是*绝对的* （例如， `https://my-server.com/api/heroes` ）。这意味着当在服务器上运行时，URL必须以某种方式转换为绝对值，并且当在浏览器中运行时，它们是相对的。
-
-
-If you are using one of the `@nguniversal/*-engine` packages (such as `@nguniversal/express-engine`), this is taken care for you automatically.
-You don't need to do anything to make relative URLs work on the server.
-
-如果你正在使用其中一个`@nguniversal/*-engine`软件包（例如`@nguniversal/express-engine` ），这会自动为你服务。你无需做任何事情来让相对URL在服务器上运行。
-
-
-If, for some reason, you are not using an `@nguniversal/*-engine` package, you may need to handle it yourself.
-
-如果，出于某种原因，你没有使用`@nguniversal/*-engine`包，你可能需要亲自处理它。
-
-
-The recommended solution is to pass the full request URL to the `options` argument of [renderModule()](api/platform-server/renderModule) or [renderModuleFactory()](api/platform-server/renderModuleFactory) (depending on what you use to render `AppServerModule` on the server).
-This option is the least intrusive as it does not require any changes to the app.
-Here, "request URL" refers to the URL of the request as a response to which the app is being rendered on the server.
-For example, if the client requested `https://my-server.com/dashboard` and you are rendering the app on the server to respond to that request, `options.url` should be set to `https://my-server.com/dashboard`.
-
-建议的解决方案是将完整的请求URL传递给[renderModule（）](api/platform-server/renderModule)或[renderModuleFactory（）](api/platform-server/renderModuleFactory)的`options`参数（具体取决于你在服务器上渲染`AppServerModule`用途）。此选项的侵入性最小，因为它不需要对应用进行任何更改。这里，“request URL”指的是请求的URL，作为应用在服务器上呈现的响应。例如，如果客户端请求了`https://my-server.com/dashboard`并且要在服务器上渲染该应用来响应该请求，那么`options.url`应设置为`https://my-server.com/dashboard` 。
-
-
-Now, on every HTTP request made as part of rendering the app on the server, Angular can correctly resolve the request URL to an absolute URL, using the provided `options.url`.
-
-现在，作为在服务器上呈现应用的一部分，每次HTTP请求，Angular都可以使用提供的`options.url`正确地将请求URL解析为绝对URL。
-