From b9d2bbdb000765bf59aaf5d19b6cd4a7ac202ca4 Mon Sep 17 00:00:00 2001
From: Qiming Teng <tengqim@cn.ibm.com>
Date: Tue, 1 Dec 2020 18:02:40 +0800
Subject: [PATCH] [zh] Sync glossary reference

---
 .../glossary/cluster-infrastructure.md        |  4 +-
 .../zh/docs/reference/glossary/container.md   |  6 +--
 .../docs/reference/glossary/control-plane.md  | 24 +++++------
 content/zh/docs/reference/glossary/cri-o.md   | 17 ++++----
 content/zh/docs/reference/glossary/kubeadm.md | 13 +++---
 content/zh/docs/reference/glossary/kubelet.md | 12 +++---
 content/zh/docs/reference/glossary/node.md    | 21 ++++++----
 .../reference/glossary/platform-developer.md  | 22 ++++++----
 .../docs/reference/glossary/pod-priority.md   | 11 ++---
 .../zh/docs/reference/glossary/preemption.md  | 20 ++++++----
 .../zh/docs/reference/glossary/quantity.md    | 40 ++++++++++---------
 .../glossary/replication-controller.md        | 28 ++++++++-----
 content/zh/docs/reference/glossary/taint.md   | 17 ++++----
 .../zh/docs/reference/glossary/toleration.md  | 25 +++++++-----
 14 files changed, 145 insertions(+), 115 deletions(-)

diff --git a/content/zh/docs/reference/glossary/cluster-infrastructure.md b/content/zh/docs/reference/glossary/cluster-infrastructure.md
index ab1954e591..8850abd4b5 100644
--- a/content/zh/docs/reference/glossary/cluster-infrastructure.md
+++ b/content/zh/docs/reference/glossary/cluster-infrastructure.md
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Cluster Infrastructure
 id: cluster-infrastructure
 date: 2019-05-12
@@ -23,9 +22,8 @@ short_description: >
 aka:
 tags:
 - operation
----
 -->
 <!--
 The infrastructure layer provides and maintains VMs, networking, security groups and others.
 -->
-基础设施层提供并维护虚拟机、网络、安全组及其他资源。
\ No newline at end of file
+基础设施层提供并维护虚拟机、网络、安全组及其他资源。
diff --git a/content/zh/docs/reference/glossary/container.md b/content/zh/docs/reference/glossary/container.md
index ac7526eeec..450a8af998 100644
--- a/content/zh/docs/reference/glossary/container.md
+++ b/content/zh/docs/reference/glossary/container.md
@@ -13,7 +13,6 @@ tags:
 ---
 
 <!--
----
 title: Container
 id: container
 date: 2018-04-12
@@ -25,20 +24,17 @@ aka:
 tags:
 - fundamental
 - workload
----
 -->
 
 <!--
  A lightweight and portable executable image that contains software and all of its dependencies.
 -->
-
- 容器是可移植、可执行的轻量级的镜像，包含其中的软件及其相关依赖。
+容器是可移植、可执行的轻量级的镜像，包含其中的软件及其相关依赖。
 
 <!--more--> 
 
 <!--
 Containers decouple applications from underlying host infrastructure to make deployment easier in different cloud or OS environments, and for easier scaling.
 -->
-
 容器使应用和底层的主机基础设施解耦，降低了应用在不同云环境或者操作系统上的部署难度，便于应用扩展。
 
diff --git a/content/zh/docs/reference/glossary/control-plane.md b/content/zh/docs/reference/glossary/control-plane.md
index 8ffd6c9a25..edb67bd796 100644
--- a/content/zh/docs/reference/glossary/control-plane.md
+++ b/content/zh/docs/reference/glossary/control-plane.md
@@ -4,15 +4,13 @@ id: control-plane
 date: 2019-05-12
 full_link:
 short_description: >
