Skip to content

Commit a56cc6e

Browse files
authored
Merge pull request #34893 from windsonsea/andand
[zh-cn] updated three glossary files
2 parents f046f1a + a56c6b3 commit a56cc6e

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

content/zh-cn/docs/reference/glossary/node.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ In early Kubernetes versions, Nodes were called "Minions".
3838
-->
3939
工作机器可以是虚拟机也可以是物理机,取决于集群的配置。
4040
其上部署了运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}
41-
所必需的本地守护进程或服务,
42-
并由主控组件来管理。
43-
节点上的的守护进程包括 {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}、
41+
所必需的本地守护进程或服务,并由主控组件来管理。
42+
节点上的守护进程包括 {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}、
4443
{{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}
4544
以及一个 {{< glossary_tooltip term_id="docker" >}} 这种
4645
实现了 {{< glossary_tooltip text="CRI" term_id="cri" >}}
4746
的容器运行时。
4847

4948
在早期的 Kubernetes 版本中,节点也称作 "Minions"。
50-

content/zh-cn/docs/reference/glossary/pod-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ A high-level summary of what phase the Pod is in within its lifecyle.
3737
The [Pod Lifecycle](/docs/concepts/workloads/pods/pod-lifecycle/) is defined by the states or phases of a Pod. There are five possible Pod phases: Pending, Running, Succeeded, Failed, and Unknown. A high-level description of the Pod state is summarized in the [PodStatus](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podstatus-v1-core) `phase` field.
3838
-->
3939
[Pod 生命周期](/zh-cn/docs/concepts/workloads/pods/pod-lifecycle/) 是关于 Pod
40-
处于哪个阶段的概述。包含了下面5种可能的的阶段: Running、Pending、Succeeded、
40+
处于哪个阶段的概述。包含了下面 5 种可能的阶段: Running、Pending、Succeeded、
4141
Failed、Unknown。关于 Pod 的阶段的更高级描述请查阅
4242
[PodStatus](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podstatus-v1-core) `phase` 字段。

content/zh-cn/docs/reference/glossary/service-catalog.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ tags:
1212
---
1313

1414
<!--
15-
---
1615
title: Service Catalog
1716
id: service-catalog
1817
date: 2018-04-12
@@ -23,22 +22,17 @@ short_description: >
2322
aka:
2423
tags:
2524
- extension
26-
---
2725
-->
2826

29-
3027
<!--
3128
A former 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.
3229
-->
33-
34-
服务目录是一种过去曾经存在的扩展 API,它能让 Kubernetes 集群中运行的应用易于使用外部托管的的软件服务,例如云供应商提供的数据仓库服务。
30+
服务目录是一种过去曾经存在的扩展 API,它能让 Kubernetes 集群中运行的应用易于使用外部托管的软件服务,例如云供应商提供的数据仓库服务。
3531

3632
<!--more-->
3733

3834
<!--
3935
It provided a way to list, provision, and bind with external {{< glossary_tooltip text="Managed Services" term_id="managed-service" >}} without needing detailed knowledge about how those services would be created or managed.
4036
-->
41-
42-
服务目录可以检索、供应、和绑定外部{{< glossary_tooltip text="托管服务(Managed Services)" term_id="managed-service" >}},
37+
服务目录可以检索、供应并绑定外部{{< glossary_tooltip text="托管服务(Managed Services)" term_id="managed-service" >}},
4338
而无需知道那些服务具体是怎样创建和托管的。
44-

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Token ID of the form "[a-z0-9]{6}" to delete.
2929

3030
这个命令将为你删除指定的引导令牌列表。
3131

32-
`[token-value]` 是要删除的 "[a-z0-9]{6}.[a-z0-9]{16}" 形式的完整令牌或者是 "[a-z0-9]{6}" 形式的的令牌 ID。
32+
`[token-value]` 是要删除的 "[a-z0-9]{6}.[a-z0-9]{16}" 形式的完整令牌或者是 "[a-z0-9]{6}" 形式的令牌 ID。
3333

3434
```
3535
kubeadm token delete [token-value] ...

0 commit comments

Comments
 (0)