diff --git a/content/zh/docs/reference/glossary/addons.md b/content/zh/docs/reference/glossary/addons.md
index 00a871a227..31fc1f0098 100644
--- a/content/zh/docs/reference/glossary/addons.md
+++ b/content/zh/docs/reference/glossary/addons.md
@@ -1,5 +1,5 @@
 ---
-title: 附加组件
+title: 附加组件（Add-ons）
 id: addons
 date: 2019-12-15
 full_link: /zh/docs/concepts/cluster-administration/addons/
@@ -10,14 +10,12 @@ aka:
 tags:
 - tool
 ---
-  扩展 Kubernetes 功能的资源。
-
 <!--
 ---
 title: Add-ons
 id: addons
 date: 2019-12-15
-full_link: /zh/docs/concepts/cluster-administration/addons/
+full_link: /docs/concepts/cluster-administration/addons/
 short_description: >
   Resources that extend the functionality of Kubernetes.
 
@@ -25,13 +23,18 @@ aka:
 tags:
 - tool
 ---
+-->
+
+
+<!--
   Resources that extend the functionality of Kubernetes.
 -->
+  扩展 Kubernetes 功能的资源。
 
 
 <!--more-->
 
 <!-- 
-[Installing addons](/docs/concepts/cluster-administration/addons/) explains more about using add-ons with your cluster, and lists some popular add-ons. 
+[Installing addons](/docs/concepts/cluster-administration/addons/) explains more about using add-ons with your cluster, and lists some popular add-ons.
 -->
-[安装附加组件](/docs/concepts/cluster-administration/addons/) 阐释了更多关于如何在集群内使用附加组件，并列出了一些流行的附加组件。
+[安装附加组件](/zh/docs/concepts/cluster-administration/addons/) 阐释了更多关于如何在集群内使用附加组件，并列出了一些流行的附加组件。
diff --git a/content/zh/docs/reference/glossary/admission-controller.md b/content/zh/docs/reference/glossary/admission-controller.md
index adbd681fae..22567c4861 100644
--- a/content/zh/docs/reference/glossary/admission-controller.md
+++ b/content/zh/docs/reference/glossary/admission-controller.md
@@ -1,5 +1,5 @@
 ---
-title: 准入控制器
+title: 准入控制器（Admission Controller）
 id: admission-controller
 date: 2019-06-28
 full_link: /zh/docs/reference/access-authn-authz/admission-controllers/
@@ -11,12 +11,13 @@ tags:
 - security
 ---
 
+
 <!--
 ---
 title: Admission Controller
 id: admission-controller
 date: 2019-06-28
-full_link: /zh/docs/reference/access-authn-authz/admission-controllers/
+full_link: /docs/reference/access-authn-authz/admission-controllers/
 short_description: >
   A piece of code that intercepts requests to the Kubernetes API server prior to persistence of the object.
 
@@ -24,12 +25,17 @@ aka:
 tags:
 - extension
 - security
----
+---																										 
 -->
 
+
+<!--
+A piece of code that intercepts requests to the Kubernetes API server prior to persistence of the object.
+-->
 在对象持久化之前拦截 Kubernetes Api 服务器请求的一段代码
 
 <!--more-->
+
 <!--
 Admission controllers are configurable for the Kubernetes API server and may be “validating”, “mutating”, or
 both. Any admission controller may reject the request. Mutating controllers may modify the objects they admit;
@@ -41,4 +47,4 @@ validating controllers may not.
 准入控制器可针对 Kubernetes Api 服务器进行配置，可以执行验证，变更或两者都执行。任何准入控制器都可以拒绝访问请求。
 变更（mutating）控制器可以修改其允许的对象，验证（validating）控制器则不可以。
 
-* [Kubernetes 文档中的准入控制器](/docs/reference/access-authn-authz/admission-controllers/)
\ No newline at end of file
+* [Kubernetes 文档中的准入控制器](/zh/docs/reference/access-authn-authz/admission-controllers/)
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/aggregation-layer.md b/content/zh/docs/reference/glossary/aggregation-layer.md
index ffcd784d55..9ad14962cf 100644
--- a/content/zh/docs/reference/glossary/aggregation-layer.md
+++ b/content/zh/docs/reference/glossary/aggregation-layer.md
@@ -1,5 +1,5 @@
 ---
-title: 聚合层
+title: 聚合层（Aggregation Layer）
 id: aggregation-layer
 date: 2018-10-08
 full_link: /zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/
@@ -12,13 +12,12 @@ tags:
 - extension
 - operation
 ---
-
 <!--
 ---
 title: Aggregation Layer
 id: aggregation-layer
 date: 2018-10-08
-full_link: /zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/
+full_link: /docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/
 short_description: >
   The aggregation layer lets you install additional Kubernetes-style APIs in your cluster.
 
@@ -30,16 +29,20 @@ tags:
 ---
 -->
 
+
+
+
 <!--
  The aggregation layer lets you install additional Kubernetes-style APIs in your cluster.
 -->
 
 聚合层允许您在自己的集群上安装额外的 Kubernetes 风格的 API。
 
-<!--more--> 
+<!--more-->
+ 
 
 <!--
-When you've configured the {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} to [support additional APIs](/docs/tasks/access-kubernetes-api/configure-aggregation-layer/), you can add `APIService` objects to "claim" a URL path in the Kubernetes API.
+When you've configured the {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} to [support additional APIs](/docs/tasks/extend-kubernetes/configure-aggregation-layer/), you can add `APIService` objects to "claim" a URL path in the Kubernetes API.
 -->
 
-当您配置了 {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} 来 [支持额外的 API](/docs/tasks/access-kubernetes-api/configure-aggregation-layer/)，您就可以在 Kubernetes API 中增加 `APIService` 对象来  "申领（Claim）" 一个 URL 路径。 
+当您配置了 {{< glossary_tooltip text="Kubernetes API Server" term_id="kube-apiserver" >}} 来 [支持额外的 API](/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer/)，您就可以在 Kubernetes API 中增加 `APIService` 对象来  "申领（Claim）" 一个 URL 路径。 
diff --git a/content/zh/docs/reference/glossary/annotation.md b/content/zh/docs/reference/glossary/annotation.md
index a5da0a060f..a305352e32 100644
--- a/content/zh/docs/reference/glossary/annotation.md
+++ b/content/zh/docs/reference/glossary/annotation.md
@@ -1,5 +1,5 @@
 ---
-title: 注解
+title: 注解（Annotation）
 id: annotation
 date: 2018-04-12
 full_link: /zh/docs/concepts/overview/working-with-objects/annotations/
@@ -16,7 +16,7 @@ tags:
 title: Annotation
 id: annotation
 date: 2018-04-12
-full_link: /zh/docs/concepts/overview/working-with-objects/annotations/
+full_link: /docs/concepts/overview/working-with-objects/annotations
 short_description: >
   A key-value pair that is used to attach arbitrary non-identifying metadata to objects.
 
@@ -26,6 +26,8 @@ tags:
 ---
 -->
 
+
+
 <!--
  A key-value pair that is used to attach arbitrary non-identifying metadata to objects.
 -->
@@ -35,8 +37,10 @@ tags:
 <!--more--> 
 
 <!--
-The metadata in an annotation can be small or large, structured or unstructured, and can include characters not permitted by labels. Clients such as tools and libraries can retrieve this metadata.
+The metadata in an annotation can be small or large, structured or unstructured, and can include characters not permitted by {{< glossary_tooltip text="labels" term_id="label" >}}. Clients such as tools and libraries can retrieve this metadata.
 -->
 
-注解中的元数据可大可小，可以是结构化的也可以是非结构化的，并且能包含标签不允许使用的字符。像工具和软件库这样的客户端可以检索这些元数据。
+注解中的元数据可大可小，可以是结构化的也可以是非结构化的，
+并且能包含{{< glossary_tooltip text="标签" term_id="label" >}}不允许使用的字符。
+像工具和软件库这样的客户端可以检索这些元数据。
 
diff --git a/content/zh/docs/reference/glossary/api-group.md b/content/zh/docs/reference/glossary/api-group.md
index 07c222acbe..d2c360a214 100644
--- a/content/zh/docs/reference/glossary/api-group.md
+++ b/content/zh/docs/reference/glossary/api-group.md
@@ -11,12 +11,13 @@ tags:
 - fundamental
 - architecture
 ---
+
 <!-- 
 ---
 title: API Group
 id: api-group
 date: 2019-09-02
-full_link: /zh/docs/concepts/overview/kubernetes-api/#api-groups
+full_link: /docs/concepts/overview/kubernetes-api/#api-groups
 short_description: >
   A set of related paths in the Kubernetes API.
 
@@ -24,22 +25,26 @@ aka:
 tags:
 - fundamental
 - architecture
----
+---										  
 -->
 
+
 <!-- 
 A set of related paths in Kubernetes API.  
 -->
 Kubernetes API 中的一组相关路径。
 
-<!--more-->
+<!--more-->																																																																											  
 
 <!-- 
 You can enable or disable each API group by changing the configuration of your API server. You can also disable or enable paths to specific resources. API group makes it easier to extend the Kubernetes API. The API group is specified in a REST path and in the `apiVersion` field of a serialized object. 
 -->