-  Control Plane（控制平面）是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
+  控制平面是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
 
 aka:
 tags:
 - fundamental
----																																 
-
-<!--
 ---
+<!--
 title: Control Plane
 id: control-plane
 date: 2019-05-12
@@ -23,18 +21,16 @@ short_description: >
 aka:
 tags:
 - fundamental
----																																 
 -->
 
 <!--
  The container orchestration layer that exposes the API and interfaces to define, deploy, and manage the lifecycle of containers.
 -->
-  Control Plane（控制平面）是指容器编排层，它暴露 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" >}}
@@ -47,9 +43,9 @@ tags:
 这个编排层是由多个不同的组件组成，例如以下（但不限于）几种：
 
  * {{< 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" >}}
+ * {{< glossary_tooltip text="API 服务器" term_id="kube-apiserver" >}}
+ * {{< glossary_tooltip text="调度器" term_id="kube-scheduler" >}}
+ * {{< glossary_tooltip text="控制器管理器" term_id="kube-controller-manager" >}}
+ * {{< glossary_tooltip text="云控制器管理器" term_id="cloud-controller-manager" >}}
 
-这些组件可以以传统的系统服务运行也可以以容器的形式运行.运行这些组件的主机过去称为 master 节点。																																																		   
\ No newline at end of file
+这些组件可以以传统的系统服务运行也可以以容器的形式运行.运行这些组件的主机过去称为 master 节点。 
diff --git a/content/zh/docs/reference/glossary/cri-o.md b/content/zh/docs/reference/glossary/cri-o.md
index c5b0e824a5..9fd744a971 100644
--- a/content/zh/docs/reference/glossary/cri-o.md
+++ b/content/zh/docs/reference/glossary/cri-o.md
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!-- 
----
 title: CRI-O
 id: cri-o
 date: 2019-05-14
@@ -23,11 +22,11 @@ short_description: >
 aka:
 tags:
 - tool
---- -->
+-->
 <!-- 
 A tool that lets you use OCI container runtimes with Kubernetes CRI.
 -->
-该工具可让您通过 Kubernetes CRI 使用 OCI 容器运行环境。
+该工具可让你通过 Kubernetes CRI 使用 OCI 容器运行时。
 
 <!--more-->
 
@@ -37,13 +36,17 @@ to enable using {{< glossary_tooltip text="container" term_id="container" >}}
 runtimes that are compatible with the Open Container Initiative (OCI)
 [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)。
+CRI-O 是 {{< glossary_tooltip text="CRI" term_id="cri" >}} 的一种实现，
+使得你可以使用与开放容器倡议（Open Container Initiative，OCI）
+[运行时规范](https://www.github.com/opencontainers/runtime-spec)
+兼容的{{< glossary_tooltip text="容器" term_id="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
+部署 CRI-O 允许 Kubernetes 使用任何符合 OCI 要求的运行时作为容器运行时
+去运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}，
+并从远程容器仓库获取 OCI 容器镜像。
+
diff --git a/content/zh/docs/reference/glossary/kubeadm.md b/content/zh/docs/reference/glossary/kubeadm.md
index 3d7ce11b59..f565376100 100644
--- a/content/zh/docs/reference/glossary/kubeadm.md
+++ b/content/zh/docs/reference/glossary/kubeadm.md
@@ -2,7 +2,7 @@
 title: Kubeadm
 id: kubeadm
 date: 2018-04-12
-full_link: /docs/admin/kubeadm/
+full_link: /zh/docs/setup/production-environment/tools/kubeadm/
 short_description: >
   用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
 
@@ -13,7 +13,6 @@ tags:
 ---
 
 <!--
----
 title: Kubeadm
 id: kubeadm
 date: 2018-04-12
@@ -25,19 +24,19 @@ aka:
 tags:
 - tool
 - operation
----
 -->
 
 <!--
  A tool for quickly installing Kubernetes and setting up a secure cluster.
 -->
-
- 用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
+用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
 
 <!--more--> 
 
 <!--
-You can use kubeadm to install both the control plane and the worker node components.
+You can use kubeadm to install both the control plane and the {{< glossary_tooltip text="worker node" term_id="node" >}} components.
 -->
+你可以使用 kubeadm 安装控制面和
+{{< glossary_tooltip text="工作节点" term_id="node" >}}
+组件。
 
-您可以使用 kubeadm 安装控制面和工作节点组件。
diff --git a/content/zh/docs/reference/glossary/kubelet.md b/content/zh/docs/reference/glossary/kubelet.md
index c561109b6e..4562f02f1f 100644
--- a/content/zh/docs/reference/glossary/kubelet.md
+++ b/content/zh/docs/reference/glossary/kubelet.md
@@ -12,7 +12,6 @@ tags:
 - core-object
 ---
 <!--
----
 title: Kubelet
 id: kubelet
 date: 2018-04-12
@@ -24,17 +23,20 @@ aka:
 tags:
 - fundamental
 - core-object
----
 -->
+
 <!--
- An agent that runs on each node in the cluster. It makes sure that containers are running in a pod.
+ An agent that runs on each {{< glossary_tooltip text="node" term_id="node" >}} in the cluster. It makes sure that {{< glossary_tooltip text="containers" term_id="container" >}} are running in a {{< glossary_tooltip text="Pod" term_id="pod" >}}.
 -->
-一个在集群中每个节点上运行的代理。它保证容器都运行在 Pod 中。
+一个在集群中每个节点上运行的代理。
+它保证容器都运行在 Pod 中。
 
 <!--more--> 
 
 <!--
 The kubelet takes a set of PodSpecs that are provided through various mechanisms and ensures that the containers described in those PodSpecs are running and healthy. The kubelet doesn’t manage containers which were not created by Kubernetes.
 -->
+kubelet 接收一组通过各类机制提供给它的 PodSpecs，确保这些 PodSpecs
+中描述的容器处于运行状态且健康。
+kubelet 不会管理不是由 Kubernetes 创建的容器。
 
-kubelet 接收一组通过各类机制提供给它的 PodSpecs，确保这些 PodSpecs 中描述的容器处于运行状态且健康。kubelet 不会管理不是由 Kubernetes 创建的容器。
diff --git a/content/zh/docs/reference/glossary/node.md b/content/zh/docs/reference/glossary/node.md
index 1277aa26ab..a646065b02 100644
--- a/content/zh/docs/reference/glossary/node.md
+++ b/content/zh/docs/reference/glossary/node.md
@@ -1,5 +1,5 @@
 ---
-title: 节点
+title: 节点（Node）
 id: node
 date: 2018-04-12
 full_link: /zh/docs/concepts/architecture/nodes/
@@ -25,19 +25,26 @@ tags:
 -->
 
 <!--
-  A node is a worker machine in Kubernetes.
+A node is a worker machine in Kubernetes.
 -->
-
 Kubernetes 中的工作机器称作节点。
 
 <!--more--> 
 
 <!--
-A worker machine may be a VM or physical machine, depending on the cluster. It has the {{< glossary_tooltip text="Services" term_id="service" >}} necessary to run {{< glossary_tooltip text="Pods" term_id="pod" >}} and is managed by the master components. The {{< glossary_tooltip text="Services" term_id="service" >}} on a node include Docker, kubelet and kube-proxy.
+A worker node may be a VM or physical machine, depending on the cluster. It has local daemons or services necessary to run {{< glossary_tooltip text="Pods" term_id="pod" >}} and is managed by the control plane. The daemons on a node include {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}, {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}, and a container runtime implementing the {{< glossary_tooltip text="CRI" term_id="cri" >}} such as {{< glossary_tooltip term_id="docker" >}}.
+
+In early Kubernetes versions, Nodes were called "Minions".
 -->
-
 工作机器可以是虚拟机也可以是物理机，取决于集群的配置。
-其上部署了运行 {{< glossary_tooltip text="Pods" term_id="pod" >}} 所必需的{{< glossary_tooltip text="服务" term_id="service" >}}，
+其上部署了运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}
+所必需的本地守护进程或{{< glossary_tooltip text="服务" term_id="service" >}}，
 并由主控组件来管理。
-节点上的{{< glossary_tooltip text="服务" term_id="service" >}}包括 Docker、kubelet 和 kube-proxy。
+节点上的的守护进程包括 {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}、
+{{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}
+以及一个 {{< glossary_tooltip term_id="docker" >}} 这种
+实现了 {{< glossary_tooltip text="CRI" term_id="cri" >}}
+的容器运行时。
+
+在早期的 Kubernetes 版本中，节点也称作 "Minions"。
 
diff --git a/content/zh/docs/reference/glossary/platform-developer.md b/content/zh/docs/reference/glossary/platform-developer.md
index 0cc10ac633..d18ad680b7 100644
--- a/content/zh/docs/reference/glossary/platform-developer.md
+++ b/content/zh/docs/reference/glossary/platform-developer.md
@@ -1,5 +1,5 @@
 ---
-title: 平台开发者
+title: 平台开发人员（Platform Developer）
 id: platform-developer
 date: 2018-04-12
 full_link: 
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Platform Developer
 id: platform-developer
 date: 2018-04-12
@@ -23,20 +22,29 @@ short_description: >
 aka: 
 tags:
 - user-type
----
 -->
 
 <!--
- A person who customizes the Kubernetes platform to fit the needs of their project.
+A person who customizes the Kubernetes platform to fit the needs of their project.
 -->
 
- 定制 Kubernetes 平台以满足自己的项目需求的人。
+定制 Kubernetes 平台以满足自己的项目需求的人。
 
 <!--more--> 
 
 <!--
-A platform developer may, for example, use [Custom Resources](/docs/concepts/api-extension/custom-resources/) or [Extend the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/) to add functionality to their instance of Kubernetes, specifically for their application.  Some Platform Developers are also {{< glossary_tooltip text="contributors" term_id="contributor" >}} and develop extensions which are contributed to the Kubernetes community.  Others develop closed-source commercial or site-specific extensions.
+A platform developer may, for example, use [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/) or
+[Extend the Kubernetes API with the aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
+to add functionality to their instance of Kubernetes, specifically for their application.
+Some Platform Developers are also {{< glossary_tooltip text="contributors" term_id="contributor" >}} and
+develop extensions which are contributed to the Kubernetes community.
+Others develop closed-source commercial or site-specific extensions.
 -->
 
-例如，平台开发人员可以使用[定制资源](/docs/concepts/api-extension/custom-resources/)或[使用汇聚层扩展 Kubernetes API](/docs/concepts/api-extension/apiserver-aggregation/) 来为其 Kubernetes 实例增加功能，特别是为其应用程序添加功能。一些平台开发人员也是 Kubrenetes {{< glossary_tooltip text="贡献者" term_id="contributor" >}}，他们会开发贡献给 Kubernetes 社区的扩展；另一些则开发封闭源代码的商业扩展或用于特定功能的扩展。
+平台开发人员可以使用[定制资源](/zh/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
+或[使用汇聚层扩展 Kubernetes API](/zh/docs/concepts/api-extension/apiserver-aggregation/)
+来为其 Kubernetes 实例增加功能，特别是为其应用程序添加功能。
+一些平台开发人员也是 Kubrenetes {{< glossary_tooltip text="贡献者" term_id="contributor" >}}，
+他们会开发贡献给 Kubernetes 社区的扩展。
+另一些平台开发人员则开发封闭源代码的商业扩展或用于特定网站的扩展。
 
diff --git a/content/zh/docs/reference/glossary/pod-priority.md b/content/zh/docs/reference/glossary/pod-priority.md
index d66561d9d7..d58eaed928 100644
--- a/content/zh/docs/reference/glossary/pod-priority.md
+++ b/content/zh/docs/reference/glossary/pod-priority.md
@@ -1,8 +1,8 @@
 ---
-title: Pod 优先级
+title: Pod 优先级（Pod Priority）
 id: pod-priority
 date: 2019-01-31
-full_link: /docs/concepts/configuration/pod-priority-preemption/#pod-priority
+full_link: /zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority
 short_description: >
   Pod 优先级表示一个 Pod 相对于其他 Pod 的重要性。
 
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Pod Priority
 id: pod-priority
 date: 2019-01-31
@@ -23,7 +22,6 @@ short_description: >
 aka:
 tags:
 - operation
----
 -->
 
 <!--
@@ -36,4 +34,7 @@ tags:
 <!--
 [Pod Priority](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.
 -->
-[Pod 优先级](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) 允许为一个 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群工作负载而言是一个重要的特性。
\ No newline at end of file
+[Pod 优先级](/zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority)
+允许用户为 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群
+工作负载而言是一个重要的特性。
+
diff --git a/content/zh/docs/reference/glossary/preemption.md b/content/zh/docs/reference/glossary/preemption.md
index 575b329065..3475e6ab01 100644
--- a/content/zh/docs/reference/glossary/preemption.md
+++ b/content/zh/docs/reference/glossary/preemption.md
@@ -1,10 +1,11 @@
 ---
-title: 抢占
+title: 抢占（Preemption）
 id: preemption
 date: 2019-01-31
-full_link: /docs/concepts/configuration/pod-priority-preemption/#preemption
+full_link: /zh/docs/concepts/configuration/pod-priority-preemption/#preemption
 short_description: >
-  Kubernetes 中的抢占逻辑通过驱逐节点上的低优先级 Pod 来帮助挂起的 Pod 找到合适的节点。
+  Kubernetes 中的抢占逻辑通过驱逐节点上的低优先级 Pod 来帮助悬决的
+  Pod 找到合适的节点。
 
 aka:
 tags:
@@ -12,7 +13,6 @@ tags:
 ---
 
 <!--
----
 title: Preemption
 id: preemption
 date: 2019-01-31
@@ -23,16 +23,20 @@ short_description: >
 aka:
 tags:
 - operation
----
 -->
 <!--
- Preemption logic in Kubernetes helps a pending Pod to find a suitable Node by evicting low priority Pods existing on that Node.
+ Preemption logic in Kubernetes helps a pending {{< glossary_tooltip term_id="pod" >}} to find a suitable {{< glossary_tooltip term_id="node" >}} by evicting low priority Pods existing on that Node.
 -->
- Kubernetes 中的抢占逻辑通过驱逐节点上的低优先级 Pod 来帮助挂起的 Pod 找到合适的节点。
+Kubernetes 中的抢占逻辑通过驱逐{{< glossary_tooltip term_id="node" >}}
+上的低优先级{{< glossary_tooltip term_id="pod" >}}
+来帮助悬决的 Pod 找到合适的节点。
 
 <!--more-->
 
 <!--
 If a Pod cannot be scheduled, the scheduler tries to [preempt](/docs/concepts/configuration/pod-priority-preemption/#preemption) lower priority Pods to make scheduling of the pending Pod possible.
 -->
-如果一个 Pod 无法调度，调度器会尝试[抢占](/docs/concepts/configuration/pod-priority-preemption/#preemption)较低优先级的 Pod，以使得挂起的 Pod 可能被调度。
\ No newline at end of file
+如果一个 Pod 无法调度，调度器会尝试
+[抢占](/zh/docs/concepts/configuration/pod-priority-preemption/#preemption)
+较低优先级的 Pod，以使得悬决的 Pod 有可能被调度。
+
diff --git a/content/zh/docs/reference/glossary/quantity.md b/content/zh/docs/reference/glossary/quantity.md
index 70d5a95ffa..03cc80051c 100644
--- a/content/zh/docs/reference/glossary/quantity.md
+++ b/content/zh/docs/reference/glossary/quantity.md
@@ -1,17 +1,17 @@
 ---
-title: 数量
+title: 量纲（Quantity）
 id: quantity
 date: 2018-08-07
 full_link:
 short_description: >
-  使用 SI 后缀的小数或大数的整数表示。
+  使用全数字来表示较小数值或使用 SI 后缀表示较大数值的表示法。
 
 aka: 
 tags:
 - core-object
 ---
+
 <!--
----
 title: Quantity
 id: quantity
 date: 2018-08-07
@@ -22,25 +22,15 @@ short_description: >
 aka: 
 tags:
 - core-object
----
 -->
 
+<!--
+A whole-number representation of small or large numbers using SI suffixes.
+-->
+使用全数字来表示较小数值或使用 SI 后缀表示较大数值的表示法。
+
 <!--more-->
 
-数量是使用紧凑的整数表示法的小数或大数的表示，并带有国际计量单位制（SI）后缀。
-小数用 milli 单位表示，而大数用 kilo、mega 或 giga 单位表示。
-
-例如，数字 `1.5` 表示为`1500m`，
-而数字`1000`表示为`1k`，`1000000`表示为`1M`。 
-您还可以指定二进制表示法后缀; 数字 2048 可以写成`2Ki`。
-
-公认的十进制（10的幂）单位是 `m`（milli）、`k`（kilo，
-有意小写）、`M`（mega），`G`（giga）、`T`（terra）、`P`（peta）、
-`E`（exa）。
-
-公认的二进制（2的幂）单位是 `Ki` (kibi)、 `Mi` (mebi)、`Gi` (gibi)、
-`Ti` (tebi)、 `Pi` (pebi)、 `Ei` (exbi)。
-
 <!--
 Quantities are representations of small or large numbers using a compact,
 whole-number notation with SI suffixes.  Fractional numbers are represented
@@ -58,3 +48,17 @@ intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
 The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
 `Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
 -->
+量纲是使用紧凑的全数字表示法来表示小数值或带有国际计量单位制（SI）
+的大数值的表示法。
+小数用 milli 单位表示，而大数用 kilo、mega 或 giga 单位表示。
+
+例如，数字 `1.5` 表示为 `1500m`，
+而数字 `1000` 表示为 `1k`，`1000000` 表示为 `1M`。 
+你还可以指定二进制表示法后缀；数字 2048 可以写成 `2Ki`。
+
+公认的十进制（10 的幂数）单位是 `m`（milli）、`k`（kilo，有意小写）、
+`M`（mega）、`G`（giga）、`T`（terra）、`P`（peta）、`E`（exa）。
+
+公认的二进制（2 的幂数）单位是 `Ki` (kibi)、`Mi` (mebi)、`Gi` (gibi)、
+`Ti` (tebi)、 `Pi` (pebi)、 `Ei` (exbi)。
+
diff --git a/content/zh/docs/reference/glossary/replication-controller.md b/content/zh/docs/reference/glossary/replication-controller.md
index daee67c2a1..3ac4033f42 100644
--- a/content/zh/docs/reference/glossary/replication-controller.md
+++ b/content/zh/docs/reference/glossary/replication-controller.md
@@ -4,7 +4,7 @@ id: replication-controller
 date: 2018-04-12
 full_link: 
 short_description: >
-  Replication Controller 是 Kubernetes 的一种服务，用来确保给定个数的 Pod 一直处于运行状态。
+  一种管理多副本应用的（已启用）的 API 对象。
 
 aka: 
 tags:
@@ -13,31 +13,41 @@ tags:
 ---
 
 <!--
----
 title: Replication Controller
 id: replication-controller
 date: 2018-04-12
 full_link: 
 short_description: >
-  Kubernetes service that ensures a specific number of instances of a pod are always running.
+  A (deprecated) API object that manages a replicated application.
 
 aka: 
 tags:
 - workload
 - core-object
----
 -->
 
 <!--
- Kubernetes service that ensures a specific number of instances of a pod are always running.
+ A workload resource that manages a replicated application, ensuring that
+a specific number of instances of a {{< glossary_tooltip text="Pod" term_id="pod" >}} are running.
 -->
-
-Replication Controller 是 Kubernetes 的一种服务，用来确保给定个数的 Pod 一直处于运行状态。
+一种工作管理多副本应用的负载资源，能够确保特定个数的
+{{< glossary_tooltip text="Pod" term_id="pod" >}}
+实例处于运行状态。
 
 <!--more--> 
 
 <!--
-Will automatically add or remove running instances of a pod, based on a set value for that pod. Allows the pod to return to the defined number of instances if pods are deleted or if too many are started by mistake.
+The control plane ensures that the defined number of Pods are running, even if some
+Pods fail, if you delete Pods manually, or if too many are started by mistake.
 -->
+控制面确保所指定的个数的 Pods 处于运行状态，即使某些 Pod 会失效，
+比如被你手动删除或者因为其他错误启动过多 Pod 时。
+
+{{< note >}}
+<!--
+ReplicationController is deprecated. See
+{{< glossary_tooltip text="Deployment" term_id="deployment" >}}, which is similar.
+-->
+ReplicationController 已被启用。请参见 Deployment 执行类似功能。
+{{< /note >}}
 
-Replication Controller 会基于设定值自动增删 Pod 的实例。如果 Pod 被误删除或者启动实例过多，Replication Controller 允许 Pod 的实例个数恢复到设定值。
diff --git a/content/zh/docs/reference/glossary/taint.md b/content/zh/docs/reference/glossary/taint.md
index 39f2c0ff5d..8961ce205d 100644
--- a/content/zh/docs/reference/glossary/taint.md
+++ b/content/zh/docs/reference/glossary/taint.md
@@ -2,9 +2,11 @@
 title: 污点（Taint）
 id: taint
 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。
+  污点是一种一个核心对象，包含三个必需的属性：key、value 和 effect。
+  污点会阻止在节点或节点组上调度 Pod。
+
 aka:
 tags:
 - core-object
@@ -12,7 +14,6 @@ tags:
 ---
 
 <!--
----
 title: Taint
 id: taint
 date: 2019-01-11
@@ -24,7 +25,6 @@ aka:
 tags:
 - core-object
 - fundamental
----
  -->
 
 <!--
@@ -34,13 +34,12 @@ tags:
 污点会阻止在{{< 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 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。
diff --git a/content/zh/docs/reference/glossary/toleration.md b/content/zh/docs/reference/glossary/toleration.md
index bc5b84e7e9..963d75b94c 100644
--- a/content/zh/docs/reference/glossary/toleration.md
+++ b/content/zh/docs/reference/glossary/toleration.md
@@ -4,7 +4,9 @@ id: toleration
 date: 2019-01-11
 full_link: /zh/docs/concepts/scheduling-eviction/taint-and-toleration/
 short_description: >
-  一个核心对象，由三个必需的属性组成：key、value 和 effect。容忍度允许将 Pod 调度到具有对应污点的节点或节点组上。
+  一个核心对象，由三个必需的属性组成：key、value 和 effect。
+  容忍度允许将 Pod 调度到具有对应污点的节点或节点组上。
+
 aka:
 tags:
 - core-object
@@ -12,7 +14,6 @@ tags:
 ---
 
 <!--
----
 title: Toleration
 id: toleration
 date: 2019-01-11
@@ -24,23 +25,25 @@ aka:
 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" >}}的节点或节点组上。
+一个核心对象，由三个必需的属性组成：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" >}}
+是允许的（但不必要）。
+