-通过更改 API server 的配置，可以启用或禁用每个 API Group。你还可以禁用或启用指向特定资源的路径。API group 使扩展 Kubernetes API 更加的容易。API group 在 REST 路径和序列化对象的 `apiVersion` 字段中指定。
+通过更改 API server 的配置，可以启用或禁用每个 API Group。
+你还可以禁用或启用指向特定资源的路径。
+API group 使扩展 Kubernetes API 更加的容易。
+API group 在 REST 路径和序列化对象的 `apiVersion` 字段中指定。
 
 <!-- 
 * Read [API Group](/docs/concepts/overview/kubernetes-api/#api-groups) for more information. 
 -->
-* 阅读 [API Group](/docs/concepts/overview/kubernetes-api/#api-groups) 了解更多信息。
+* 阅读 [API Group](/zh/docs/concepts/overview/kubernetes-api/#api-groups) 了解更多信息。
diff --git a/content/zh/docs/reference/glossary/app-container.md b/content/zh/docs/reference/glossary/app-container.md
index a3238d65dd..3773e1c1b8 100644
--- a/content/zh/docs/reference/glossary/app-container.md
+++ b/content/zh/docs/reference/glossary/app-container.md
@@ -1,5 +1,5 @@
 ---
-title: 应用程序容器
+title: 应用程序容器（App Container）
 id: app-container
 date: 2019-02-12
 full_link:
@@ -10,7 +10,6 @@ aka:
 tags:
 - workload
 ---
-  应用程序容器（或 app 容器）{{< glossary_tooltip text="容器" term_id="container" >}} 在 {{< glossary_tooltip text="pod" term_id="pod" >}} 中，在 {{< glossary_tooltip text="初始化容器" term_id="init-container" >}} 启动完毕后才开始启动。
 
 <!--
 ---
@@ -25,8 +24,14 @@ aka:
 tags:
 - workload
 ---
+-->
+
+<!--
  Application containers (or app containers) are the {{< glossary_tooltip text="containers" term_id="container" >}} in a {{< glossary_tooltip text="pod" term_id="pod" >}} that are started after any {{< glossary_tooltip text="init containers" term_id="init-container" >}} have completed.
 -->
+  应用程序 {{< glossary_tooltip text="容器" term_id="container" >}} （或 app 容器）在 {{< glossary_tooltip text="pod" term_id="pod" >}} 中，在 {{< glossary_tooltip text="初始化容器" term_id="init-container" >}} 启动完毕后才开始启动。
+
+
 
 <!--more-->
 
@@ -37,5 +42,6 @@ once the application container has started.
 If a pod doesn't have any init containers configured, all the containers in that pod are app containers.
 -->
 
-初始化容器使您可以分离对于 {{< glossary_tooltip text="工作负载" term_id="workload" >}} 整体而言很重要的初始化细节，并且一旦应用容器启动，它不需要继续运行。
+初始化容器使您可以分离对于{{< glossary_tooltip text="工作负载" term_id="workload" >}}
+整体而言很重要的初始化细节，并且一旦应用容器启动，它不需要继续运行。
 如果 pod 没有配置任何初始化容器，则该 pod 中的所有容器都是应用程序容器。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/application-architect.md b/content/zh/docs/reference/glossary/application-architect.md
index 849d1b7685..2ef153ab91 100644
--- a/content/zh/docs/reference/glossary/application-architect.md
+++ b/content/zh/docs/reference/glossary/application-architect.md
@@ -1,5 +1,5 @@
 ---
-title: 应用架构师
+title: 应用架构师（Application Architect）
 id: application-architect
 date: 2018-04-12
 full_link: 
@@ -10,7 +10,6 @@ aka:
 tags:
 - user-type
 ---
- 应用架构师是负责应用高级设计的人。
 
 <!--
 ---
@@ -25,13 +24,21 @@ aka:
 tags:
 - user-type
 ---
+-->
+
+<!--
  A person responsible for the high-level design of an application.
 -->
+ 应用架构师是负责应用高级设计的人。
+
+			
+
 
 <!--more--> 
 <!--
 An architect ensures that an app's implementation allows it to interact with its surrounding components in a scalable, maintainable way. Surrounding components include databases, logging infrastructure, and other microservices.
 -->
 
-应用架构师确保应用的实现允许它和周边组件进行可扩展的、可持续的交互。周边组件包括数据库、日志基础设施和其他微服务。
+应用架构师确保应用的实现允许它和周边组件进行可扩展的、可持续的交互。
+周边组件包括数据库、日志基础设施和其他微服务。
 
diff --git a/content/zh/docs/reference/glossary/application-developer.md b/content/zh/docs/reference/glossary/application-developer.md
index 65650133da..b379b5092a 100644
--- a/content/zh/docs/reference/glossary/application-developer.md
+++ b/content/zh/docs/reference/glossary/application-developer.md
@@ -1,5 +1,5 @@
 ---
-title: 应用开发者
+title: 应用开发者（Application Developer）
 id: application-developer
 date: 2018-04-12
 full_link: 
@@ -26,8 +26,9 @@ tags:
 ---
 -->
 
+
 <!--
-A person who writes an application that runs in a Kubernetes cluster.
+ A person who writes an application that runs in a Kubernetes cluster.
 -->
 
 编写可以在 Kubernetes 集群上运行的应用的人。
diff --git a/content/zh/docs/reference/glossary/applications.md b/content/zh/docs/reference/glossary/applications.md
index cbff609142..c1420495fe 100644
--- a/content/zh/docs/reference/glossary/applications.md
+++ b/content/zh/docs/reference/glossary/applications.md
@@ -1,5 +1,5 @@
 ---
-title: 应用
+title: 应用（Applications）
 id: applications
 date: 2019-05-12
 full_link:
@@ -24,4 +24,8 @@ tags:
 ---
 -->
 
+
+<!--
+ The layer where various containerized applications run.
+-->
  各种容器化应用运行所在的层。
diff --git a/content/zh/docs/reference/glossary/approver.md b/content/zh/docs/reference/glossary/approver.md
index 879ef5e58b..b28762cf16 100644
--- a/content/zh/docs/reference/glossary/approver.md
+++ b/content/zh/docs/reference/glossary/approver.md
@@ -1,5 +1,5 @@
 ---
-title: 批准者
+title: 批准者（Approver）
 id: approver
 date: 2018-04-12
 full_link: 
@@ -26,6 +26,9 @@ tags:
 ---
 -->
 
+<!--
+ A person who can review and approve Kubernetes code contributions.
+-->
  可以审核并批准 Kubernetes 代码贡献的人。
 
 <!--more--> 
@@ -36,5 +39,4 @@ While code review is focused on code quality and correctness, approval is focuse
 
 代码审核的重点是代码质量和正确性，而批准的重点是对贡献的整体接受。
 整体接受包括向后/向前兼容性、遵守 API 和参数约定、细微的性能和正确性问题、与系统其他部分的交互等。
-批准者状态的作用域是代码库的一部分。
-审批者以前被称为维护者。
+批准者状态的作用域是代码库的一部分。审批者以前被称为维护者。
diff --git a/content/zh/docs/reference/glossary/certificate.md b/content/zh/docs/reference/glossary/certificate.md
index c966aea2cb..05b50e37dc 100644
--- a/content/zh/docs/reference/glossary/certificate.md
+++ b/content/zh/docs/reference/glossary/certificate.md
@@ -1,5 +1,5 @@
 ---
-title: 证书
+title: 证书（Certificate）
 id: certificate
 date: 2018-04-12
 full_link: /zh/docs/tasks/tls/managing-tls-in-a-cluster/
@@ -16,7 +16,7 @@ tags:
 title: Certificate
 id: certificate
 date: 2018-04-12
-full_link: /zh/docs/tasks/tls/managing-tls-in-a-cluster/
+full_link: /docs/tasks/tls/managing-tls-in-a-cluster/
 short_description: >
   A cryptographically secure file used to validate access to the Kubernetes cluster.
 
@@ -26,6 +26,7 @@ tags:
 ---
 -->
 
+
 <!--
  A cryptographically secure file used to validate access to the Kubernetes cluster.
 -->
diff --git a/content/zh/docs/reference/glossary/cgroup.md b/content/zh/docs/reference/glossary/cgroup.md
index 10d274a5e5..b1af5e9d9d 100644
--- a/content/zh/docs/reference/glossary/cgroup.md
+++ b/content/zh/docs/reference/glossary/cgroup.md
@@ -1,5 +1,5 @@
 ---
-title: cgroup (控制组)
+title: 控制组（cgroup）
 id: cgroup
 date: 2019-06-25
 full_link:
diff --git a/content/zh/docs/reference/glossary/cidr.md b/content/zh/docs/reference/glossary/cidr.md
index 7e0a97d31e..c99695543c 100644
--- a/content/zh/docs/reference/glossary/cidr.md
+++ b/content/zh/docs/reference/glossary/cidr.md
@@ -10,9 +10,8 @@ aka:
 tags:
 - networking
 ---
-CIDR (无类域间路由) 是一种描述 IP 地址块的符号，被广泛使用于各种网络配置中。
 
-<!-- 
+<!--
 ---
 title: CIDR
 id: cidr
@@ -25,12 +24,20 @@ aka:
 tags:
 - networking
 ---
+-->
+
+<!--
 CIDR (Classless Inter-Domain Routing) is a notation for describing blocks of IP addresses and is used heavily in various networking configurations.
 -->
+CIDR (无类域间路由) 是一种描述 IP 地址块的符号，被广泛使用于各种网络配置中。
+
 
 <!--more-->
 
 <!--
 In the context of Kubernetes, each {{< glossary_tooltip text="Node" term_id="node" >}} is assigned a range of IP addresses through the start address and a subnet mask using CIDR. This allows Nodes to assign each {{< glossary_tooltip text="Pod" term_id="pod" >}} a unique IP address. Although originally a concept for IPv4, CIDR has also been expanded to include IPv6. 
 -->
-在 Kubernetes 的上下文中，每个 {{< glossary_tooltip text="节点" term_id="node" >}} 以 CIDR 形式（含起始地址和子网掩码）获得一个 IP 地址段，从而能够为每个 {{< glossary_tooltip text="Pod" term_id="pod" >}} 分配一个独一无二的 IP 地址。虽然其概念最初源自 IPv4，CIDR 已经被扩展为涵盖 IPv6。
+在 Kubernetes 的上下文中，每个{{< glossary_tooltip text="节点" term_id="node" >}}
+以 CIDR 形式（含起始地址和子网掩码）获得一个 IP 地址段，
+从而能够为每个 {{< glossary_tooltip text="Pod" term_id="pod" >}} 分配一个独一无二的 IP 地址。
+虽然其概念最初源自 IPv4，CIDR 已经被扩展为涵盖 IPv6。
diff --git a/content/zh/docs/reference/glossary/cla.md b/content/zh/docs/reference/glossary/cla.md
index dae58a89e6..5d9f4229cd 100644
--- a/content/zh/docs/reference/glossary/cla.md
+++ b/content/zh/docs/reference/glossary/cla.md
@@ -1,5 +1,5 @@
 ---
-title: CLA (贡献者许可协议)
+title: 贡献者许可协议（CLA）
 id: cla
 date: 2018-04-12
 full_link: https://github.com/kubernetes/community/blob/master/CLA.md
@@ -26,7 +26,10 @@ tags:
 ---
 -->
 
- {{< glossary_tooltip text="贡献者" term_id="contributor" >}} 对他们在开源项目中所贡献的代码的授权许可条款。
+<!--
+ Terms under which a {{< glossary_tooltip text="contributor" term_id="contributor" >}} grants a license to an open source project for their contributions.
+-->
+ {{< glossary_tooltip text="贡献者" term_id="contributor" >}}对他们在开源项目中所贡献的代码的授权许可条款。
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/cloud-controller-manager.md b/content/zh/docs/reference/glossary/cloud-controller-manager.md
index 2fcd729f57..e2f10617e2 100644
--- a/content/zh/docs/reference/glossary/cloud-controller-manager.md
+++ b/content/zh/docs/reference/glossary/cloud-controller-manager.md
@@ -1,5 +1,5 @@
 ---
-title: 云控制器管理器
+title: 云控制器管理器（Cloud Controller Manager）
 id: cloud-controller-manager
 date: 2018-04-12
 full_link: /zh/docs/tasks/administer-cluster/running-cloud-controller/
@@ -18,7 +18,7 @@ tags:
 title: Cloud Controller Manager
 id: cloud-controller-manager
 date: 2018-04-12
-full_link: /zh/docs/tasks/administer-cluster/running-cloud-controller/
+full_link: /docs/concepts/architecture/cloud-controller/
 short_description: >
   Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
 
@@ -30,18 +30,25 @@ tags:
 ---
 -->
 
+
 <!--
- Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
+ A Kubernetes {{< glossary_tooltip text="control plane" term_id="control-plane" >}} component
+that embeds cloud-specific control logic. The cloud controller manager lets you link your
+cluster into your cloud provider's API, and separates out the components that interact
+with that cloud platform from components that just interact with your cluster.
 -->
 
-云控制器管理器是 1.8 的 alpha 特性。在未来发布的版本中，这是将 Kubernetes 与任何其他云集成的最佳方式。
+云控制器管理器是指嵌入特定云的控制逻辑的
+{{< glossary_tooltip text="控制平面" term_id="control-plane" >}}组件。
+云控制器管理器允许您链接聚合到云提供商的应用编程接口中，
+并分离出相互作用的组件与您的集群交互的组件。
 
 <!--more--> 
 
 <!--
-Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops.  These cloud-specific control loops were originally in the kube-controller-manager. Since cloud providers develop and release at a different pace compared to the Kubernetes  project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.
+By decoupling the interoperability logic between Kubernetes and the underlying cloud
+infrastructure, the cloud-controller-manager component enables cloud providers to release
+features at a different pace compared to the main Kubernetes project.
 -->
-
-Kubernetes v1.6 包含一个新的可执行文件叫做 cloud-controller-manager。cloud-controller-manager 是一个守护进程，其中嵌入了特定于某云环境的控制环。
-这些特定于云环境的控制环最初位于 kube-controller-manager 中。
-由于云供应商的开发和发布节奏与 Kubernetes 项目不同步，将特定于供应商的代码抽象到 cloud-controller-manager 可执行文件可以允许云供应商独立于核心 Kubernetes 代码进行演进。
+通过分离 Kubernetes 和底层云基础设置之间的互操作性逻辑，
+云控制器管理器组件使云提供商能够以不同于 Kubernetes 主项目的速度进行发布新特征。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/cloud-provider.md b/content/zh/docs/reference/glossary/cloud-provider.md
index 0c07cd6fb8..8ab7e7a06f 100755
--- a/content/zh/docs/reference/glossary/cloud-provider.md
+++ b/content/zh/docs/reference/glossary/cloud-provider.md
@@ -10,10 +10,10 @@ aka:
 tags:
 - community
 ---
- 一个提供云计算平台的商业机构或其他组织。
 
 <!--
-Cloud Provider）
+---
+title: Cloud Provider
 id: cloud-provider
 date: 2018-04-12
 short_description: >
@@ -23,9 +23,15 @@ aka:
 - Cloud Service Provider
 tags:
 - community
+---
+-->
 
+<!--
  A business or other organization that offers a cloud computing platform.
 -->
+ 一个提供云计算平台的商业机构或其他组织。
+
+
 
 <!--more-->
 
@@ -42,7 +48,7 @@ such as running a Kubernetes cluster.
 You can also find Kubernetes as a managed service; sometimes called
 Platform as a Service, or PaaS. With managed Kubernetes, your
 cloud provider is responsible for the Kubernetes control plane as well
-as the glossary_tooltip term_id="node" text="nodes" and the
+as the {{< glossary_tooltip term_id="node" text="nodes" >}} and the
 infrastructure they rely on: networking, storage, and possibly other
 elements such as load balancers.
 -->
@@ -54,6 +60,6 @@ elements such as load balancers.
 
 你也会看到 Kubernetes 被作为托管服务提供；有时也称作平台即服务或 PaaS。
 针对托管的 Kubernetes，你的云供应商负责 Kubernetes 的控制面以及
-{{< glossary_tooltip term_id="node" text="节点" >}}及他们所依赖的基础设施：
+ {{< glossary_tooltip term_id="node" text="节点" >}} 及他们所依赖的基础设施：
 网络、存储以及其他一些诸如负载均衡器之类的元素。
 
diff --git a/content/zh/docs/reference/glossary/cluster-architect.md b/content/zh/docs/reference/glossary/cluster-architect.md
index c45bcfbe34..8636eede42 100644
--- a/content/zh/docs/reference/glossary/cluster-architect.md
+++ b/content/zh/docs/reference/glossary/cluster-architect.md
@@ -1,5 +1,5 @@
 ---
-title: 集群架构师
+title: 集群架构师（Cluster Architect）
 id: cluster-architect
 date: 2018-04-12
 full_link: 
diff --git a/content/zh/docs/reference/glossary/cluster-infrastructure.md b/content/zh/docs/reference/glossary/cluster-infrastructure.md
index 9d9eb4343d..ab1954e591 100644
--- a/content/zh/docs/reference/glossary/cluster-infrastructure.md
+++ b/content/zh/docs/reference/glossary/cluster-infrastructure.md
@@ -1,5 +1,5 @@
 ---
-title: 集群基础设施
+title: 集群基础设施（Cluster Infrastructure）
 id: cluster-infrastructure
 date: 2019-05-12
 full_link:
@@ -22,7 +22,7 @@ short_description: >
 
 aka:
 tags:
-- operations
+- operation
 ---
 -->
 <!--
diff --git a/content/zh/docs/reference/glossary/cluster-operations.md b/content/zh/docs/reference/glossary/cluster-operations.md
index 98dcda6505..43a9bba4b0 100644
--- a/content/zh/docs/reference/glossary/cluster-operations.md
+++ b/content/zh/docs/reference/glossary/cluster-operations.md
@@ -1,10 +1,10 @@
 ---
-title: 集群操作
+title: 集群操作（Cluster Operations）
 id: cluster-operations
 date: 2019-05-12
 full_link:
 short_description: >
- 诸如升级集群、实现安全、存储、Ingress、网络、日志和监控之类的活动，以及管理 Kubernetes 集群所涉及的其他操作。
+ 管理 Kubernetes 集群所涉及的相关工作。
 
 aka:
 tags:
@@ -18,15 +18,25 @@ id: cluster-operations
 date: 2019-05-12
 full_link:
 short_description: >
- Activities such as upgrading the clusters, implementing security, storage, ingress, networking, logging and monitoring, and other operations involved in managing a Kubernetes cluster.
+ The work involved in managing a Kubernetes cluster.
 
 aka:
 tags:
-- operations
+- operation
 ---
 -->
 
 <!--
- Activities such as upgrading the clusters, implementing security, storage, ingress, networking, logging and monitoring, and other operations involved in managing a Kubernetes cluster.
+ The work involved in managing a Kubernetes cluster: managing
+day-to-day operations, and co-ordinating upgrades.
 -->
- 诸如升级集群、实现安全、存储、Ingress、网络、日志和监控之类的活动，以及管理 Kubernetes 集群所涉及的其他操作。
\ No newline at end of file
+Kubernetes 管理相关工作包括：日常管理操作和协调升级。
+
+<!--
+ Examples of cluster operations work include: deploying new Nodes to
+scale the cluster; performing software upgrades; implementing security
+controls; adding or removing storage; configuring cluster networking;
+managing cluster-wide observability; and responding to events.
+-->															  
+群集操作工作的示例包括：部署新节点来扩容集群；执行软件升级；实施安全控制；
+添加或删除存储；配置集群网络；管理集群范围的可观测性；响应集群事件。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/cluster-operator.md b/content/zh/docs/reference/glossary/cluster-operator.md
index 8318dd46ed..4be92284b0 100644
--- a/content/zh/docs/reference/glossary/cluster-operator.md
+++ b/content/zh/docs/reference/glossary/cluster-operator.md
@@ -1,5 +1,5 @@
 ---
-title: 集群操作者
+title: 集群操作者（Cluster Operator）
 id: cluster-operator
 date: 2018-04-12
 full_link: 
@@ -35,6 +35,7 @@ tags:
 <!--
 Their primary responsibility is keeping a cluster up and running, which may involve periodic maintenance activities or upgrades.<br>
 
+			
 **NOTE:** Cluster operators are different from the [Operator pattern](https://coreos.com/operators) that extends the Kubernetes API.
 -->
 
diff --git a/content/zh/docs/reference/glossary/cluster.md b/content/zh/docs/reference/glossary/cluster.md
index 1046f9a223..74d48ff2c2 100644
--- a/content/zh/docs/reference/glossary/cluster.md
+++ b/content/zh/docs/reference/glossary/cluster.md
@@ -1,10 +1,10 @@
 ---
-title: 集群
+title: 集群（Cluster）
 id: cluster
 date: 2019-06-15
 full_link: 
 short_description: >
-   集群由一组被称作节点的机器组成。这些节点上运行 Kubernetes 所管理的容器化应用。集群具有至少一个工作节点和至少一个主节点。 
+   集群由一组被称作节点的机器组成。这些节点上运行 Kubernetes 所管理的容器化应用。集群具有至少一个工作节点。 
 
 aka: 
 tags:
@@ -19,7 +19,7 @@ id: cluster
 date: 2019-06-15
 full_link: 
 short_description: >
-   A set of machines, called nodes, that run containerized applications managed by Kubernetes. A cluster has at least one worker node and at least one master node. 
+   A set of worker machines, called nodes, that run containerized applications. Every cluster has at least one worker node.
 
 aka: 
 tags:
@@ -28,9 +28,20 @@ tags:
 --- 
 -->
 
-<!-- A set of machines, called nodes, that run containerized applications managed by Kubernetes. A cluster has at least one worker node and at least one master node.  -->
-集群由一组被称作节点的机器组成。这些节点上运行 Kubernetes 所管理的容器化应用。集群具有至少一个工作节点和至少一个主节点。
+<!-- 
+A set of worker machines, called {{< glossary_tooltip text="nodes" term_id="node" >}},
+that run containerized applications. Every cluster has at least one worker node.
+-->
+集群由一组被称作节点的机器组成。这些节点上运行 Kubernetes 所管理的容器化应用。集群具有至少一个工作节点。
 
 <!--more-->
-<!-- The worker node(s) host the pods that are the components of the application. The master node(s) manages the worker nodes and the pods in the cluster. Multiple master nodes are used to provide a cluster with failover and high availability. -->
-工作节点托管作为应用程序组件的 Pod 。主节点管理集群中的工作节点和 Pod 。多个主节点用于为集群提供故障转移和高可用性。
+<!-- 
+The worker node(s) host the {{< glossary_tooltip text="Pods" term_id="pod" >}} that are
+the components of the application workload. The
+{{< glossary_tooltip text="control plane" term_id="control-plane" >}} manages the worker
+nodes and the Pods in the cluster. In production environments, the control plane usually
+runs across multiple computers and a cluster usually runs multiple nodes, providing
+fault-tolerance and high availability.
+-->
+工作节点托管作为应用负载的组件的 Pod 。控制平面管理集群中的工作节点和 Pod 。
+为集群提供故障转移和高可用性，这些控制平面一般跨多主机运行，集群跨多个节点运行。
diff --git a/content/zh/docs/reference/glossary/cncf.md b/content/zh/docs/reference/glossary/cncf.md
index e6e857b6bc..7910885461 100644
--- a/content/zh/docs/reference/glossary/cncf.md
+++ b/content/zh/docs/reference/glossary/cncf.md
@@ -1,5 +1,5 @@
 ---
-title: 云原生计算基金会 (CNCF)
+title: 云原生计算基金会（CNCF）
 id: cncf
 date: 2019-05-26
 full_link: https://cncf.io/
diff --git a/content/zh/docs/reference/glossary/cni.md b/content/zh/docs/reference/glossary/cni.md
index 93028f7747..64febe0215 100644
--- a/content/zh/docs/reference/glossary/cni.md
+++ b/content/zh/docs/reference/glossary/cni.md
@@ -1,5 +1,5 @@
 ---
-title: CNI (容器网络接口)
+title: 容器网络接口（CNI）
 id: cni
 date: 2018-05-25
 full_link: /zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni
@@ -14,10 +14,10 @@ tags:
 
 <!--
 ---
-title: CNI (Container network interface)
+title: Container network interface (CNI)
 id: cni
 date: 2018-05-25
-full_link: /zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni
+full_link: /docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni
 short_description: >
     Container network interface (CNI) plugins are a type of Network plugin that adheres to the appc/CNI specification.
 
@@ -41,4 +41,4 @@ tags:
 * For information on Kubernetes and CNI, see ["Network plugins"](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni).
 -->
 
-* 想了解 Kubernetes 和 CNI 请参考 ["网络插件"](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni)。
+* 想了解 Kubernetes 和 CNI 请参考 ["网络插件"](/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni)。
diff --git a/content/zh/docs/reference/glossary/code-contributor.md b/content/zh/docs/reference/glossary/code-contributor.md
index 8d24d7f72f..d42e7d8ae1 100644
--- a/content/zh/docs/reference/glossary/code-contributor.md
+++ b/content/zh/docs/reference/glossary/code-contributor.md
@@ -1,5 +1,5 @@
 ---
-title: 代码贡献者
+title: 代码贡献者（Code Contributor）
 id: code-contributor
 date: 2018-04-12
 full_link: /docs/community/devel/
diff --git a/content/zh/docs/reference/glossary/configmap.md b/content/zh/docs/reference/glossary/configmap.md
index d761b26e74..eb936aca66 100644
--- a/content/zh/docs/reference/glossary/configmap.md
+++ b/content/zh/docs/reference/glossary/configmap.md
@@ -16,9 +16,9 @@ tags:
 title: ConfigMap
 id: configmap
 date: 2018-04-12
-full_link: /zh/docs/tasks/configure-pod-container/configure-pod-configmap/
+full_link: /docs/concepts/configuration/configmap/
 short_description: >
-  An API object used to store non-confidential data in key-value pairs. Can be consumed as environment variables, command-line arguments, or config files in a volume.
+  An API object used to store non-confidential data in key-value pairs. Can be consumed as environment variables, command-line arguments, or configuration files in a volume.
 
 aka: 
 tags:
@@ -27,15 +27,18 @@ tags:
 -->
 
 <!--
- An API object used to store non-confidential data in key-value pairs. Can be consumed as environment variables, command-line arguments, or config files in a {{< glossary_tooltip text="volume" term_id="volume" >}}.
+ An API object used to store non-confidential data in key-value pairs.
+{{< glossary_tooltip text="Pods" term_id="pod" >}} can consume ConfigMaps as
+environment variables, command-line arguments, or as configuration files in a
+{{< glossary_tooltip text="volume" term_id="volume" >}}.
 -->
 
- ConfigMap 是一种 API 对象，用来将非机密性的数据保存到健值对中。使用时可以用作环境变量、命令行参数或者存储卷中的配置文件。
+ ConfigMap 是一种 API 对象，用来将非机密性的数据保存到健值对中。使用时， {{< glossary_tooltip text="Pods" term_id="pod" >}} 可以将其用作环境变量、命令行参数或者存储卷中的配置文件。
 
 <!--more--> 
 
 <!--
-Allows you to decouple environment-specific configuration from your {{< glossary_tooltip text="container images" term_id="container" >}}, so that your applications are easily portable. When storing confidential data use a [Secret](/docs/concepts/configuration/secret/).
+A ConfigMap allows you to decouple environment-specific configuration from your {{< glossary_tooltip text="container images" term_id="image" >}}, so that your applications are easily portable.
 -->
 
-ConfigMap 将您的环境配置信息和 {{< glossary_tooltip text="容器镜像" term_id="container" >}} 解耦，便于应用配置的修改。当您需要储存机密信息时可以使用 [Secret](/docs/concepts/configuration/secret/) 对象。
+ConfigMap 将您的环境配置信息和 {{< glossary_tooltip text="容器镜像" term_id="image" >}} 解耦，便于应用配置的修改。
diff --git a/content/zh/docs/reference/glossary/container-env-variables.md b/content/zh/docs/reference/glossary/container-env-variables.md
index ae2b134643..e8796a12bd 100644
--- a/content/zh/docs/reference/glossary/container-env-variables.md
+++ b/content/zh/docs/reference/glossary/container-env-variables.md
@@ -1,10 +1,10 @@
 ---
-title: 容器环境变量
+title: 容器环境变量（Container Environment Variables）
 id: container-env-variables
 date: 2018-04-12
 full_link: /zh/docs/concepts/containers/container-environment/
 short_description: >
-  容器环境变量提供了运行容器化应用所必须的一些重要信息。
+  容器环境变量提供了 name=value 形式的、运行容器化应用所必须的一些重要信息。
 
 aka: 
 tags:
@@ -16,7 +16,7 @@ tags:
 title: Container Environment Variables
 id: container-env-variables
 date: 2018-04-12
-full_link: /zh/docs/concepts/containers/container-environment/
+full_link: /docs/concepts/containers/container-environment/
 short_description: >
   Container environment variables are name=value pairs that provide useful information into containers running in a Pod.
 
@@ -27,14 +27,14 @@ tags:
 -->
 
 <!--
- Container environment variables are name=value pairs that provide useful information into containers running in a Pod.
+ Container environment variables are name=value pairs that provide useful information into containers running in a {{< glossary_tooltip text="pod" term_id="pod" >}}
 -->
 
-  容器环境变量提供了运行容器化应用所必须的一些重要信息。
+  容器环境变量提供了 name=value 形式的、在 {{< glossary_tooltip text="pod" term_id="pod" >}} 中运行的容器所必须的一些重要信息。
   
 <!--more-->
 <!--
-Container environment variables provide information that is required by the running containerized applications along with information about important resources to the {{< glossary_tooltip text="Containers" term_id="container" >}}. For example, file system details, information about the container itself, and other cluster resources such as service endpoints.
+Container environment variables provide information that is required by the running containerized applications along with information about important resources to the {{< glossary_tooltip text="containers" term_id="container" >}}. For example, file system details, information about the container itself, and other cluster resources such as service endpoints.
 -->
 
   容器环境变量为运行中的容器化应用提供必要的信息，同时还提供与 {{< glossary_tooltip text="容器" term_id="container" >}} 重要资源相关的其他信息，例如：文件系统信息、容器自身的信息以及其他像服务端点（Service endpoints）这样的集群资源信息。
diff --git a/content/zh/docs/reference/glossary/container-lifecycle-hooks.md b/content/zh/docs/reference/glossary/container-lifecycle-hooks.md
index 20e65157a0..6a43d283c9 100644
--- a/content/zh/docs/reference/glossary/container-lifecycle-hooks.md
+++ b/content/zh/docs/reference/glossary/container-lifecycle-hooks.md
@@ -1,5 +1,5 @@
 ---
-title: 容器生命周期钩子
+title: 容器生命周期钩子（Container Lifecycle Hooks）
 id: container-lifecycle-hooks
 date: 2018-10-08
 full_link: /zh/docs/concepts/containers/container-lifecycle-hooks/
@@ -15,11 +15,11 @@ tags:
 title: Container Lifecycle Hooks
 id: container-lifecycle-hooks
 date: 2018-10-08
-full_link: /zh/docs/concepts/containers/container-lifecycle-hooks/
+full_link: /docs/concepts/containers/container-lifecycle-hooks/
 short_description: >
   The lifecycle hooks expose events in the container management lifecycle and let the user run code when the events occur.
 
-aka: 
+aka:
 tags:
 - extension
 ---
diff --git a/content/zh/docs/reference/glossary/container-runtime.md b/content/zh/docs/reference/glossary/container-runtime.md
index 7a68b6fd5c..badb4bcfcd 100644
--- a/content/zh/docs/reference/glossary/container-runtime.md
+++ b/content/zh/docs/reference/glossary/container-runtime.md
@@ -1,10 +1,10 @@
 ---
-title: 容器运行环境（Container Runtime）
+title: 容器运行时（Container Runtime）
 id: container-runtime
 date: 2019-06-05
-full_link: /docs/setup/production-environment/container-runtimes
+full_link: /zh/docs/setup/production-environment/container-runtimes
 short_description: >
- 容器运行环境是负责运行容器的软件。
+ 容器运行时是负责运行容器的软件。
 
 aka:
 tags:
@@ -28,7 +28,7 @@ tags:
 -->
 
 <!--
-The container runtime is the software that is responsible for running containers.
+ The container runtime is the software that is responsible for running containers.
 -->
 容器运行环境是负责运行容器的软件。
 
diff --git a/content/zh/docs/reference/glossary/container.md b/content/zh/docs/reference/glossary/container.md
index 1b2a98d43b..ac7526eeec 100644
--- a/content/zh/docs/reference/glossary/container.md
+++ b/content/zh/docs/reference/glossary/container.md
@@ -1,5 +1,5 @@
 ---
-title: 容器
+title: 容器（Container）
 id: container
 date: 2018-04-12
 full_link: /zh/docs/concepts/overview/what-is-kubernetes/#why-containers
@@ -17,7 +17,7 @@ tags:
 title: Container
 id: container
 date: 2018-04-12
-full_link: /zh/docs/concepts/overview/what-is-kubernetes/#why-containers
+full_link: /docs/concepts/containers/
 short_description: >
   A lightweight and portable executable image that contains software and all of its dependencies.
 
@@ -32,7 +32,7 @@ tags:
  A lightweight and portable executable image that contains software and all of its dependencies.
 -->
 
- 容器是可移植、可执行的轻量级的镜像，镜像中包含软件及其相关依赖。
+ 容器是可移植、可执行的轻量级的镜像，包含其中的软件及其相关依赖。
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/containerd.md b/content/zh/docs/reference/glossary/containerd.md
index e764362cc6..00d465b8c4 100644
--- a/content/zh/docs/reference/glossary/containerd.md
+++ b/content/zh/docs/reference/glossary/containerd.md
@@ -35,5 +35,5 @@ that runs as a daemon on Linux or Windows. containerd takes care of fetching and
 storing container images, executing containers, providing network access, and more.
 -->
 
-containerd 是一种 {{< glossary_tooltip text="容器" term_id="container" >}} 运行时，能在 Linux 或者 Windows 后台运行。
+containerd 是一种{{< glossary_tooltip text="容器" term_id="container" >}}运行时，能在 Linux 或者 Windows 后台运行。
 containerd 能取回、存储容器镜像，执行容器实例，提供网络访问等。
diff --git a/content/zh/docs/reference/glossary/contributor.md b/content/zh/docs/reference/glossary/contributor.md
index 32f21a5e54..de79a4c984 100644
--- a/content/zh/docs/reference/glossary/contributor.md
+++ b/content/zh/docs/reference/glossary/contributor.md
@@ -1,5 +1,5 @@
 ---
-title: 贡献者
+title: 贡献者（Contributor）
 id: contributor
 date: 2018-04-12
 full_link: 
diff --git a/content/zh/docs/reference/glossary/control-plane.md b/content/zh/docs/reference/glossary/control-plane.md
index 05f3f57978..8ffd6c9a25 100644
--- a/content/zh/docs/reference/glossary/control-plane.md
+++ b/content/zh/docs/reference/glossary/control-plane.md
@@ -1,15 +1,15 @@
 ---
-title: 控制平面
+title: 控制平面（Control Plane）
 id: control-plane
 date: 2019-05-12
 full_link:
 short_description: >
-  容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
+  Control Plane（控制平面）是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
 
 aka:
 tags:
 - fundamental
----
+---																																 
 
 <!--
 ---
@@ -23,10 +23,33 @@ short_description: >
 aka:
 tags:
 - fundamental
----
+---																																 
 -->
 
 <!--
  The container orchestration layer that exposes the API and interfaces to define, deploy, and manage the lifecycle of containers.
 -->
- 容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
+  Control Plane（控制平面）是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
+																							  
+<!--
+ This layer is composed by many different components, such as (but not restricted to):
+									
+   
+
+ * {{< glossary_tooltip text="etcd" term_id="etcd" >}}
+ * {{< glossary_tooltip text="API Server" term_id="kube-apiserver" >}}
+ * {{< glossary_tooltip text="Scheduler" term_id="kube-scheduler" >}}
+ * {{< glossary_tooltip text="Controller Manager" term_id="kube-controller-manager" >}}
+ * {{< glossary_tooltip text="Cloud Controller Manager" term_id="cloud-controller-manager" >}}
+
+ These components can be run as traditional operating system services (daemons) or as containers. The hosts running these components were historically called {{< glossary_tooltip text="masters" term_id="master" >}}.
+-->
+这个编排层是由多个不同的组件组成，例如以下（但不限于）几种：
+
+ * {{< glossary_tooltip text="etcd" term_id="etcd" >}}
+ * {{< glossary_tooltip text="API Server" term_id="kube-apiserver" >}}
+ * {{< glossary_tooltip text="Scheduler" term_id="kube-scheduler" >}}
+ * {{< glossary_tooltip text="Controller Manager" term_id="kube-controller-manager" >}}
+ * {{< glossary_tooltip text="Cloud Controller Manager" term_id="cloud-controller-manager" >}}
+
+这些组件可以以传统的系统服务运行也可以以容器的形式运行.运行这些组件的主机过去称为 master 节点。																																																		   
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/controller.md b/content/zh/docs/reference/glossary/controller.md
index 2b523c8b76..e60b710603 100644
--- a/content/zh/docs/reference/glossary/controller.md
+++ b/content/zh/docs/reference/glossary/controller.md
@@ -1,8 +1,8 @@
 ---
-title: 控制器
+title: 控制器（Controller）
 id: controller
 date: 2018-04-12
-full_link: /docs/admin/kube-controller-manager/
+full_link: /zh/docs/concepts/architecture/controller/
 short_description: >
   控制器通过 apiserver 监控集群的公共状态，并致力于将当前状态转变为期望的状态。
 
@@ -17,7 +17,7 @@ tags:
 title: Controller
 id: controller
 date: 2018-04-12
-full_link: /docs/admin/kube-controller-manager/
+full_link: /docs/concepts/architecture/controller/
 short_description: >
   A control loop that watches the shared state of the cluster through the apiserver and makes changes attempting to move the current state towards the desired state.
 
@@ -27,14 +27,38 @@ tags:
 - fundamental
 ---
 -->
+																			  
+<!--
+In Kubernetes, controllers are control loops that watch the state of your
+{{< glossary_tooltip term_id="cluster" text="cluster">}}, then make or request
+changes where needed.
+Each controller tries to move the current cluster state closer to the desired
+state.
+-->					 
 
- 控制器通过 {{< glossary_tooltip text="apiserver" term_id="kube-apiserver" >}} 监控集群的公共状态，并致力于将当前状态转变为期望的状态。
+在 Kubernetes 中，控制器通过监控{{< glossary_tooltip text="集群" term_id="cluster" >}}
+的公共状态，并致力于将当前状态转变为期望的状态。
 
 <!--more--> 
+																			   
+												  
+<!--
+Controllers watch the shared state of your cluster through the
+{{< glossary_tooltip text="apiserver" term_id="kube-apiserver" >}} (part of the
+{{< glossary_tooltip term_id="control-plane" >}}).
+-->
+控制器（{{< glossary_tooltip text="控制平面" term_id="control-plane" >}}的一部分）
+通过 {{< glossary_tooltip text="apiserver" term_id="kube-apiserver" >}} 监控你的集群中的公共状态。
 
 <!--
-Examples of controllers that ship with Kubernetes today are the replication controller, endpoints controller, namespace controller, and serviceaccounts controller.
+Some controllers also run inside the control plane, providing control loops that
+are core to Kubernetes' operations. For example: the deployment controller, the
+daemonset controller, the namespace controller, and the persistent volume
+controller (and others) all run within the
+{{< glossary_tooltip term_id="kube-controller-manager" >}}. 
 -->
-
-Kubernetes 当前提供的部分控制器例子包括：副本控制器（replication controller）、端点控制器（endpoints controller）、命名空间控制器（namespace controller）、服务账号控制器（serviceaccounts controller）。
+其中一些控制器是运行在控制平面内部的，对 Kubernetes 来说，他们提供核心控制操作。
+比如：部署控制器（deployment controller）、守护控制器（daemonset controller）、
+命名空间控制器（namespace controller）、持久化数据卷控制器（persistent volume
+controller）（等）都是运行在 {{< glossary_tooltip text="kube-controller-manager" term_id="kube-controller-manager" >}} 中的。
 
diff --git a/content/zh/docs/reference/glossary/cri-o.md b/content/zh/docs/reference/glossary/cri-o.md
index 8eb19ddbbb..c5b0e824a5 100644
--- a/content/zh/docs/reference/glossary/cri-o.md
+++ b/content/zh/docs/reference/glossary/cri-o.md
@@ -2,20 +2,21 @@
 title: CRI-O
 id: cri-o
 date: 2019-05-14
-full_link: https://cri-o.io/docs/
+full_link: https://cri-o.io/#what-is-cri-o
 short_description: >
-  专用于 Kubernetes 的轻量级容器运行环境
+  专用于 Kubernetes 的轻量级容器运行时软件
 
 aka:
 tags:
 - tool
 ---
 
-<!-- ---
+<!-- 
+---
 title: CRI-O
 id: cri-o
 date: 2019-05-14
-full_link: https://cri-o.io/docs/
+full_link: https://cri-o.io/#what-is-cri-o
 short_description: >
   A lightweight container runtime specifically for Kubernetes
 
@@ -23,18 +24,26 @@ aka:
 tags:
 - tool
 --- -->
-<!-- A tool that lets you use OCI container runtimes with Kubernetes CRI. -->
+<!-- 
+A tool that lets you use OCI container runtimes with Kubernetes CRI.
+-->
 该工具可让您通过 Kubernetes CRI 使用 OCI 容器运行环境。
 
 <!--more-->
 
-<!-- CRI-O is an implementation of the {{< glossary_tooltip term_id="cri" >}}
+<!-- 
+CRI-O is an implementation of the {{< glossary_tooltip term_id="cri" >}}
 to enable using {{< glossary_tooltip text="container" term_id="container" >}}
 runtimes that are compatible with the Open Container Initiative (OCI)
-[runtime spec](http://www.github.com/opencontainers/runtime-spec). -->
-CRI-O 是 {{< glossary_tooltip term_id="cri" >}} 的实现，可启用与开放容器倡议 Open Container Initiative（OCI）兼容的 {{< glossary_tooltip text="container" term_id="container" >}} 运行环境[运行时规范](http://www.github.com/opencontainers/runtime-spec)。
+[runtime spec](https://www.github.com/opencontainers/runtime-spec).
+-->
+CRI-O 是 {{< glossary_tooltip text="cri" term_id="cri" >}} 的实现，与开放容器倡议 Open Container Initiative（OCI）兼容的 {{< glossary_tooltip text="container" term_id="container" >}} [运行时规范](https://www.github.com/opencontainers/runtime-spec)。
 
-<!-- Deploying CRI-O allows Kubernetes to use any OCI-compliant runtime as the container
+<!-- 
+Deploying CRI-O allows Kubernetes to use any OCI-compliant runtime as the container
 runtime for running {{< glossary_tooltip text="Pods" term_id="pod" >}}, and to fetch
-OCI container images from remote registries. -->
-部署 CRI-O 允许 Kubernetes 使用任何符合 OCI 运行环境，作为容器运行环境去运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}，并从远程注册表获取 OCI 容器镜像。
\ No newline at end of file
+OCI container images from remote registries.
+-->
+部署 CRI-O 允许 Kubernetes 使用任何符合 OCI 的运行时，
+作为容器运行环境去运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}，
+并从远程注册表获取 OCI 容器镜像。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/cri.md b/content/zh/docs/reference/glossary/cri.md
index 96fd7f4bf4..8c8da979e9 100644
--- a/content/zh/docs/reference/glossary/cri.md
+++ b/content/zh/docs/reference/glossary/cri.md
@@ -1,5 +1,5 @@
 ---
-title: 容器运行时接口 (CRI)
+title: 容器运行时接口（CRI）
 id: cri
 date: 2019-03-07
 full_link: /zh/docs/concepts/overview/components/#container-runtime
@@ -18,7 +18,7 @@ tags:
 title: Container runtime interface (CRI)
 id: cri
 date: 2019-03-07
-full_link: /zh/docs/concepts/overview/components/#container-runtime
+full_link: /docs/concepts/overview/components/#container-runtime
 short_description: >
     An API for container runtimes to integrate with kubelet
 
diff --git a/content/zh/docs/reference/glossary/cronjob.md b/content/zh/docs/reference/glossary/cronjob.md
index e6838de86c..fe16d58762 100644
--- a/content/zh/docs/reference/glossary/cronjob.md
+++ b/content/zh/docs/reference/glossary/cronjob.md
@@ -1,10 +1,10 @@
 ---
-title: CronJob
+title: 周期调度任务（CronJob）
 id: cronjob
 date: 2018-04-12
 full_link: /zh/docs/concepts/workloads/controllers/cron-jobs/
 short_description: >
-  管理定期运行的 [Job](/docs/concepts/workloads/controllers/jobs-run-to-completion/)。
+  周期调度的任务（作业）。
 
 aka: 
 tags:
@@ -17,9 +17,9 @@ tags:
 title: CronJob
 id: cronjob
 date: 2018-04-12
-full_link: /zh/docs/concepts/workloads/controllers/cron-jobs/
+full_link: /docs/concepts/workloads/controllers/cron-jobs/
 short_description: >
-  Manages a [Job](/docs/concepts/workloads/controllers/jobs-run-to-completion/) that runs on a periodic schedule.
+  A repeating task (a Job) that runs on a regular schedule.
 
 aka: 
 tags:
@@ -29,10 +29,10 @@ tags:
 -->
 
 <!--
- Manages a [Job](/docs/concepts/workloads/controllers/jobs-run-to-completion/) that runs on a periodic schedule.
+ Manages a [Job](/docs/concepts/workloads/controllers/job/) that runs on a periodic schedule.
 -->
 
- 管理定期运行的 [Job](/docs/concepts/workloads/controllers/jobs-run-to-completion/)。
+ 管理定期运行的 [任务](/zh/docs/concepts/workloads/controllers/job/)。
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/csi.md b/content/zh/docs/reference/glossary/csi.md
index 2b77146757..89bb66cafd 100644
--- a/content/zh/docs/reference/glossary/csi.md
+++ b/content/zh/docs/reference/glossary/csi.md
@@ -1,5 +1,5 @@
 ---
-title: 容器存储接口 (CSI)
+title: 容器存储接口（Container Storage Interface，CSI）
 id: csi
 date: 2018-06-25
 full_link: /zh/docs/concepts/storage/volumes/#csi
@@ -17,7 +17,7 @@ tags:
 title: Container Storage Interface (CSI)
 id: csi
 date: 2018-06-25
-full_link: /zh/docs/concepts/storage/volumes/#csi
+full_link: /docs/concepts/storage/volumes/#csi
 short_description: >
     The Container Storage Interface (CSI) defines a standard interface to expose storage systems to containers.
 
@@ -31,18 +31,22 @@ tags:
  The Container Storage Interface (CSI) defines a standard interface to expose storage systems to containers.
 -->
 
- 容器存储接口 （CSI）定义了存储系统暴露给容器的标准接口。
+ 容器存储接口 （CSI） 定义了存储系统暴露给容器的标准接口。
 
 <!--more--> 
 
 <!--
-CSI allows vendors to create custom storage plugins for Kubernetes without adding them to the Kubernetes repository (out-of-tree plugins). To use a CSI driver from a storage provider, you must first [deploy it to your cluster](https://kubernetes-csi.github.io/docs/Setup.html). You will then be able to create a {{< glossary_tooltip text="Storage Class" term_id="storage-class" >}} that uses that CSI driver.
+CSI allows vendors to create custom storage plugins for Kubernetes without adding them to the Kubernetes repository (out-of-tree plugins). To use a CSI driver from a storage provider, you must first [deploy it to your cluster](https://kubernetes-csi.github.io/docs/deploying.html). You will then be able to create a {{< glossary_tooltip text="Storage Class" term_id="storage-class" >}} that uses that CSI driver.
 
 * [CSI in the Kubernetes documentation](/docs/concepts/storage/volumes/#csi)
-* [List of available CSI drivers](https://kubernetes-csi.github.io/docs/Drivers.html)
+* [List of available CSI drivers](https://kubernetes-csi.github.io/docs/drivers.html)
 -->
 
-CSI 允许存储驱动提供商为 Kubernetes 创建定制化的存储插件，而无需将这些插件的代码添加到 Kubernetes 代码仓库（外部插件）。要使用某个存储提供商的 CSI 驱动，你首先要[将它部署到你的集群上](https://kubernetes-csi.github.io/docs/Setup.html)。然后你才能创建使用该 CSI 驱动的 {{< glossary_tooltip text="Storage Class" term_id="storage-class" >}} 。
+CSI 允许存储驱动提供商为 Kubernetes 创建定制化的存储插件，
+而无需将这些插件的代码添加到 Kubernetes 代码仓库（外部插件）。
+要使用某个存储提供商的 CSI 驱动，你首先要
+[将它部署到你的集群上](https://kubernetes-csi.github.io/docs/deploying.html)。
+然后你才能创建使用该 CSI 驱动的 {{< glossary_tooltip text="Storage Class" term_id="storage-class" >}} 。
 
-* [Kubernetes 文档中关于 CSI 的描述](/docs/concepts/storage/volumes/#csi)
-* [可用的 CSI 驱动列表](https://kubernetes-csi.github.io/docs/Drivers.html)
+* [Kubernetes 文档中关于 CSI 的描述](/zh/docs/concepts/storage/volumes/#csi)
+* [可用的 CSI 驱动列表](https://kubernetes-csi.github.io/docs/drivers.html)
diff --git a/content/zh/docs/reference/glossary/customresourcedefinition.md b/content/zh/docs/reference/glossary/customresourcedefinition.md
index 510d26d3bc..ee0548e78d 100644
--- a/content/zh/docs/reference/glossary/customresourcedefinition.md
+++ b/content/zh/docs/reference/glossary/customresourcedefinition.md
@@ -2,7 +2,7 @@
 title: CustomResourceDefinition
 id: CustomResourceDefinition
 date: 2018-04-12
-full_link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
+full_link: /zh/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/
 short_description: >
   通过定制化的代码给您的 Kubernetes API 服务器增加资源对象，而无需编译完整的定制 API 服务器。
 
@@ -18,8 +18,7 @@ tags:
 title: CustomResourceDefinition
 id: CustomResourceDefinition
 date: 2018-04-12
-full_link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
-short_description: >
+full_link: /docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/
   Custom code that defines a resource to add to your Kubernetes API server without building a complete custom server.
 
 aka: 
diff --git a/content/zh/docs/reference/glossary/daemonset.md b/content/zh/docs/reference/glossary/daemonset.md
index ea250d02bc..5f35ae5012 100644
--- a/content/zh/docs/reference/glossary/daemonset.md
+++ b/content/zh/docs/reference/glossary/daemonset.md
@@ -18,7 +18,7 @@ tags:
 title: DaemonSet
 id: daemonset
 date: 2018-04-12
-full_link: /zh/docs/concepts/workloads/controllers/daemonset/
+full_link: /docs/concepts/workloads/controllers/daemonset
 short_description: >
   Ensures a copy of a Pod is running across a set of nodes in a cluster.
 
diff --git a/content/zh/docs/reference/glossary/data-plane.md b/content/zh/docs/reference/glossary/data-plane.md
index addd1b032b..7c476d4560 100644
--- a/content/zh/docs/reference/glossary/data-plane.md
+++ b/content/zh/docs/reference/glossary/data-plane.md
@@ -1,5 +1,5 @@
 ---
-title: 数据平面
+title: 数据平面（Data Plane）
 id: data-plane
 date: 2019-05-12
 full_link:
diff --git a/content/zh/docs/reference/glossary/deployment.md b/content/zh/docs/reference/glossary/deployment.md
index 05bce1377b..ca52523e46 100644
--- a/content/zh/docs/reference/glossary/deployment.md
+++ b/content/zh/docs/reference/glossary/deployment.md
@@ -18,9 +18,9 @@ tags:
 title: Deployment
 id: deployment
 date: 2018-04-12
-full_link: /zh/docs/concepts/workloads/controllers/deployment/
+full_link: /docs/concepts/workloads/controllers/deployment/
 short_description: >
-  An API object that manages a replicated application.
+  Manages a replicated application on your cluster.
 
 aka: 
 tags:
@@ -31,15 +31,18 @@ tags:
 -->
 
 <!--
- An API object that manages a replicated application.
+ An API object that manages a replicated application, typically by running Pods with no local state.
 -->
 
- Deployment 是管理应用副本的 API 对象。
+ Deployment 是管理应用副本的 API 对象，通常通过运行没有本地状态的Pods来实现。
 
 <!--more--> 
 
 <!--
-Each replica is represented by a {{< glossary_tooltip term_id="pod" >}}, and the Pods are distributed among the nodes of a cluster.
+Each replica is represented by a {{< glossary_tooltip term_id="pod" >}}, and the Pods are distributed among the 
+{{< glossary_tooltip text="nodes" term_id="node" >}} of a cluster.
+For workloads that do require local state, consider using a {{< glossary_tooltip term_id="StatefulSet" >}}.
 -->
 
-应用的每个副本就是一个 {{< glossary_tooltip term_id="pod" >}}，并且这些 Pod 会分散运行在集群的节点上。
+应用的每个副本就是一个 {{< glossary_tooltip text="Pod" term_id="pod" >}}，
+并且这些 Pod 会分散运行在集群的{{< glossary_tooltip text="节点" term_id="node" >}}上。
diff --git a/content/zh/docs/reference/glossary/developer.md b/content/zh/docs/reference/glossary/developer.md
index 2efbeea6e2..1ca23e374f 100644
--- a/content/zh/docs/reference/glossary/developer.md
+++ b/content/zh/docs/reference/glossary/developer.md
@@ -1,5 +1,5 @@
 ---
-title: 开发者 (释疑)
+title: 开发者（Developer）
 id: developer
 date: 2018-04-12
 full_link: 
@@ -28,7 +28,9 @@ tags:
 ---
 -->
 
- 指的是： {{< glossary_tooltip text="应用开发者" term_id="application-developer" >}}、 {{< glossary_tooltip text="代码贡献者" term_id="code-contributor" >}}、或 {{< glossary_tooltip text="平台开发者" term_id="platform-developer" >}}。
+ 指的是：{{< glossary_tooltip text="应用开发者" term_id="application-developer" >}}、
+ {{< glossary_tooltip text="代码贡献者" term_id="code-contributor" >}}、
+ 或{{< glossary_tooltip text="平台开发者" term_id="platform-developer" >}}。
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/device-plugin.md b/content/zh/docs/reference/glossary/device-plugin.md
index af7e491426..30664b8c31 100644
--- a/content/zh/docs/reference/glossary/device-plugin.md
+++ b/content/zh/docs/reference/glossary/device-plugin.md
@@ -1,32 +1,52 @@
 ---
-title: 驱动插件
+title: 设备插件（Device Plugin）
 id: device-plugin
 date: 2019-02-02
 full_link: /zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/
 short_description: >
-  在 Kubernetes 中运行的容器提供对供应商特定资源的访问权限。
+  一种软件扩展，可以使 Pod 访问由特定厂商初始化或者安装的设备。
 aka:
 tags:
 - fundamental
 - extension
 ---
 
-<!-- ---
+<!-- 
+---
 title: Device Plugin
 id: device-plugin
 date: 2019-02-02
-full_link: /zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/
+full_link: /docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/
 short_description: >
-  Containers running in Kubernetes that provide access to a vendor specific resource.
+  Software extensions to let Pods access devices that need vendor-specific initialization or setup
 aka:
 tags:
 - fundamental
 - extension
---- -->
- <!-- Device Plugins are containers running in Kubernetes that provide access to a vendor specific resource. -->
-设备插件是在 Kubernetes 中运行的容器，可用于访问供应商特定资源。
-
+---
+-->
+<!-- 
+ Device plugins run on worker
+{{< glossary_tooltip term_id="node" text="Nodes">}} and provide
+{{< glossary_tooltip term_id="pod" text="Pods ">}} with access to resources,
+such as local hardware, that require vendor-specific initialization or setup
+steps.
+-->
+设备插件工作在节点主机上，给 {{< glossary_tooltip term_id="pod" text="Pods ">}} 提供访问资源的权限，比如特定厂商初始化或者安装的本地硬件。
 <!--more-->
 
-<!-- [Device Plugins](/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/) are containers running in Kubernetes that provide access to a vendor-specific resource. Device Plugins advertise these resources to {{< glossary_tooltip term_id="kubelet" >}}. They can be deployed manually or as a {{< glossary_tooltip term_id="daemonset" >}}, rather than writing custom Kubernetes code. -->
-[驱动插件](/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/) 是运行在 Kubernetes 中的容器，它提供对供应商特定资源的访问。驱动插件将这些资源发布到 {{< glossary_tooltip term_id="kubelet" >}}。并且可以手动部署或做为 {{< glossary_tooltip term_id="daemonset" >}}，而不用编写定制的 Kubernetes 代码。
+<!--
+Device plugins advertise resources to the
+{{< glossary_tooltip term_id="kubelet" text="kubelet" >}}, so that workload
+Pods can access hardware features that relate to the Node where that Pod is running.
+You can deploy a device plugin as a {{< glossary_tooltip term_id="daemonset" >}},
+or install the device plugin software directly on each target Node.
+-->
+设备插件将资源告知 {{< glossary_tooltip term_id="kubelet" text="kubelet" >}} ，以便相关节点上运行的工作负载Pod可以访问硬件功能。
+<!-- 
+See
+	 
+[Device Plugins](/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/)
+for more information.
+-->
+更多信息请查阅[设备插件](/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/) 
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/disruption.md b/content/zh/docs/reference/glossary/disruption.md
index e175b930d7..29c7e1ebe6 100644
--- a/content/zh/docs/reference/glossary/disruption.md
+++ b/content/zh/docs/reference/glossary/disruption.md
@@ -1,5 +1,5 @@
 ---
-title: 干扰
+title: 干扰（Disruption）
 id: disruption
 date: 2019-09-10
 full_link: /zh/docs/concepts/workloads/pods/disruptions/
@@ -17,7 +17,7 @@ tags:
 title: Disruption
 id: disruption
 date: 2019-09-10
-full_link: /zh/docs/concepts/workloads/pods/disruptions/
+full_link: /docs/concepts/workloads/pods/disruptions/
 short_description: >
   An event that leads to Pod(s) going out of service
 aka:
@@ -41,5 +41,7 @@ Kubernetes terms that an _involuntary disruption_.
 
 See [Disruptions](/docs/concepts/workloads/pods/disruptions/) for more information.
  -->
-如果您作为一个集群操作人员，销毁了一个从属于某个应用的 Pod, Kubernetes 视之为 _自愿干扰_。如果由于节点故障
-或者影响更大区域故障的断电导致 Pod 离线，Kubrenetes 视之为 _非愿干扰_。
\ No newline at end of file
+如果您作为一个集群操作人员，销毁了一个从属于某个应用的 Pod, Kubernetes 视之为 _自愿干扰（Voluntary Disruption）_。如果由于节点故障
+或者影响更大区域故障的断电导致 Pod 离线，Kubrenetes 视之为 _非愿干扰（Involuntary Disruption）_。
+
+更多信息请查阅[Disruptions](/zh/docs/concepts/workloads/pods/disruptions/)
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/docker.md b/content/zh/docs/reference/glossary/docker.md
index 55782a84c8..bec6c834f2 100644
--- a/content/zh/docs/reference/glossary/docker.md
+++ b/content/zh/docs/reference/glossary/docker.md
@@ -1,5 +1,5 @@
 ---
-title: docker
+title: Docker
 id: docker
 date: 2018-04-12
 full_link: /zh/docs/reference/kubectl/docker-cli-to-kubectl/
@@ -13,10 +13,10 @@ tags:
 
 <!--
 ---
-title: docker
+title: Docker
 id: docker
 date: 2018-04-12
-full_link: /zh/docs/reference/kubectl/docker-cli-to-kubectl/
+full_link: https://docs.docker.com/engine/
 short_description: >
   Docker is a software technology providing operating-system-level virtualization also known as containers.
 
@@ -27,10 +27,10 @@ tags:
 -->
 
 <!--
- Docker is a software technology providing operating-system-level virtualization also known as containers.
+Docker (specifically, Docker Engine) is a software technology providing operating-system-level virtualization also known as {{< glossary_tooltip text="containers" term_id="container" >}}.
 -->
 
- Docker 是一种可以提供操作系统级别虚拟化（也称作容器）的软件技术
+ Docker（这里特指 Docker 引擎） 是一种可以提供操作系统级别虚拟化（也称作{{< glossary_tooltip text="容器" term_id="container" >}}）的软件技术。
 
 <!--more--> 
 
@@ -38,4 +38,5 @@ tags:
 Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).
 -->
 
-Docker 使用了 Linux 内核中的资源隔离特性（如 cgroup 和内核命名空间）以及支持联合文件系统（如 OverlayFS 和其他），允许多个相互独立的“容器”一起运行在同一 Linux 实例上，从而避免启动和维护虚拟机（VMs）的开销。
+Docker 使用了 Linux 内核中的资源隔离特性（如 cgroup 和内核命名空间）以及支持联合文件系统（如 OverlayFS 和其他），
+允许多个相互独立的“容器”一起运行在同一 Linux 实例上，从而避免启动和维护虚拟机（VMs）的开销。
diff --git a/content/zh/docs/reference/glossary/downstream.md b/content/zh/docs/reference/glossary/downstream.md
index 575d9c74e0..cba0229cb9 100644
--- a/content/zh/docs/reference/glossary/downstream.md
+++ b/content/zh/docs/reference/glossary/downstream.md
@@ -1,5 +1,5 @@
 ---
-title: 下游(消除歧义)
+title: 下游（Downstream）
 id: downstream
 date: 2018-04-12
 full_link: 
diff --git a/content/zh/docs/reference/glossary/dynamic-volume-provisioning.md b/content/zh/docs/reference/glossary/dynamic-volume-provisioning.md
index 1d3c67e285..5606af15a4 100644
--- a/content/zh/docs/reference/glossary/dynamic-volume-provisioning.md
+++ b/content/zh/docs/reference/glossary/dynamic-volume-provisioning.md
@@ -1,5 +1,5 @@
 ---
-title: 动态卷供应
+title: 动态卷供应（Dynamic Volume Provisioning）
 id: dynamicvolumeprovisioning
 date: 2018-04-12
 full_link: /zh/docs/concepts/storage/dynamic-provisioning/
@@ -17,7 +17,7 @@ tags:
 title: Dynamic Volume Provisioning
 id: dynamicvolumeprovisioning
 date: 2018-04-12
-full_link: /zh/docs/concepts/storage/dynamic-provisioning/
+full_link: /docs/concepts/storage/dynamic-provisioning
 short_description: >
   Allows users to request automatic creation of storage  Volumes.
 
@@ -41,4 +41,6 @@ Dynamic provisioning eliminates the need for cluster administrators to pre-provi
 -->
 
 动态供应让集群管理员无需再预先供应存储。相反，它通过用户请求自动地供应存储。
-动态卷供应是基于 API 对象 {{< glossary_tooltip text="StorageClass" term_id="storage-class" >}} 的，StorageClass 可以引用 {{< glossary_tooltip text="卷插件（Volume Plugin）" term_id="volume-plugin" >}} 提供的 {{< glossary_tooltip text="卷（Volume）" term_id="volume" >}} ，也可以引用传递给卷插件（Volume Plugin）的参数集。
+动态卷供应是基于 API 对象 {{< glossary_tooltip text="StorageClass" term_id="storage-class" >}} 的，
+StorageClass 可以引用 {{< glossary_tooltip text="卷插件" term_id="volume-plugin" >}} 提供的
+{{< glossary_tooltip text="卷" term_id="volume" >}}，也可以引用传递给卷插件（Volume Plugin）的参数集。
diff --git a/content/zh/docs/reference/glossary/endpoint-slice.md b/content/zh/docs/reference/glossary/endpoint-slice.md
index c108efd602..dcfc35e308 100644
--- a/content/zh/docs/reference/glossary/endpoint-slice.md
+++ b/content/zh/docs/reference/glossary/endpoint-slice.md
@@ -1,5 +1,5 @@
 ---
-title: 端点切片
+title: EndpointSlice
 id: endpoint-slice
 date: 2018-04-12
 full_link: /zh/docs/concepts/services-networking/endpoint-slices/
@@ -14,10 +14,10 @@ tags:
 
 <!--
 ---
-title: Endpoint Slice
+title: EndpointSlice
 id: endpoint-slice
 date: 2018-04-12
-full_link: /zh/docs/concepts/services-networking/endpoint-slices/
+full_link: /docs/concepts/services-networking/endpoint-slices/
 short_description: >
   A way to group network endpoints together with Kubernetes resources.
 
@@ -37,4 +37,6 @@ establish network routes on each {{< glossary_tooltip text="node" term_id="node"
 -->
 
 
-一种将网络端点组合在一起的可扩缩、可扩展方式。它们将被 {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}} 用于在每个 {{< glossary_tooltip text="节点" term_id="node">}} 上建立网络路由。
+一种将网络端点组合在一起的可扩缩、可扩展方式。
+它们将被 {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}} 用于在
+每个 {{< glossary_tooltip text="节点" term_id="node">}} 上建立网络路由。
diff --git a/content/zh/docs/reference/glossary/endpoint.md b/content/zh/docs/reference/glossary/endpoint.md
index ee9342cd6a..642d7c46d2 100644
--- a/content/zh/docs/reference/glossary/endpoint.md
+++ b/content/zh/docs/reference/glossary/endpoint.md
@@ -23,14 +23,16 @@ short_description: >
 aka:
 tags:
 - networking
+   
  Endpoints track the IP addresses of Pods with matching  {{< glossary_tooltip text="selectors" term_id="selector" >}}.
 -->
 
 <!--more-->
 <!--
-Endpoints can be configured manually for Services without selectors specified.
-The EndpointSlice resource provides a scalable and extensible alternative to Endpoints.
+Endpoints can be configured manually for {{< glossary_tooltip text="Services" term_id="service" >}} without selectors specified.
 -->
-端点可以手动配置到{{< glossary_tooltip text="服务（Service）" term_id="service" >}}上，而不必设置选择算符。
-{{< glossary_tooltip text="EndpointSlice" term_id="endpoint-slice" >}} 资源为 Endpoints
-提供了一种可伸缩、可扩展的替代方案。
+端点可以手动配置到{{< glossary_tooltip text="服务（Service）" term_id="service" >}}上，而不必指定选择器标识。
+<!--
+The {{< glossary_tooltip text="EndpointSlice" term_id="endpoint-slice" >}} resource provides a scalable and extensible alternative to Endpoints.
+-->
+{{< glossary_tooltip text="EndpointSlice" term_id="endpoint-slice" >}}提供了一种可伸缩、可扩展的替代方案。
diff --git a/content/zh/docs/reference/glossary/ephemeral-container.md b/content/zh/docs/reference/glossary/ephemeral-container.md
index fa95887e8d..d937404797 100644
--- a/content/zh/docs/reference/glossary/ephemeral-container.md
+++ b/content/zh/docs/reference/glossary/ephemeral-container.md
@@ -1,5 +1,5 @@
 ---
-title: 临时容器
+title: 临时容器（Ephemeral Container）
 id: ephemeral-container
 date: 2019-08-26
 full_link: /zh/docs/concepts/workloads/pods/ephemeral-containers/
@@ -9,14 +9,14 @@ aka:
 tags:
 - fundamental
 ---
-  您可以在 {{< glossary_tooltip term_id="pod" >}} 中临时运行的一种 {{< glossary_tooltip term_id="container" >}} 类型 
+  您可以在 {{< glossary_tooltip term_id="pod" >}} 中临时运行的一种 {{< glossary_tooltip term_id="container" >}} 类型。
 
 <!--
 ---
 title: Ephemeral Container
 id: ephemeral-container
 date: 2019-08-26
-full_link: /zh/docs/concepts/workloads/pods/ephemeral-containers/
+full_link: /docs/concepts/workloads/pods/ephemeral-containers/
 short_description: >
   A type of container type that you can temporarily run inside a Pod
 
@@ -33,4 +33,5 @@ A {{< glossary_tooltip term_id="container" >}} type that you can temporarily run
 If you want to investigate a Pod that's running with problems, you can add an ephemeral container to that Pod and carry out diagnostics. Ephemeral containers have no resource or scheduling guarantees, and you should not use them to run any part of the workload itself.
 -->
 
-如果想要调查运行中有问题的 Pod，可以向该 Pod 添加一个临时容器并进行诊断。临时容器没有资源或调度保证，因此不应该使用它们来运行任何部分的工作负荷本身。
\ No newline at end of file
+如果想要调查运行中有问题的 Pod，可以向该 Pod 添加一个临时容器并进行诊断。
+临时容器没有资源或调度保证，因此不应该使用它们来运行任何部分的工作负荷本身。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/etcd.md b/content/zh/docs/reference/glossary/etcd.md
index e0e11082a8..9dec928b29 100644
--- a/content/zh/docs/reference/glossary/etcd.md
+++ b/content/zh/docs/reference/glossary/etcd.md
@@ -17,7 +17,7 @@ tags:
 title: etcd
 id: etcd
 date: 2018-04-12
-full_link: /zh/docs/tasks/administer-cluster/configure-upgrade-etcd/
+full_link: /docs/tasks/administer-cluster/configure-upgrade-etcd/
 short_description: >
   Consistent and highly-available key value store used as Kubernetes' backing store for all cluster data.
 
@@ -35,9 +35,14 @@ tags:
 etcd 是兼具一致性和高可用性的键值数据库，可以作为保存 Kubernetes 所有集群数据的后台数据库。
 
 <!--more--> 
-
 <!--
-Always have a backup plan for etcd's data for your Kubernetes cluster. For in-depth information on etcd, see [etcd documentation](https://etcd.io/docs).
+If your Kubernetes cluster uses etcd as its backing store, make sure you have a
+[back up](/docs/tasks/administer-cluster/configure-upgrade-etcd/#backing-up-an-etcd-cluster) plan
+for those data.
+-->	
+您的 Kubernetes 集群的 etcd 数据库通常需要有个备份计划。
+<!--
+You can find in-depth information about etcd in the official [documentation](https://etcd.io/docs/).
 -->
 
-您的 Kubernetes 集群的 etcd 数据库通常需要有个备份计划。要了解 etcd 更深层次的信息，请参考 [etcd 文档](https://etcd.io/docs)。
+要了解 etcd 更深层次的信息，请参考 [etcd 文档](https://etcd.io/docs/)。
diff --git a/content/zh/docs/reference/glossary/extensions.md b/content/zh/docs/reference/glossary/extensions.md
index ebc25eca05..dca292faf6 100644
--- a/content/zh/docs/reference/glossary/extensions.md
+++ b/content/zh/docs/reference/glossary/extensions.md
@@ -1,5 +1,5 @@
 ---
-title: 扩展组件
+title: 扩展组件（Extensions）
 id: Extensions
 date: 2019-02-01
 full_link: /zh/docs/concepts/extend-kubernetes/extend-cluster/#extensions
@@ -17,7 +17,7 @@ tags:
 title: Extensions
 id: Extensions
 date: 2019-02-01
-full_link: /zh/docs/concepts/extend-kubernetes/extend-cluster/#extensions
+full_link: /docs/concepts/extend-kubernetes/extend-cluster/#extensions
 short_description: >
   Extensions are software components that extend and deeply integrate with Kubernetes to support new types of hardware.
 
@@ -35,4 +35,6 @@ tags:
 Most cluster administrators will use a hosted or distribution instance of Kubernetes. As a result, most Kubernetes users will need to install [extensions](/docs/concepts/extend-kubernetes/extend-cluster/#extensions) and fewer will need to author new ones.
 -->
 
-大多数集群管理员会使用托管的 Kubernetes 或其某种发行包。因此，大多数 Kubernetes 用户将需要安装 [扩展组件](/docs/concepts/extend-kubernetes/extend-cluster/#extensions)，较少用户会需要编写新的扩展组件。
\ No newline at end of file
+大多数集群管理员会使用托管的 Kubernetes 或其某种发行包。因此，大多数 Kubernetes 用户将需要
+安装 [扩展组件](/docs/concepts/extend-kubernetes/extend-cluster/#extensions)，
+较少用户会需要编写新的扩展组件。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/flexvolume.md b/content/zh/docs/reference/glossary/flexvolume.md
index af28200f40..51b0690392 100644
--- a/content/zh/docs/reference/glossary/flexvolume.md
+++ b/content/zh/docs/reference/glossary/flexvolume.md
@@ -16,7 +16,7 @@ tags:
 title: FlexVolume
 id: flexvolume
 date: 2018-06-25
-full_link: /zh/docs/concepts/storage/volumes/#flexvolume
+full_link: /docs/concepts/storage/volumes/#flexvolume
 short_description: >
     FlexVolume is an interface for creating out-of-tree volume plugins. The {{< glossary_tooltip text="Container Storage Interface" term_id="csi" >}} is a newer interface which addresses several problems with FlexVolumes.
 
@@ -25,17 +25,26 @@ aka:
 tags:
 - storage 
 --- -->
- <!-- FlexVolume is an interface for creating out-of-tree volume plugins. The {{< glossary_tooltip text="Container Storage Interface" term_id="csi" >}} is a newer interface which addresses several problems with FlexVolumes. -->
+ <!-- 
+ FlexVolume is an interface for creating out-of-tree volume plugins. The {{< glossary_tooltip text="Container Storage Interface" term_id="csi" >}} is a newer interface which addresses several problems with FlexVolumes.
+ -->
  Flexvolume 是创建 out-of-tree 卷插件的一种接口。 {{< glossary_tooltip text="容器存储接口（CSI）" term_id="csi" >}} 是比 Flexvolume 更新的接口，它解决了 Flexvolume 的一些问题。
 
 <!--more--> 
 
-<!-- FlexVolumes enable users to write their own drivers and add support for their volumes in Kubernetes. FlexVolume driver binaries and dependencies must be installed on host machines. This requires root access. The Storage SIG suggests implementing a {{< glossary_tooltip text="CSI" term_id="csi" >}} driver if possible since it addresses the limitations with FlexVolumes. -->
-Flexvolume 允许用户编写自己的驱动程序，并在 Kubernetes 中加入对用户自己的数据卷的支持。FlexVolume 驱动程序的二进制文件和依赖项必须安装在主机上。这需要 root 权限。如果可能的话，SIG Storage 建议实现 {{< glossary_tooltip text="CSI" term_id="csi" >}} 驱动程序，因为它解决了 Flexvolumes 的限制。
+<!-- 
+FlexVolumes enable users to write their own drivers and add support for their volumes in Kubernetes. FlexVolume driver binaries and dependencies must be installed on host machines. This requires root access. The Storage SIG suggests implementing a {{< glossary_tooltip text="CSI" term_id="csi" >}} driver if possible since it addresses the limitations with FlexVolumes.
+-->
+Flexvolume 允许用户编写自己的驱动程序，并在 Kubernetes 中加入对用户自己的数据卷的支持。
+FlexVolume 驱动程序的二进制文件和依赖项必须安装在主机上。
+这需要 root 权限。如果可能的话，SIG Storage 建议实现 {{< glossary_tooltip text="CSI" term_id="csi" >}} 驱动程序，
+因为它解决了 Flexvolumes 的限制。
 
-<!-- * [FlexVolume in the Kubernetes documentation](/docs/concepts/storage/volumes/#flexvolume)
-* [More information on FlexVolumes](https://github.com/kubernetes/community/blob/master/contributors/devel/flexvolume.md)
-* [Volume Plugin FAQ for Storage Vendors](https://github.com/kubernetes/community/blob/master/sig-storage/volume-plugin-faq.md) -->
+<!-- 
+* [FlexVolume in the Kubernetes documentation](/docs/concepts/storage/volumes/#flexvolume)
+* [More information on FlexVolumes](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-storage/flexvolume.md)
+* [Volume Plugin FAQ for Storage Vendors](https://github.com/kubernetes/community/blob/master/sig-storage/volume-plugin-faq.md) 
+-->
 * [Kubernetes 文档中的 Flexvolume](/docs/concepts/storage/volumes/#flexvolume)
-* [更多关于 Flexvolumes 的信息](https://github.com/kubernetes/community/blob/master/contributors/devel/flexvolume.md)
+* [更多关于 Flexvolumes 的信息](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-storage/flexvolume.md)
 * [存储供应商的卷插件 FAQ](https://github.com/kubernetes/community/blob/master/sig-storage/volume-plugin-faq.md)
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/helm-chart.md b/content/zh/docs/reference/glossary/helm-chart.md
index d76c6a7906..625a897d17 100644
--- a/content/zh/docs/reference/glossary/helm-chart.md
+++ b/content/zh/docs/reference/glossary/helm-chart.md
@@ -40,4 +40,5 @@ A single chart can be used to deploy something simple, like a memcached Pod, or
 -->
 
 Chart 提供了一种可重现的用来创建和共享 Kubernetes 应用的方法。
-单个 Chart 可用来部署简单的系统（例如一个 memcached Pod），也可以用来部署复杂的系统（例如包含 HTTP 服务器、数据库、缓存等组件的完整 Web 应用堆栈）。
+单个 Chart 可用来部署简单的系统（例如一个 memcached Pod），
+也可以用来部署复杂的系统（例如包含 HTTP 服务器、数据库、缓存等组件的完整 Web 应用堆栈）。
diff --git a/content/zh/docs/reference/glossary/horizontal-pod-autoscaler.md b/content/zh/docs/reference/glossary/horizontal-pod-autoscaler.md
index 3a94a04b5a..45e5033a5a 100644
--- a/content/zh/docs/reference/glossary/horizontal-pod-autoscaler.md
+++ b/content/zh/docs/reference/glossary/horizontal-pod-autoscaler.md
@@ -1,5 +1,5 @@
 ---
-title: Pod 水平自动扩缩器
+title: Pod 水平自动扩缩器（Horizontal Pod Autoscaler）
 id: horizontal-pod-autoscaler
 date: 2018-04-12
 full_link: /zh/docs/tasks/run-application/horizontal-pod-autoscale/
@@ -7,6 +7,7 @@ short_description: >
   Pod 水平自动扩缩器（Horizontal Pod Autoscaler）是一种 API 资源，它根据目标 CPU 利用率或自定义度量目标扩缩 Pod 副本的数量。
 
 aka: 
+- HPA
 tags:
 - operation
 ---
@@ -16,22 +17,26 @@ tags:
 title: Horizontal Pod Autoscaler
 id: horizontal-pod-autoscaler
 date: 2018-04-12
-full_link: /zh/docs/tasks/run-application/horizontal-pod-autoscale/
+full_link: /docs/tasks/run-application/horizontal-pod-autoscale/
 short_description: >
   An API resource that automatically scales the number of pod replicas based on targeted CPU utilization or custom metric targets.
 
 aka: 
+- HPA
 tags:
 - operation
 ---
 -->
 
- Pod 水平自动扩缩器（Horizontal Pod Autoscaler）是一种 API 资源，它根据目标 CPU 利用率或自定义度量目标扩缩 Pod 副本的数量。
+ Horizontal Pod Autoscaler（Pod 水平自动扩缩器）是一种 API 资源，它根据目标 CPU 利用率或自定义度量目标扩缩 Pod 副本的数量。
 
 <!--more--> 
 
 <!--
-HPA is typically used with {{< glossary_tooltip text="Replication Controllers" term_id="replication-controller" >}}, {{< glossary_tooltip text="Deployments" term_id="deployment" >}}, or Replica Sets. It cannot be applied to objects that cannot be scaled, for example {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}.
+HPA is typically used with {{< glossary_tooltip text="ReplicationControllers" term_id="replication-controller" >}}, {{< glossary_tooltip text="Deployments" term_id="deployment" >}}, or {{< glossary_tooltip text="ReplicaSets" term_id="replica-set" >}}. It cannot be applied to objects that cannot be scaled, for example {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}.
 -->
 
-HPA 通常用于 {{< glossary_tooltip text="Replication Controllers" term_id="replication-controller" >}}、{{< glossary_tooltip text="Deployments" term_id="deployment" >}} 或者 Replica Sets 上。HPA 不能用于不支持扩缩的对象，例如 {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}。
+HPA 通常用于 {{< glossary_tooltip text="ReplicationControllers" term_id="replication-controller" >}}
+、{{< glossary_tooltip text="Deployments" term_id="deployment" >}} 
+或者 {{< glossary_tooltip text="ReplicaSets" term_id="replica-set" >}} 上。
+HPA 不能用于不支持扩缩的对象，例如 {{< glossary_tooltip text="DaemonSets" term_id="daemonset" >}}。
diff --git a/content/zh/docs/reference/glossary/host-aliases.md b/content/zh/docs/reference/glossary/host-aliases.md
index 6581acf209..c2be10bee2 100644
--- a/content/zh/docs/reference/glossary/host-aliases.md
+++ b/content/zh/docs/reference/glossary/host-aliases.md
@@ -33,5 +33,6 @@ tags:
 <!-- 
 [HostAliases](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#hostalias-v1-core) is an optional list of hostnames and IP addresses that will be injected into the Pod's hosts file if specified. This is only valid for non-hostNetwork Pods.
 -->
-[HostAliases](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#hostalias-v1-core) 是一个包含主机名和 IP 地址的可选列表，配置后将被注入到 Pod 内的 hosts 文件中。
+[HostAliases](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#hostalias-v1-core)
+是一个包含主机名和 IP 地址的可选列表，配置后将被注入到 Pod 内的 hosts 文件中。
 该选项仅适用于没有配置 hostNetwork 的 Pod.
diff --git a/content/zh/docs/reference/glossary/image.md b/content/zh/docs/reference/glossary/image.md
index 1fc7db55e5..ea8a7ffda1 100644
--- a/content/zh/docs/reference/glossary/image.md
+++ b/content/zh/docs/reference/glossary/image.md
@@ -1,5 +1,5 @@
 ---
-title: 镜像
+title: 镜像（Image）
 id: image
 date: 2018-04-12
 full_link: 
@@ -27,10 +27,10 @@ tags:
 -->
 
 <!--
- Stored instance of a container that holds a set of software needed to run an application.
+ Stored instance of a {{< glossary_tooltip term_id="container" >}} that holds a set of software needed to run an application.
 -->
 
-镜像是保存的容器实例，它打包了应用运行所需的一组软件。
+镜像是保存的{{< glossary_tooltip text="容器" term_id="container" >}}实例，它打包了应用运行所需的一组软件。
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/ingress.md b/content/zh/docs/reference/glossary/ingress.md
index 972c2b0873..2b08741574 100644
--- a/content/zh/docs/reference/glossary/ingress.md
+++ b/content/zh/docs/reference/glossary/ingress.md
@@ -18,7 +18,7 @@ tags:
 title: Ingress
 id: ingress
 date: 2018-04-12
-full_link: /zh/docs/concepts/services-networking/ingress/
+full_link: /docs/concepts/services-networking/ingress/
 short_description: >
   An API object that manages external access to the services in a cluster, typically HTTP.
 
@@ -39,7 +39,7 @@ tags:
 <!--more--> 
 
 <!--
-Ingress can provide load balancing, SSL termination and name-based virtual hosting.
+Ingress may provide load balancing, SSL termination and name-based virtual hosting.
 -->
 
 Ingress 可以提供负载均衡、SSL 终结和基于名称的虚拟托管。
diff --git a/content/zh/docs/reference/glossary/init-container.md b/content/zh/docs/reference/glossary/init-container.md
index cf8cead312..7efeddb4e5 100644
--- a/content/zh/docs/reference/glossary/init-container.md
+++ b/content/zh/docs/reference/glossary/init-container.md
@@ -1,5 +1,5 @@
 ---
-title: 初始化容器
+title:  初始化容器（Init Container）
 id: init-container
 date: 2018-04-12
 full_link: 
@@ -18,7 +18,7 @@ id: init-container
 date: 2018-04-12
 full_link: 
 short_description: >
-  One or more initialization containers that must run to completion before any app containers run. 
+  One or more initialization containers that must run to completion before any app containers run.
 
 aka: 
 tags:
@@ -27,15 +27,16 @@ tags:
 -->
 
 <!--
- One or more initialization containers that must run to completion before any app containers run. 
+ One or more initialization {{< glossary_tooltip text="containers" term_id="container" >}} that must run to completion before any app containers run.
 -->
 
- 应用容器运行前必须先运行完成的一个或多个初始化容器。
+ 应用{{< glossary_tooltip text="容器" term_id="container" >}}运行前必须先运行完成的一个或多个初始化容器。
 
 <!--more--> 
 
 <!--
-Initialization (init) containers are like regular app containers, with one difference: init containers must run to completion before any app containers can start. Init containers run in series: each init container must run to completion before the next init container begins.  
+Initialization (init) containers are like regular app containers, with one difference: init containers must run to completion before any app containers can start. Init containers run in series: each init container must run to completion before the next init container begins.
 -->
 
-初始化（init）容器像常规应用容器一样，只有一点不同：初始化（init）容器必须在应用容器启动前运行完成。Init 容器的运行顺序：一个初始化（init）容器必须在下一个初始化（init）容器开始前运行完成。
+初始化（init）容器像常规应用容器一样，只有一点不同：初始化（init）容器必须在应用容器启动前运行完成。
+Init 容器的运行顺序：一个初始化（init）容器必须在下一个初始化（init）容器开始前运行完成。
diff --git a/content/zh/docs/reference/glossary/istio.md b/content/zh/docs/reference/glossary/istio.md
index 58c4cfffcc..4a3300f4f6 100644
--- a/content/zh/docs/reference/glossary/istio.md
+++ b/content/zh/docs/reference/glossary/istio.md
@@ -2,7 +2,7 @@
 title: Istio
 id: istio
 date: 2018-04-12
-full_link: https://istio.io/docs/concepts/what-is-istio/overview.html
+full_link: https://istio.io/docs/concepts/what-is-istio/
 short_description: >
   Istio 是个开放平台（非 Kubernetes 特有），提供了一种统一的方式来集成微服务、管理流量、实施策略和汇总度量数据。
 aka: 
@@ -17,7 +17,7 @@ tags:
 title: Istio
 id: istio
 date: 2018-04-12
-full_link: https://istio.io/docs/concepts/what-is-istio/overview.html
+full_link: https://istio.io/docs/concepts/what-is-istio/
 short_description: >
   An open platform (not Kubernetes-specific) that provides a uniform way to integrate microservices, manage traffic flow, enforce policies, and aggregate telemetry data.
 
@@ -41,5 +41,7 @@ Istio 是个开放平台（非 Kubernetes 特有），提供了一种统一的
 Adding Istio does not require changing application code. It is a layer of infrastructure between a service and the network, which when combined with service deployments, is commonly referred to as a service mesh. Istio's control plane abstracts away the underlying cluster management platform, which may be Kubernetes, Mesosphere, etc.
 -->
 
-添加 Istio 时不需要修改应用代码。它是基础设施的一层，介于服务和网络之间。当它和服务的 Deployment 相结合时，就构成了通常所谓的服务网格（Service Mesh）。Istio 的控制面抽象掉了底层的集群管理平台，这一集群管理平台可以是 Kubernetes、Mesosphere 等。
+添加 Istio 时不需要修改应用代码。它是基础设施的一层，介于服务和网络之间。
+当它和服务的 Deployment 相结合时，就构成了通常所谓的服务网格（Service Mesh）。
+Istio 的控制面抽象掉了底层的集群管理平台，这一集群管理平台可以是 Kubernetes、Mesosphere 等。
 
diff --git a/content/zh/docs/reference/glossary/job.md b/content/zh/docs/reference/glossary/job.md
index 8ce421f280..aa557297be 100644
--- a/content/zh/docs/reference/glossary/job.md
+++ b/content/zh/docs/reference/glossary/job.md
@@ -2,7 +2,7 @@
 title: Job
 id: job
 date: 2018-04-12
-full_link: /docs/concepts/workloads/controllers/jobs-run-to-completion
+full_link: /zh/docs/concepts/workloads/controllers/job/
 short_description: >
   Job 是需要运行完成的确定性的或批量的任务。
 
@@ -18,7 +18,7 @@ tags:
 title: Job
 id: job
 date: 2018-04-12
-full_link: /docs/concepts/workloads/controllers/jobs-run-to-completion
+full_link: /docs/concepts/workloads/controllers/job/
 short_description: >
   A finite or batch task that runs to completion.
 
@@ -42,4 +42,5 @@ tags:
 Creates one or more {{< glossary_tooltip term_id="pod" >}} objects and ensures that a specified number of them successfully terminate. As Pods successfully complete, the Job tracks the successful completions.
 -->
 
-Job 创建一个或多个 {{< glossary_tooltip term_id="Pod" >}} 对象，并确保指定数量的 Pod 成功终止。随着各 Pod 成功结束，Job 会跟踪记录成功完成的个数。
+Job 创建一个或多个 {{< glossary_tooltip term_id="Pod" >}} 对象，并确保指定数量的 Pod 成功终止。
+随着各 Pod 成功结束，Job 会跟踪记录成功完成的个数。
diff --git a/content/zh/docs/reference/glossary/kops.md b/content/zh/docs/reference/glossary/kops.md
index c1024390e7..d3241b763e 100644
--- a/content/zh/docs/reference/glossary/kops.md
+++ b/content/zh/docs/reference/glossary/kops.md
@@ -4,7 +4,7 @@ id: kops
 date: 2018-04-12
 full_link: /docs/getting-started-guides/kops/
 short_description: >
-  kops 是一个命令行工具，可以帮助您创建、销毁、升级和维护生产级，高可用性的 Kubernetes 集群。注意：官方仅支持 AWS，GCE 和 VMware vSphere 的支持还处于 alpha* 阶段。
+  kops 是一个命令行工具，可以帮助您创建、销毁、升级和维护生产级，高可用性的 Kubernetes 集群。
   
 aka: 
 tags:
@@ -19,7 +19,7 @@ id: kops
 date: 2018-04-12
 full_link: /docs/getting-started-guides/kops/
 short_description: >
-  A CLI tool that helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters. *NOTE&#58; Officially supports AWS only, with GCE and VMware vSphere in alpha*.
+  A CLI tool that helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters.
 
 aka: 
 tags:
@@ -29,13 +29,22 @@ tags:
 -->
 
 <!--
- A CLI tool that helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters. *NOTE&#58; Officially supports AWS only, with GCE and VMware vSphere in alpha*.
+ A CLI tool that helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters.
 -->
 
-kops 是一个命令行工具，可以帮助您创建、销毁、升级和维护生产级，高可用性的 Kubernetes 集群。*注意：官方仅支持 AWS，GCE 和 VMware vSphere 的支持还处于 alpha 阶段*。
+kops 是一个命令行工具，可以帮助您创建、销毁、升级和维护生产级，高可用性的 Kubernetes 集群。
 
 <!--more--> 
 
+<!--
+{{< note >}}
+kops has general availability support only for AWS.
+Support for using kops with GCE and VMware vSphere are in alpha.
+{{< /note >}}
+-->												   
+注意：官方仅支持 AWS，GCE 和 VMware vSphere 的支持还处于 alpha* 阶段。																
+			 
+
 <!--
 `kops` provisions your cluster with&#58;
 
@@ -44,7 +53,7 @@ kops 是一个命令行工具，可以帮助您创建、销毁、升级和维护
   * Self-healing&#58; everything runs in Auto-Scaling Groups
   * Limited OS support (Debian preferred, Ubuntu 16.04 supported, early support for CentOS & RHEL)
   * High availability (HA) support
-  * The ability to directly provision, or generate terraform manifests
+  * The ability to directly provision, or to generate Terraform manifests
 -->
 
 `kops` 为您的集群提供了：
diff --git a/content/zh/docs/reference/glossary/kube-controller-manager.md b/content/zh/docs/reference/glossary/kube-controller-manager.md
index c24234e501..5d18857fde 100644
--- a/content/zh/docs/reference/glossary/kube-controller-manager.md
+++ b/content/zh/docs/reference/glossary/kube-controller-manager.md
@@ -31,9 +31,10 @@ tags:
 <!--
  Component on the master that runs {{< glossary_tooltip text="controllers" term_id="controller" >}}.
 -->
-在主节点上运行{{< glossary_tooltip text="控制器" term_id="controller" >}}的组件。
+在主节点上运行 {{< glossary_tooltip text="控制器" term_id="controller" >}} 的组件。
 
 <!--more--> 
 
-从逻辑上讲，每个{{< glossary_tooltip text="控制器" term_id="controller" >}}都是一个单独的进程，但是为了降低复杂性，它们都被编译到同一个可执行文件，并在一个进程中运行。
+从逻辑上讲，每个{{< glossary_tooltip text="控制器" term_id="controller" >}}都是一个单独的进程，
+但是为了降低复杂性，它们都被编译到同一个可执行文件，并在一个进程中运行。
 
diff --git a/content/zh/docs/reference/glossary/kube-proxy.md b/content/zh/docs/reference/glossary/kube-proxy.md
index 79c7e2b82a..2b1048147f 100644
--- a/content/zh/docs/reference/glossary/kube-proxy.md
+++ b/content/zh/docs/reference/glossary/kube-proxy.md
@@ -27,7 +27,8 @@ tags:
  <!-- [kube-proxy](/docs/reference/command-line-tools-reference/kube-proxy/) is a
 network proxy that runs on each node in your cluster, implementing part of
 the Kubernetes {{< glossary_tooltip term_id="service">}} concept. -->
- [kube-proxy](/docs/reference/command-line-tools-reference/kube-proxy/) 是集群中每个节点上运行的网络代理,实现 Kubernetes {{< glossary_tooltip term_id="service">}} 概念的一部分。
+[kube-proxy](/zh/docs/reference/command-line-tools-reference/kube-proxy/) 是集群中每个节点上运行的网络代理，
+实现 Kubernetes {{< glossary_tooltip term_id="service">}} 概念的一部分。
 
 <!--more-->
 
@@ -38,4 +39,4 @@ kube-proxy 维护节点上的网络规则。这些网络规则允许从集群内
 
 <!-- kube-proxy uses the operating system packet filtering layer if there is one
 and it's available. Otherwise, kube-proxy forwards the traffic itself. -->
-如果操作系统提供了数据包过滤层并可用的话，kube-proxy会通过它来实现网络规则。否则，kube-proxy 仅转发流量本身。
+如果操作系统提供了数据包过滤层并可用的话，kube-proxy 会通过它来实现网络规则。否则， kube-proxy 仅转发流量本身。
diff --git a/content/zh/docs/reference/glossary/proxy.md b/content/zh/docs/reference/glossary/proxy.md
index e8ab669393..889037e3ad 100644
--- a/content/zh/docs/reference/glossary/proxy.md
+++ b/content/zh/docs/reference/glossary/proxy.md
@@ -1,5 +1,5 @@
 ---
-title: 代理
+title: 代理（Proxy）
 id: proxy
 date: 2019-09-10
 short_description: >
diff --git a/content/zh/docs/reference/glossary/qos-class.md b/content/zh/docs/reference/glossary/qos-class.md
index 82b18bfe38..b7eac1defe 100644
--- a/content/zh/docs/reference/glossary/qos-class.md
+++ b/content/zh/docs/reference/glossary/qos-class.md
@@ -1,5 +1,5 @@
 ---
-title: QoS 类
+title: QoS 类（QoS Class）
 id: qos-class
 date: 2019-04-15
 full_link: 
diff --git a/content/zh/docs/reference/glossary/rbac.md b/content/zh/docs/reference/glossary/rbac.md
index e0efa640e7..d0a8eaf88a 100644
--- a/content/zh/docs/reference/glossary/rbac.md
+++ b/content/zh/docs/reference/glossary/rbac.md
@@ -1,5 +1,5 @@
 ---
-title: RBAC（基于角色的访问控制）
+title: 基于角色的访问控制（RBAC）
 id: rbac
 date: 2018-04-12
 full_link: /zh/docs/reference/access-authn-authz/rbac/
diff --git a/content/zh/docs/reference/glossary/replication-controller.md b/content/zh/docs/reference/glossary/replication-controller.md
index 8fd910e799..daee67c2a1 100644
--- a/content/zh/docs/reference/glossary/replication-controller.md
+++ b/content/zh/docs/reference/glossary/replication-controller.md
@@ -1,5 +1,5 @@
 ---
-title: Replication Controller
+title: 副本控制器（Replication Controller）
 id: replication-controller
 date: 2018-04-12
 full_link: 
diff --git a/content/zh/docs/reference/glossary/resource-quota.md b/content/zh/docs/reference/glossary/resource-quota.md
index 658a1633ce..4e35800abe 100644
--- a/content/zh/docs/reference/glossary/resource-quota.md
+++ b/content/zh/docs/reference/glossary/resource-quota.md
@@ -1,5 +1,5 @@
 ---
-title: 资源配额
+title: 资源配额（Resource Quotas）
 id: resource-quota
 date: 2018-04-12
 full_link: /zh/docs/concepts/policy/resource-quotas/
diff --git a/content/zh/docs/reference/glossary/reviewer.md b/content/zh/docs/reference/glossary/reviewer.md
index a181122927..fb1ffcdf83 100644
--- a/content/zh/docs/reference/glossary/reviewer.md
+++ b/content/zh/docs/reference/glossary/reviewer.md
@@ -1,5 +1,5 @@
 ---
-title: 评审者
+title: 评审者（Reviewer）
 id: reviewer
 date: 2018-04-12
 full_link: 
diff --git a/content/zh/docs/reference/glossary/secret.md b/content/zh/docs/reference/glossary/secret.md
index 8bbb57df6b..ef1c8e9516 100644
--- a/content/zh/docs/reference/glossary/secret.md
+++ b/content/zh/docs/reference/glossary/secret.md
@@ -4,7 +4,7 @@ id: secret
 date: 2018-04-12
 full_link: /zh/docs/concepts/configuration/secret/
 short_description: >
-  Secret 用于存储敏感信息，如密码、OAuth 令牌和 SSH 密钥。
+  Secret 用于存储敏感信息，如密码、 OAuth 令牌和 SSH 密钥。
 
 aka: 
 tags:
@@ -17,7 +17,7 @@ tags:
 title: Secret
 id: secret
 date: 2018-04-12
-full_link: /zh/docs/concepts/configuration/secret/
+full_link: /docs/concepts/configuration/secret/
 short_description: >
   Stores sensitive information, such as passwords, OAuth tokens, and ssh keys.
 
@@ -32,7 +32,7 @@ tags:
  Stores sensitive information, such as passwords, OAuth tokens, and ssh keys.
 -->
 
- Secret 用于存储敏感信息，如密码、OAuth 令牌和 SSH 密钥。
+ Secret 用于存储敏感信息，如密码、 OAuth 令牌和 SSH 密钥。
 
 <!--more--> 
 
@@ -40,6 +40,6 @@ tags:
 Allows for more control over how sensitive information is used and reduces the risk of accidental exposure, including [encryption](/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted) at rest.  A {{< glossary_tooltip text="Pod" term_id="pod" >}} references the secret as a file in a volume mount or by the kubelet pulling images for a pod. Secrets are great for confidential data and [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/) for non-confidential data.
 -->
 
-Secret 允许用户对如何使用敏感信息进行更多的控制，并减少信息意外暴露的风险，包括静态[加密](/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted)。
+Secret 允许用户对如何使用敏感信息进行更多的控制，并减少信息意外暴露的风险，包括静态[encryption（加密）](/zh/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted)。
 {{< glossary_tooltip text="Pod" term_id="pod" >}} 通过挂载卷中的文件的方式引用 Secret，或者通过 kubelet 为 pod 拉取镜像时引用。
-Secret 非常适合机密数据使用，而 [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/) 适用于非机密数据。
+Secret 非常适合机密数据使用，而 [ConfigMaps](/zh/docs/tasks/configure-pod-container/configure-pod-configmap/) 适用于非机密数据。
diff --git a/content/zh/docs/reference/glossary/security-context.md b/content/zh/docs/reference/glossary/security-context.md
index 31b99c635c..864e693735 100644
--- a/content/zh/docs/reference/glossary/security-context.md
+++ b/content/zh/docs/reference/glossary/security-context.md
@@ -2,7 +2,7 @@
 title: 安全上下文（Security Context）
 id: security-context
 date: 2018-04-12
-full_link: /docs/tasks/configure-pod-container/security-context/
+full_link: /zh/docs/tasks/configure-pod-container/security-context/
 short_description: >
   securityContext 字段定义 Pod 或容器的特权和访问控制设置，包括运行时 UID 和 GID。
 
@@ -18,7 +18,7 @@ id: security-context
 date: 2018-04-12
 full_link: /docs/tasks/configure-pod-container/security-context/
 short_description: >
-  The securityContext field defines privilege and access control settings for a Pod or Container, including the runtime UID and GID.
+  The securityContext field defines privilege and access control settings for a Pod or container.
 
 aka: 
 tags:
@@ -27,17 +27,26 @@ tags:
 -->
 
 <!--
- The securityContext field defines privilege and access control settings for a Pod or Container, including the runtime UID and GID.
+ The `securityContext` field defines privilege and access control settings for
+a {{< glossary_tooltip text="Pod" term_id="pod" >}} or
+{{< glossary_tooltip text="container" term_id="container" >}}.
 -->
-securityContext 字段定义 Pod 或容器的特权和访问控制设置，包括运行时 UID 和 GID。
 
-<!--more--> 
+securityContext 字段定义 {{< glossary_tooltip text="Pod" term_id="pod" >}} 或
+{{< glossary_tooltip text="容器" term_id="container" >}}的特权和访问控制设置。
+
+<!--more-->
 
 <!--
-The securityContext field in a {{< glossary_tooltip term_id="pod" >}} (applying to all containers) or container is used to set the user (runAsUser) and group (fsGroup), capabilities, privilege settings, and security policies (SELinux/AppArmor/Seccomp) that container processes use.
+In a `securityContext`, you can define: the user that processes run as,
+the group that processes run as, and privilege settings.
+You can also configure security policies (for example: SELinux, AppArmor or seccomp).
 -->
-{{< glossary_tooltip term_id="pod" >}} 或者容器中的 securityContext 字段（应用于所有容器）用于设置容器进程使用的用户（runAsUser）和组 （fsGroup）、权能字、特权设置和安全策略（SELinux/AppArmor/Seccomp）。
-
 
+在一个 `securityContext` 字段中，你可以设置进程所属用户和用户组、权限相关设置。你也可以设置安全策略（例如：SELinux、AppArmor、seccomp）。	
 
+<!--
+The `PodSpec.securityContext` setting applies to all containers in a Pod.
+-->
 
+`PodSpec.securityContext` 字段配置会应用到一个 Pod 中的所有的 container 。														 
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/selector.md b/content/zh/docs/reference/glossary/selector.md
index a3dcd0b71b..7a1343090f 100644
--- a/content/zh/docs/reference/glossary/selector.md
+++ b/content/zh/docs/reference/glossary/selector.md
@@ -1,5 +1,5 @@
 ---
-title: 选择算符
+title: 选择算符（Selector）
 id: selector
 date: 2018-04-12
 full_link: /zh/docs/concepts/overview/working-with-objects/labels/
@@ -12,11 +12,12 @@ tags:
 ---
 
 <!--
+
 ---
 title: Selector
 id: selector
 date: 2018-04-12
-full_link: /zh/docs/concepts/overview/working-with-objects/labels/
+full_link: /docs/concepts/overview/working-with-objects/labels/
 short_description: >
   Allows users to filter a list of resources based on labels.
 
@@ -26,17 +27,18 @@ tags:
 ---
 -->
 
+
 <!--
- Allows users to filter a list of resources based on labels.
+ Allows users to filter a list of resources based on {{< glossary_tooltip text="labels" term_id="label" >}}.
 -->
 
-选择算符允许用户通过标签对一组资源对象进行筛选过滤。
+选择算符允许用户通过{{< glossary_tooltip text="标签（labels）" term_id="label" >}}对一组资源对象进行筛选过滤。
 
 <!--more--> 
 
 <!--
-Selectors are applied when querying lists of resources to filter them by {{< glossary_tooltip text="Labels" term_id="label" >}}.
+Selectors are applied when querying lists of resources to filter them by labels.
 -->
 
-在查询资源列表时，选择算符可以通过 {{< glossary_tooltip text="标签" term_id="label" >}} 对资源进行过滤筛选。
+在查询资源列表时，选择算符可以通过标签对资源进行过滤筛选。
 
diff --git a/content/zh/docs/reference/glossary/service-account.md b/content/zh/docs/reference/glossary/service-account.md
index 28c7ffd9b6..e54a4ef98b 100644
--- a/content/zh/docs/reference/glossary/service-account.md
+++ b/content/zh/docs/reference/glossary/service-account.md
@@ -1,5 +1,5 @@
 ---
-title: 服务账户
+title: ServiceAccount
 id: service-account
 date: 2018-04-12
 full_link: /zh/docs/tasks/configure-pod-container/configure-service-account/
@@ -14,10 +14,10 @@ tags:
 
 <!--
 ---
-title: Service Account
+title: ServiceAccount
 id: service-account
 date: 2018-04-12
-full_link: /zh/docs/tasks/configure-pod-container/configure-service-account/
+full_link: /docs/tasks/configure-pod-container/configure-service-account/
 short_description: >
   Provides an identity for processes that run in a Pod.
 
@@ -28,16 +28,18 @@ tags:
 ---
 -->
 
+
 <!--
  Provides an identity for processes that run in a {{< glossary_tooltip text="Pod" term_id="pod" >}}.
 -->
 为在 {{< glossary_tooltip text="Pod" term_id="pod" >}} 中运行的进程提供标识。
 
 <!--more--> 
-  
-<!-- 
-When processes inside Pods access the cluster, they are authenticated by the API server as a particular service account, for example, `default`. When you create a Pod, if you do not specify a service account, it is automatically assigned the default service account in the same namespace {{< glossary_tooltip text="Namespace" term_id="namespace" >}}.
+
+<!--
+When processes inside Pods access the cluster, they are authenticated by the API server as a particular service account, for example, `default`. When you create a Pod, if you do not specify a service account, it is automatically assigned the default service account in the same {{< glossary_tooltip text="Namespace" term_id="namespace" >}}.
 -->
-当 Pod 中的进程访问集群时，API 服务器将它们作为特定的服务帐户进行身份验证，例如 `default`。当您创建 Pod 时，如果您没有指定服务帐户，它将在相同的命名空间 {{< glossary_tooltip text="命名空间" term_id="namespace" >}} 中自动分配 default 服务账户。
-
+当 Pod 中的进程访问集群时，API 服务器将它们作为特定的服务帐户进行身份验证，
+例如  `default` ，创建 Pod 时，如果你没有指定服务帐户，它将自动被赋予同一个
+{{< glossary_tooltip text="名字空间" term_id="namespace" >}}中的 default 服务账户。
 
diff --git a/content/zh/docs/reference/glossary/service-broker.md b/content/zh/docs/reference/glossary/service-broker.md
index 8a017d127b..b8afe97d70 100644
--- a/content/zh/docs/reference/glossary/service-broker.md
+++ b/content/zh/docs/reference/glossary/service-broker.md
@@ -12,6 +12,7 @@ tags:
 ---
 
 <!--
+---
 title: Service Broker
 id: service-broker
 date: 2018-04-12
@@ -22,21 +23,25 @@ short_description: >
 aka: 
 tags:
 - extension
+---
 -->
 
 <!--
- An endpoint for a set of {{< glossary_tooltip text="Managed Service" term_id="managed-service">}}  offered and maintained by a third-party.
+ An endpoint for a set of {{< glossary_tooltip text="Managed Services" term_id="managed-service" >}} offered and maintained by a third-party.
 -->
-
-由第三方提供并维护的一组{{< glossary_tooltip text="托管服务" term_id="managed-service">}} 的访问端点。
+由第三方提供并维护的一组{{< glossary_tooltip text="托管服务" term_id="managed-service">}}的访问端点。
 
 <!--more--> 
 
 <!--
-{{< glossary_tooltip text="Service Brokers" term_id="service-broker" >}} implement the [Open Service Broker API spec](https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md) and provide a standard interface for applications to use their Managed Services. [Service Catalog](/docs/concepts/service-catalog/) provides a way to list, provision, and bind with Managed Services offered by Service Brokers.
+{{< glossary_tooltip text="Service Brokers" term_id="service-broker" >}} implement the
+[Open Service Broker API spec](https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md)
+and provide a standard interface for applications to use their Managed Services.
+[Service Catalog](/docs/concepts/extend-kubernetes/service-catalog/) provides a way to
+list, provision, and bind with Managed Services offered by Service Brokers.
 -->
 
-{{< glossary_tooltip text="服务代理" term_id="service-broker">}}会实现
+{{< glossary_tooltip text="服务代理（Service Brokers）" term_id="service-broker">}}会实现
 [开放服务代理 API 规范](https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md)
 并为应用提供使用其托管服务的标准接口。
-[服务目录（Service Catalog）](/docs/concepts/service-catalog/)则提供一种方法，用来列举、供应和绑定服务代理商所提供的托管服务。
+[服务目录（Service Catalog）](/zh/docs/concepts/extend-kubernetes/service-catalog/)则提供一种方法，用来列举、供应和绑定服务代理商所提供的托管服务。
diff --git a/content/zh/docs/reference/glossary/service-catalog.md b/content/zh/docs/reference/glossary/service-catalog.md
index 726aff57c2..134085e034 100644
--- a/content/zh/docs/reference/glossary/service-catalog.md
+++ b/content/zh/docs/reference/glossary/service-catalog.md
@@ -1,12 +1,11 @@
 ---
-title: 服务目录
+title: 服务目录（Service Catalog）
 id: service-catalog
 date: 2018-04-12
 full_link: 
 short_description: >
   服务目录是一种扩展 API，它能让 Kubernetes 集群中运行的应用易于使用外部托管的软件服务，例如云供应商提供的数据仓库服务。
   
-  An extension API that enables applications running in Kubernetes clusters to easily use external managed software offerings, such as a datastore service offered by a cloud provider.
 aka: 
 tags:
 - extension
@@ -27,11 +26,12 @@ tags:
 ---
 -->
 
+
 <!--
  An extension API that enables applications running in Kubernetes clusters to easily use external managed software offerings, such as a datastore service offered by a cloud provider.
 -->
 
-服务目录（Service Catalog）是一种扩展 API，它能让 Kubernetes 集群中运行的应用易于使用外部托管的的软件服务，例如云供应商提供的数据仓库服务。
+服务目录是一种扩展 API，它能让 Kubernetes 集群中运行的应用易于使用外部托管的的软件服务，例如云供应商提供的数据仓库服务。
 
 <!--more--> 
 
@@ -39,5 +39,7 @@ tags:
 It provides a way to list, provision, and bind with external {{< glossary_tooltip text="Managed Services" term_id="managed-service" >}} from {{< glossary_tooltip text="Service Brokers" term_id="service-broker" >}} without needing detailed knowledge about how those services are created or managed.
 -->
 
-服务目录可以检索、供应、和绑定由 {{< glossary_tooltip text="服务代理人（Service Brokers）" term_id="service-broker" >}} 提供的外部 {{< glossary_tooltip text="托管服务" term_id="managed-service" >}}，而无需知道那些服务具体是怎样创建和托管的。
+服务目录可以检索、供应、和绑定由 {{< glossary_tooltip text="服务代理人（Service Brokers）" term_id="service-broker" >}}
+提供的外部{{< glossary_tooltip text="托管服务（Managed Services）" term_id="managed-service" >}}，
+而无需知道那些服务具体是怎样创建和托管的。
 
diff --git a/content/zh/docs/reference/glossary/service.md b/content/zh/docs/reference/glossary/service.md
index 95e3b9e007..b6a0fab287 100644
--- a/content/zh/docs/reference/glossary/service.md
+++ b/content/zh/docs/reference/glossary/service.md
@@ -1,5 +1,5 @@
 ---
-title: Service
+title: 服务（Service）
 id: service
 date: 2018-04-12
 full_link: /zh/docs/concepts/services-networking/service/
@@ -11,6 +11,24 @@ tags:
 - fundamental
 - core-object
 ---
+
+<!--
+---
+title: Service
+id: service
+date: 2018-04-12
+full_link: /docs/concepts/services-networking/service/
+short_description: >
+  A way to expose an application running on a set of Pods as a network service.
+
+aka:
+tags:
+- fundamental
+- core-object
+---
+-->
+
+
 <!--
 An abstract way to expose an application running on a set of {{< glossary_tooltip text="Pods" term_id="pod" >}} as a network service.
 -->
@@ -22,4 +40,6 @@ An abstract way to expose an application running on a set of {{< glossary_toolti
 <!--
  The set of Pods targeted by a Service is (usually) determined by a {{< glossary_tooltip text="selector" term_id="selector" >}}. If more Pods are added or removed, the set of Pods matching the selector will change. The Service makes sure that network traffic can be directed to the current set of Pods for the workload.
 -->
-服务所针对的Pod集（通常）由 {{< glossary_tooltip text="selector" term_id="selector" >}} 确定。 如果添加或删除了更多Pod，则与选择器匹配的Pod集将发生变化。 该服务确保可以将网络流量定向到该工作负载的当前Pod集。
+服务所针对的 Pod 集（通常）由{{< glossary_tooltip text="选择算符" term_id="selector" >}}确定。
+如果有 Pod 被添加或被删除，则与选择算符匹配的 Pod 集合将发生变化。
+服务确保可以将网络流量定向到该工作负载的当前 Pod 集合。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/shuffle-sharding.md b/content/zh/docs/reference/glossary/shuffle-sharding.md
index 1f8d8a0990..4bc7f91189 100644
--- a/content/zh/docs/reference/glossary/shuffle-sharding.md
+++ b/content/zh/docs/reference/glossary/shuffle-sharding.md
@@ -10,9 +10,9 @@ aka:
 tags:
 - fundamental
 ---
-一种将请求指派给队列的技术，其隔离性好过对队列个数哈希取模的方式。
 
 <!--
+---
 title: shuffle sharding
 id: shuffle-sharding
 date: 2020-03-04
@@ -23,8 +23,15 @@ short_description: >
 aka:
 tags:
 - fundamental
+---
+-->
+
+
+<!--
 A technique for assigning requests to queues that provides better isolation than hashing modulo the number of queues.
 -->
+混排切片（Shuffle Sharding）是指一种将请求指派给队列的技术，其隔离性好过对队列个数哈希取模的方式。
+
 
 <!--more--> 
 
diff --git a/content/zh/docs/reference/glossary/sig.md b/content/zh/docs/reference/glossary/sig.md
index a42a15b0b1..3c2ff7b191 100644
--- a/content/zh/docs/reference/glossary/sig.md
+++ b/content/zh/docs/reference/glossary/sig.md
@@ -1,5 +1,5 @@
 ---
-title: SIG （特别兴趣小组）
+title: 特别兴趣小组（SIG）
 id: sig
 date: 2018-04-12
 full_link: https://github.com/kubernetes/community/blob/master/sig-list.md#master-sig-list
@@ -12,6 +12,7 @@ tags:
 ---
 
 <!--
+---
 title: SIG (special interest group)
 id: sig
 date: 2018-04-12
@@ -22,8 +23,10 @@ short_description: >
 aka: 
 tags:
 - community
+---
 -->
 
+
 <!--
  {{< glossary_tooltip text="Community members" term_id="member" >}} who collectively manage an ongoing piece or aspect of the larger Kubernetes open source project.
 -->
@@ -34,13 +37,13 @@ tags:
 
 <!--
 Members within a SIG have a shared interest in advancing a specific area, such as architecture, API machinery, or documentation.
-SIGs must follow the [SIG Governance](https://github.com/kubernetes/community/blob/master/sig-governance.md) guidelines but can have their own contribution policy and channels of communication.
+SIGs must follow the SIG [governance guidelines](https://github.com/kubernetes/community/blob/master/committee-steering/governance/sig-governance.md), but can have their own contribution policy and channels of communication.
 
 For more information, see the [kubernetes/community](https://github.com/kubernetes/community) repo and the current list of [SIGs and Working Groups](https://github.com/kubernetes/community/blob/master/sig-list.md).
 -->
 
 SIG 中的成员对推进某个领域（如体系结构、API 机制构件或者文档）具有相同的兴趣。
-SIGs 必须遵从 [SIG Governance](https://github.com/kubernetes/community/blob/master/sig-governance.md) 的规定，
+SIGs 必须遵从 [governance guidelines](https://github.com/kubernetes/community/blob/master/committee-steering/governance/sig-governance.md) 的规定，
 不过可以有自己的贡献策略以及通信渠道（方式）。
 
 更多的详细信息可参阅 [kubernetes/community](https://github.com/kubernetes/community) 仓库以及
diff --git a/content/zh/docs/reference/glossary/statefulset.md b/content/zh/docs/reference/glossary/statefulset.md
index 8003a09893..6e796d9419 100644
--- a/content/zh/docs/reference/glossary/statefulset.md
+++ b/content/zh/docs/reference/glossary/statefulset.md
@@ -4,7 +4,7 @@ id: statefulset
 date: 2018-04-12
 full_link: /zh/docs/concepts/workloads/controllers/statefulset/
 short_description: >
- StatefulSet 用来管理 Deployment 和伸缩一组 Pod，并且能为这些 Pod 提供*序号和唯一性保证*。
+  StatefulSet 用来管理某 Pod 集合的部署和扩缩，并为这些 Pod 提供持久存储和持久标识符。
 aka: 
 tags:
 - fundamental
@@ -18,9 +18,9 @@ tags:
 title: StatefulSet
 id: statefulset
 date: 2018-04-12
-full_link: /zh/docs/concepts/workloads/controllers/statefulset/
+full_link: /docs/concepts/workloads/controllers/statefulset/
 short_description: >
-  Manages the deployment and scaling of a set of Pods, *and provides guarantees about the ordering and uniqueness* of these Pods.
+  Manages deployment and scaling of a set of Pods, with durable storage and persistent identifiers for each Pod.
 
 aka: 
 tags:
@@ -31,19 +31,25 @@ tags:
 ---
 -->
 
- StatefulSet 用来管理 Deployment 和扩展一组 Pod，并且能为这些 Pod 提供*序号和唯一性保证*。
- 
+<!--
+ Manages the deployment and scaling of a set of {{< glossary_tooltip text="Pods" term_id="pod" >}}, *and provides guarantees about the ordering and uniqueness* of these Pods.
+-->
+StatefulSet 用来管理某 {{< glossary_tooltip text="Pod" term_id="pod" >}} 集合的部署和扩缩，
+并为这些 Pod 提供持久存储和持久标识符。 
 <!--more--> 
 
 <!--
 Like a {{< glossary_tooltip term_id="deployment" >}}, a StatefulSet manages Pods that are based on an identical container spec. Unlike a Deployment, a StatefulSet maintains a sticky identity for each of their Pods. These pods are created from the same spec, but are not interchangeable&#58; each has a persistent identifier that it maintains across any rescheduling.
 -->
 
-和 {{< glossary_tooltip term_id="Deployment" >}} 相同的是，StatefulSet 管理了基于相同容器定义的一组 Pod。但和 Deployment 不同的是，StatefulSet 为它们的每个 Pod 维护了一个固定的 ID。这些 Pod 是基于相同的声明来创建的，但是不能相互替换：无论怎么调度，每个 Pod 都有一个永久不变的 ID。
-
+和 {{< glossary_tooltip text="Deployment" term_id="deployment" >}} 类似，
+StatefulSet 管理基于相同容器规约的一组 Pod。但和 Deployment 不同的是，
+StatefulSet 为它们的每个 Pod 维护了一个有粘性的 ID。这些 Pod 是基于相同的规约来创建的，
+但是不能相互替换：无论怎么调度，每个 Pod 都有一个永久不变的 ID。
 <!--
-A StatefulSet operates under the same pattern as any other Controller. You define your desired state in a StatefulSet *object*, and the StatefulSet *controller* makes any necessary updates to get there from the current state.
+If you want to use storage volumes to provide persistence for your workload, you can use a StatefulSet as part of the solution. Although individual Pods in a StatefulSet are susceptible to failure, the persistent Pod identifiers make it easier to match existing volumes to the new Pods that replace any that have failed.
 -->
 
-StatefulSet 和其他控制器使用相同的工作模式。你在 StatefulSet *对象* 中定义你期望的状态，然后 StatefulSet 的 *控制器* 就会通过各种更新来达到那种你想要的状态。
-
+如果希望使用存储卷为工作负载提供持久存储，可以使用 StatefulSet 作为解决方案的一部分。
+尽管 StatefulSet 中的单个 Pod 仍可能出现故障，
+但持久的 Pod 标识符使得将现有卷与替换已失败 Pod 的新 Pod 相匹配变得更加容易。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/static-pod.md b/content/zh/docs/reference/glossary/static-pod.md
index 44e2a72bed..e785a96a85 100644
--- a/content/zh/docs/reference/glossary/static-pod.md
+++ b/content/zh/docs/reference/glossary/static-pod.md
@@ -1,10 +1,10 @@
 ---
-title: 静态 Pod
+title: 静态 Pod（Static Pod）
 id: static-pod
 date: 2019-02-12
 full_link: /zh/docs/tasks/configure-pod-container/static-pod/
 short_description: >
-  由特定节点上的 kubelet 守护进程直接管理的 pod。
+  静态Pod（Static Pod）是指由特定节点上的 kubelet 守护进程直接管理的 Pod。
 
 aka: 
 tags:
@@ -16,7 +16,7 @@ tags:
 title: Static Pod
 id: static-pod
 date: 2019-02-12
-full_link: /zh/docs/tasks/configure-pod-container/static-pod/
+full_link: /docs/tasks/configure-pod-container/static-pod/
 short_description: >
   A pod managed directly by the kubelet daemon on a specific node.
 
diff --git a/content/zh/docs/reference/glossary/storage-class.md b/content/zh/docs/reference/glossary/storage-class.md
index ad102de155..1ad1834b15 100644
--- a/content/zh/docs/reference/glossary/storage-class.md
+++ b/content/zh/docs/reference/glossary/storage-class.md
@@ -1,10 +1,10 @@
 ---
-title: 存储类别
+title: StorageClass
 id: storageclass
 date: 2018-04-12
 full_link: /zh/docs/concepts/storage/storage-classes/
 short_description: >
-  StorageClass 是管理员用来描述不同的可用存储类型的一种方法。
+  StorageClass 是管理员用来描述可用的不同存储类型的一种方法。
 
 aka: 
 tags:
@@ -12,12 +12,13 @@ tags:
 - storage
 ---
 
+
 <!--
 ---
 title: Storage Class
 id: storageclass
 date: 2018-04-12
-full_link: /zh/docs/concepts/storage/storage-classes/
+full_link: /docs/concepts/storage/storage-classes
 short_description: >
   A StorageClass provides a way for administrators to describe different available storage types.
 
@@ -29,9 +30,8 @@ tags:
 -->
 
 <!--
-  A StorageClass provides a way for administrators to describe different available storage types.
+ A StorageClass provides a way for administrators to describe different available storage types.
 -->
-
  StorageClass 是管理员用来描述不同的可用存储类型的一种方法。
 
 <!--more--> 
@@ -40,5 +40,7 @@ tags:
 StorageClasses can map to quality-of-service levels, backup policies, or to arbitrary policies determined by cluster administrators. Each StorageClass contains the fields `provisioner`, `parameters`, and `reclaimPolicy`, which are used when a {{< glossary_tooltip text="Persistent Volume" term_id="persistent-volume" >}} belonging to the class needs to be dynamically provisioned. Users can request a particular class using the name of a StorageClass object.
 -->
 
-StorageClass 可以映射到服务质量等级（QoS）、备份策略、或者管理员随机定义的策略。每个 StorageClass 对象包含的域有  `provisioner`、 `parameters` 和 `reclaimPolicy`，属于该存储类别的 {{< glossary_tooltip text="永久卷" term_id="persistent-volume" >}} 需要动态分配时就要用到这些域参数。通过 StorageClass 对象的名称，用户可以请求他们需要的特定存储类别。 
-
+StorageClass 可以映射到服务质量等级（QoS）、备份策略、或者管理员任意定义的策略。
+每个 StorageClass 对象包含的字段有 `provisioner`、`parameters` 和 `reclaimPolicy`。
+动态制备该存储类别的{{< glossary_tooltip text="持久卷" term_id="persistent-volume" >}}时需要用到这些字段值。
+通过设置 StorageClass 对象的名称，用户可以请求特定存储类别。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/sysctl.md b/content/zh/docs/reference/glossary/sysctl.md
index 42ed215d6d..b987583df7 100644
--- a/content/zh/docs/reference/glossary/sysctl.md
+++ b/content/zh/docs/reference/glossary/sysctl.md
@@ -16,7 +16,7 @@ tags:
 title: sysctl
 id: sysctl
 date: 2019-02-12
-full_link: /zh/docs/tasks/administer-cluster/sysctl-cluster/
+full_link: /docs/tasks/administer-cluster/sysctl-cluster/
 short_description: >
   An interface for getting and setting Unix kernel parameters
 
@@ -48,4 +48,4 @@ uses.
 network plugins may rely on `sysctl` values being set a certain way.
 -->
 
-{{< glossary_tooltip text="容器" term_id="container" >}} 运行时和网络插件可能对 `sysctl` 的取值有一定的要求。
+{{< glossary_tooltip text="容器" term_id="container" >}}运行时和网络插件可能对 `sysctl` 的取值有一定的要求。
diff --git a/content/zh/docs/reference/glossary/taint.md b/content/zh/docs/reference/glossary/taint.md
index 24b54fc16e..39f2c0ff5d 100644
--- a/content/zh/docs/reference/glossary/taint.md
+++ b/content/zh/docs/reference/glossary/taint.md
@@ -1,18 +1,16 @@
 ---
-title: 污点
+title: 污点（Taint）
 id: taint
 date: 2019-01-11
 full_link: /docs/concepts/configuration/taint-and-toleration/
 short_description: >
-  一个核心对象，由三个必需的属性组成：键，值和效果。污点会阻止在节点或节点组上调度 Pod。
-
+    污点是一种一个核心对象，包含三个必需的属性：key、value 和 effect。污点会阻止在节点或节点组上调度 Pod。
 aka:
 tags:
 - core-object
 - fundamental
 ---
- 一个核心对象，由三个必需的属性组成：键，值和效果。污点会阻止在节点或节点组上调度 Pod。
- 
+
 <!--
 ---
 title: Taint
@@ -27,13 +25,22 @@ tags:
 - core-object
 - fundamental
 ---
- A core object consisting of three required properties: key, value, and effect. Taints prevent the scheduling of pods on nodes or node groups.
+ -->
+
+<!--
+ A core object consisting of three required properties: key, value, and effect. Taints prevent the scheduling of {{< glossary_tooltip text="Pods" term_id="pod" >}} on {{< glossary_tooltip text="nodes" term_id="node" >}} or node groups.
 -->
+污点是一种一个核心对象，包含三个必需的属性：key、value 和 effect。
+污点会阻止在{{< glossary_tooltip text="节点" term_id="node" >}}
+或节点组上调度 {{< glossary_tooltip text="Pods" term_id="pod" >}}。 
+
 
 <!--more-->
 
 <!--
-Taints and {{< glossary_tooltip text="tolerations" term_id="toleration" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a {{< glossary_tooltip text="node" term_id="node" >}}. A node should only schedule a pod with the matching tolerations for the configured taints.
+Taints and {{< glossary_tooltip text="tolerations" term_id="toleration" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more taints are applied to a node. A node should only schedule a Pod with the matching tolerations for the configured taints.
 -->
 
-污点和 {{< glossary_tooltip text="容忍度" term_id="toleration" >}} 一起工作，以确保不会将 Pod 调度到不适合的节点上。一个或多个污点应用于 {{< glossary_tooltip text="节点" term_id="node" >}}。节点应该仅能调度那些带着能与污点相匹配容忍度的 pod。
\ No newline at end of file
+污点和{{< glossary_tooltip text="容忍度" term_id="toleration" >}}一起工作，以确保不会将 Pod 调度到不适合的节点上。
+同一{< glossary_tooltip text="节点" term_id="node" >}}上可应用一个或多个污点。
+节点应该仅调度那些带着能与污点相匹配容忍度的 Pod。
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/toleration.md b/content/zh/docs/reference/glossary/toleration.md
index ba59aed099..bc5b84e7e9 100644
--- a/content/zh/docs/reference/glossary/toleration.md
+++ b/content/zh/docs/reference/glossary/toleration.md
@@ -1,8 +1,8 @@
 ---
-title: 容忍度
+title: 容忍度（Toleration）
 id: toleration
 date: 2019-01-11
-full_link: /docs/concepts/configuration/taint-and-toleration/
+full_link: /zh/docs/concepts/scheduling-eviction/taint-and-toleration/
 short_description: >
   一个核心对象，由三个必需的属性组成：key、value 和 effect。容忍度允许将 Pod 调度到具有对应污点的节点或节点组上。
 aka:
@@ -10,15 +10,13 @@ tags:
 - core-object
 - fundamental
 ---
- 一个核心对象，由三个必需的属性组成：key、value 和 effect。
- 容忍度允许将 Pod 调度到具有匹配 {{< glossary_tooltip text="污点" term_id="taint" >}} 的节点或节点组上。
- 
+
 <!--
 ---
 title: Toleration
 id: toleration
 date: 2019-01-11
-full_link: /docs/concepts/configuration/taint-and-toleration/
+full_link: /docs/concepts/scheduling-eviction/taint-and-toleration/
 short_description: >
   A core object consisting of three required properties: key, value, and effect. Tolerations enable the scheduling of pods on nodes or node groups that have a matching taint.
   
@@ -27,12 +25,22 @@ tags:
 - core-object
 - fundamental
 ---
+-->
+
+<!--
  A core object consisting of three required properties: key, value, and effect. Tolerations enable the scheduling of pods on nodes or node groups that have matching {{< glossary_tooltip text="taints" term_id="taint" >}}.
 -->
+ 一个核心对象，由三个必需的属性组成：key、value 和 effect。
+ 容忍度允许将 Pod 调度到具有匹配{{< glossary_tooltip text="污点" term_id="taint" >}}的节点或节点组上。
+ 
+
 
 <!--more-->
 
 <!--
 Tolerations and {{< glossary_tooltip text="taints" term_id="taint" >}} work together to ensure that pods are not scheduled onto inappropriate nodes. One or more tolerations are applied to a {{< glossary_tooltip text="pod" term_id="pod" >}}. A toleration indicates that the {{< glossary_tooltip text="pod" term_id="pod" >}} is allowed (but not required) to be scheduled on nodes or node groups with matching {{< glossary_tooltip text="taints" term_id="taint" >}}.
 -->
- 容忍度 和 {{< glossary_tooltip text="污点" term_id="taint" >}} 共同作用以确保不会将 Pod 调度在不适合的节点上。在同一 {{< glossary_tooltip text="pod" term_id="pod" >}} 上可以设置一个或者多个容忍度。容忍度表示在匹配节点或节点组上的 {{< glossary_tooltip text="污点" term_id="taint" >}} 调度 {{< glossary_tooltip text="pod" term_id="pod" >}} 是允许的（但不必要）。
+ 容忍度 和{{< glossary_tooltip text="污点" term_id="taint" >}}共同作用以确保不会将 Pod 调度在不适合的节点上。
+ 在同一 {{< glossary_tooltip text="pod" term_id="pod" >}} 上可以设置一个或者多个容忍度。
+ 容忍度表示在匹配节点或节点组上的{{< glossary_tooltip text="污点" term_id="taint" >}}
+ 调度 {{< glossary_tooltip text="pod" term_id="pod" >}} 是允许的（但不必要）。
diff --git a/content/zh/docs/reference/glossary/uid.md b/content/zh/docs/reference/glossary/uid.md
index 01805ee534..74faf6d1e7 100644
--- a/content/zh/docs/reference/glossary/uid.md
+++ b/content/zh/docs/reference/glossary/uid.md
@@ -16,7 +16,7 @@ tags:
 title: UID
 id: uid
 date: 2018-04-12
-full_link: /zh/docs/concepts/overview/working-with-objects/names/
+full_link: /docs/concepts/overview/working-with-objects/names
 short_description: >
   A Kubernetes systems-generated string to uniquely identify objects.
 
diff --git a/content/zh/docs/reference/glossary/upstream.md b/content/zh/docs/reference/glossary/upstream.md
index 118b3838f7..39d7207da8 100644
--- a/content/zh/docs/reference/glossary/upstream.md
+++ b/content/zh/docs/reference/glossary/upstream.md
@@ -1,5 +1,5 @@
 ---
-title: Upstream (disambiguation)
+title: 上游（Uptream）
 id: upstream
 date: 2018-04-12
 full_link: 
@@ -10,18 +10,33 @@ aka:
 tags:
 - community
 ---
+
+<!--
+---
+title: Upstream (disambiguation)
+id: upstream
+date: 2018-04-12
+full_link: 
+short_description: >
+  May refer to: core Kubernetes or the source repo from which a repo was forked.
+
+aka: 
+tags:
+- community
+---
+-->
+
 <!--
  May refer to: core Kubernetes or the source repo from which a repo was forked.
 -->
+可能指的是：核心 Kubernetes 仓库或作为当前仓库派生来源的仓库。
+
 <!--more--> 
+
 <!--
 * In the **Kubernetes Community**: Conversations often use *upstream* to mean the core Kubernetes codebase, which the general ecosystem, other code, or third-party tools relies upon. For example, [community members](#term-member) may suggest that a feature is moved upstream so that it is in the core codebase instead of in a plugin or third-party tool.
 * In **GitHub** or **git**: The convention is to refer to a source repo as *upstream*, whereas the forked repo is considered *downstream*.
 -->
 
-可以参考：核心 Kubernetes 仓库或作为当前仓库派生来源的来源仓库。
-
-<!-- 更多 -->
-
 * 在 **Kubernetes社区**：对话中通常使用 *upstream* 来表示核心 Kubernetes 代码库，也就是更广泛的 kubernetes 生态系统、其他代码或第三方工具所依赖的仓库。 例如，[社区成员](#term-member)可能会建议将某个功能特性贡献到 upstream，使其位于核心代码库中，而不是维护于插件或第三方工具中。
 * 在 **GitHub** 或 **git** 中：约定是将源仓库称为 *upstream*，而派生的仓库则被视为 *downstream*。
diff --git a/content/zh/docs/reference/glossary/volume-plugin.md b/content/zh/docs/reference/glossary/volume-plugin.md
index ca4318d4ad..b04b8d8fbc 100644
--- a/content/zh/docs/reference/glossary/volume-plugin.md
+++ b/content/zh/docs/reference/glossary/volume-plugin.md
@@ -1,10 +1,10 @@
 ---
-title: 卷（Volume）插件
+title: 卷插件（Volume Plugin）
 id: volumeplugin
 date: 2018-04-12
 full_link: 
 short_description: >
-  卷（Volume）插件可以让 Pod 集成存储。
+  卷插件可以让 Pod 集成存储。
 
 aka: 
 tags:
@@ -40,5 +40,7 @@ tags:
 A Volume Plugin lets you attach and mount storage volumes for use by a {{< glossary_tooltip text="Pod" term_id="pod" >}}. Volume plugins can be _in tree_ or _out of tree_. _In tree_ plugins are part of the Kubernetes code repository and follow its release cycle. _Out of tree_ plugins are developed independently.
 -->
 
-卷插件让您能给 {{< glossary_tooltip text="Pod" term_id="pod" >}} 附加和挂载存储卷。卷插件既可以是 _in tree_ 也可以是 _out of tree_ 。_in tree_ 插件是 Kubernetes 代码库的一部分，并遵循其发布周期。而 _Out of tree_ 插件则是独立开发的。
+卷插件让您能给 {{< glossary_tooltip text="Pod" term_id="pod" >}} 附加和挂载存储卷。
+卷插件既可以是 _in tree_ 也可以是 _out of tree_ 。_in tree_ 插件是 Kubernetes 代码库的一部分，
+并遵循其发布周期。而 _Out of tree_ 插件则是独立开发的。
 
diff --git a/content/zh/docs/reference/glossary/volume.md b/content/zh/docs/reference/glossary/volume.md
index a170f0f3b8..7ef39eee2f 100644
--- a/content/zh/docs/reference/glossary/volume.md
+++ b/content/zh/docs/reference/glossary/volume.md
@@ -1,5 +1,5 @@
 ---
-title: 卷
+title: 卷（Volume）
 id: volume
 date: 2018-04-12
 full_link: /zh/docs/concepts/storage/volumes/
@@ -13,31 +13,38 @@ tags:
 ---
 
 <!--
+---
 title: Volume
 id: volume
 date: 2018-04-12
-full_link: /zh/docs/concepts/storage/volumes/
+full_link: /docs/concepts/storage/volumes/
 short_description: >
   A directory containing data, accessible to the containers in a pod.
 
-aka: 
+aka:
 tags:
 - core-object
 - fundamental
+---																																					   
 -->
 
+
 <!--
- A directory containing data, accessible to the containers in a {{< glossary_tooltip text="pod" term_id="pod" >}}.
+ A directory containing data, accessible to the {{< glossary_tooltip text="containers" term_id="container" >}} in a {{< glossary_tooltip term_id="pod" >}}.
 -->
+包含可被 {{< glossary_tooltip text="Pod" term_id="pod" >}} 中{{< glossary_tooltip text="容器" term_id="container" >}}访问的数据的目录。
 
-包含可被 {{< glossary_tooltip text="pod" term_id="pod" >}} 中容器访问的数据的目录。
+		   
 
-<!--more--> 
 <!--
-A Kubernetes volume lives as long as the {{< glossary_tooltip text="pod" term_id="pod" >}} that encloses it. Consequently, a volume outlives any {{< glossary_tooltip text="containers" term_id="container" >}} that run within the {{< glossary_tooltip text="pod" term_id="pod" >}}, and data is preserved across {{< glossary_tooltip text="container" term_id="container" >}} restarts. 
+A Kubernetes volume lives as long as the Pod that encloses it. Consequently, a volume outlives any containers that run within the Pod, and data in the volume is preserved across container restarts.
 -->
 
-每个 Kubernetes 卷在所处的{{< glossary_tooltip text="pod" term_id="pod" >}} 存在期间保持存在状态。
-因此，卷的生命期会超出 {{< glossary_tooltip text="pod" term_id="pod" >}} 中运行的{{< glossary_tooltip text="容器" term_id="container" >}}，
+每个 Kubernetes 卷在所处的 {{< glossary_tooltip text="Pod" term_id="pod" >}} 存在期间保持存在状态。
+因此，卷的生命期会超出 {{< glossary_tooltip text="Pod" term_id="pod" >}} 中运行的{{< glossary_tooltip text="容器" term_id="container" >}}，
 并且保证{{< glossary_tooltip text="容器" term_id="container" >}}重启之后仍保留数据。
 
+<!--
+See [storage](/docs/concepts/storage/) for more information.
+-->
+更多信息可参考[storage](/zh/docs/concepts/storage/)
\ No newline at end of file
diff --git a/content/zh/docs/reference/glossary/wg.md b/content/zh/docs/reference/glossary/wg.md
index 9a42e77ab0..563ebacd69 100644
--- a/content/zh/docs/reference/glossary/wg.md
+++ b/content/zh/docs/reference/glossary/wg.md
@@ -1,5 +1,5 @@
 ---
-title: WG (工作组)
+title: 工作组（Working Group，WG）
 id: wg
 date: 2018-04-12
 full_link: https://github.com/kubernetes/community/blob/master/sig-list.md#master-working-group-list
@@ -26,6 +26,7 @@ tags:
 ---
 -->
 
+
 <!--
  Facilitates the discussion and/or implementation of a short-lived, narrow, or decoupled project for a committee, {{< glossary_tooltip text="SIG" term_id="sig" >}}, or cross-SIG effort.
 -->
diff --git a/content/zh/docs/reference/glossary/workload.md b/content/zh/docs/reference/glossary/workload.md
index d21e50e3b0..394b42bd1c 100644
--- a/content/zh/docs/reference/glossary/workload.md
+++ b/content/zh/docs/reference/glossary/workload.md
@@ -1,5 +1,5 @@
 ---
-title: 工作负载
+title: 工作负载（Workload）
 id: workloads
 date: 2019-02-13
 full_link: /zh/docs/concepts/workloads/
@@ -11,29 +11,38 @@ tags:
 - fundamental
 ---
 
-<!-- ---
+
+<!-- 
+---
 title: Workload
 id: workloads
 date: 2019-02-13
-full_link: /zh/docs/concepts/workloads/
+full_link: /docs/concepts/workloads/
 short_description: >
    A workload is an application running on Kubernetes.
 
 aka: 
 tags:
 - fundamental
---- -->
-   <!-- A workload is an application running on Kubernetes. -->
+--- 
+-->
+
+<!-- 
+   A workload is an application running on Kubernetes.
+-->
    工作负载是在 Kubernetes 上运行的应用程序。
 
 <!--more--> 
 
-<!-- Various core objects that represent different types or parts of a workload
+<!-- 
+Various core objects that represent different types or parts of a workload
 include the DaemonSet, Deployment, Job, ReplicaSet, and StatefulSet objects.
 
 For example, a workload that has a web server and a database might run the
 database in one {{< glossary_tooltip term_id="StatefulSet" >}} and the web server
-in a {{< glossary_tooltip term_id="Deployment" >}}. -->
-代表不同类型或部分工作负载的各种核心对象包括 DaemonSet, Deployment, Job, ReplicaSet, and StatefulSet。
+in a {{< glossary_tooltip term_id="Deployment" >}}.
+-->
+代表不同类型或部分工作负载的各种核心对象包括 DaemonSet， Deployment， Job， ReplicaSet， and StatefulSet。
 
-例如，具有 Web 服务器和数据库的工作负载可能在一个 {{< glossary_tooltip term_id="StatefulSet" >}} 中运行数据库，而 Web 服务器运行在 {{< glossary_tooltip term_id="Deployment" >}}。
\ No newline at end of file
+例如，具有 Web 服务器和数据库的工作负载可能在一个 {{< glossary_tooltip term_id="StatefulSet" >}} 中运行数据库，
+而 Web 服务器运行在 {{< glossary_tooltip term_id="Deployment" >}}。
\ No newline at end of file