Merge pull request #22099 from tengqm/zh-sync-home

[zh] Fix links on docs home

Author: k8s-ci-robot

content/zh/docs/concepts/overview/working-with-objects/kubernetes-objects.md

@@ -3,7 +3,7 @@ title: 理解 Kubernetes 对象
 content_type: concept
 weight: 10
 card: 
-  name: 概念
+  name: concepts
   weight: 40
 ---
 

content/zh/docs/concepts/workloads/pods/pod-overview.md

@@ -3,7 +3,7 @@ title: Pod 概览
 content_type: concept
 weight: 10
 card: 
-  name: 概念
+  name: concepts
   weight: 60
 ---
 

content/zh/docs/home/_index.md

@@ -13,47 +13,59 @@ menu:
     title: "文档"
     weight: 20
     post: >
-      <p>通过演练，示例和参考文档了解如何使用 Kubernetes。你甚至可以<a href="/editdocs/" data-auto-burger-exclude>帮助贡献文档</a>！</p>
-overview: >
-  <!-- Kubernetes is an open source container orchestration engine for automating deployment, scaling, and management of containerized applications. The open source project is hosted by the Cloud Native Computing Foundation (<a href="https://www.cncf.io/about">CNCF</a>). -->
-  Kubernetes 是一个开源容器编排引擎，用于容器化应用的自动化部署、扩展和管理。该项目托管在 <a href="https://www.cncf.io/about">CNCF</a>。
-<!-- cards:
-- name: concepts
-  title: "Understand the basics"
-  description: "Learn about Kubernetes and its fundamental concepts."
-  button: "Learn Concepts"
-  button_path: "/docs/concepts"
-- name: tutorials
-  title: "Try Kubernetes"
-  description: "Follow tutorials to learn how to deploy applications in Kubernetes."
-  button: "View Tutorials"
-  button_path: "/docs/tutorials"
-- name: setup
-  title: "Set up a cluster"
-  description: "Get Kubernetes running based on your resources and needs."
-  button: "Set up Kubernetes"
-  button_path: "/docs/setup"
-- name: tasks
-  title: "Learn how to use Kubernetes"
-  description: "Look up common tasks and how to perform them using a short sequence of steps."
-  button: "View Tasks"
-  button_path: "/docs/tasks"
-- name: reference
-  title: Look up reference information
-  description: Browse terminology, command line syntax, API resource types, and setup tool documentation.
-  button: View Reference
-  button_path: /docs/reference
-- name: contribute
-  title: Contribute to the docs
-  description: Anyone can contribute, whether you’re new to the project or you’ve been around a long time.
-  button: Contribute to the docs
-  button_path: /docs/contribute
-- name: release-notes
-  title: Release Notes
-  description: If you are installing Kubernetes or upgrading to the newest version, refer to the current release notes.
-- name: about
-  title: About the documentation
-  description: This website contains documentation for the current and previous 4 versions of Kubernetes. -->
+      <p>通过概念、教程和参考文档了解如何使用 Kubernetes。你甚至可以<a href="/editdocs/" data-auto-burger-exclude>帮助贡献文档</a>！</p>
+# description: >
+#   Kubernetes is an open source container orchestration engine for automating deployment, scaling, and management of containerized applications. The open source project is hosted by the Cloud Native Computing Foundation.
+description: >
+  Kubernetes 是一个开源的容器编排引擎，用来对容器化应用进行自动部署、 扩缩和管理。此开源项目由云原生计算基金会（CNCF）托管。
+# overview:
+#  Kubernetes is an open source container orchestration engine for automating deployment, scaling, and management of containerized applications. The open source project is hosted by the Cloud Native Computing Foundation (<a href="https://www.cncf.io/about">CNCF</a>).
+overview:
+  Kubernetes 是一个开源的容器编排引擎，用来对容器化应用进行自动化部署、 扩缩和管理。该项目托管在 <a href="https://www.cncf.io/about">CNCF</a>。
+# cards:
+# - name: concepts
+#   title: "Understand the basics"
+#   description: "Learn about Kubernetes and its fundamental concepts."
+#   button: "Learn Concepts"
+#   button_path: "/docs/concepts"
+# - name: tutorials
+#   title: "Try Kubernetes"
+#   description: "Follow tutorials to learn how to deploy applications in Kubernetes."
+#   button: "View Tutorials"
+#   button_path: "/docs/tutorials"
+# - name: setup
+#   title: "Set up a cluster"
+#   description: "Get Kubernetes running based on your resources and needs."
+#   button: "Set up Kubernetes"
+#   button_path: "/docs/setup"
+# - name: tasks
+#   title: "Learn how to use Kubernetes"
+#   description: "Look up common tasks and how to perform them using a short sequence of steps."
+#   button: "View Tasks"
+#   button_path: "/docs/tasks"
+# - name: training
+#   title: "Training"
+#   description: "Get certified in Kubernetes and make your cloud native projects successful!"
+#   button: "View training"
+#   button_path: "/training"
+# - name: reference
+#   title: Look up reference information
+#   description: Browse terminology, command line syntax, API resource types, and setup tool documentation.
+#   button: View Reference
+#   button_path: /docs/reference
+# - name: contribute
+#   title: Contribute to the docs
+#   description: Anyone can contribute, whether you’re new to the project or you’ve been around a long time.
+#   button: Contribute to the docs
+#   button_path: /docs/contribute
+# - name: release-notes
+#   title: Release Notes
+#   description: If you are installing Kubernetes or upgrading to the newest version, refer to the current release notes.
+#   button: "Download Kubernetes"
+#   button_path: "/zh/docs/setup/release/notes"
+# - name: about
+#   title: About the documentation
+#   description: This website contains documentation for the current and previous 4 versions of Kubernetes.
 cards:
 - name: concepts
   title: "了解基本知识"
@@ -75,20 +87,27 @@ cards:
   description: "查看常见任务以及如何使用简单步骤执行它们。"
   button: "查看任务"
   button_path: "/zh/docs/tasks"
+- name: training
+  title: "培训"
+  description: "通过 Kubernetes 认证，助你的云原生项目成功！"
+  button: "查看培训"
+  button_path: "/zh/training"
 - name: reference
-  title: 参考
-  description: 术语、命令行语法、API 资源类型和设置工具文档。
+  title: 查阅参考信息 
+  description: 浏览术语、命令行语法、API 资源类型和安装工具文档。
   button: 查看参考
   button_path: /zh/docs/reference
 - name: contribute
-  title: 为该文档作出贡献
+  title: 为文档作贡献
   description: 任何人，无论对该项目熟悉与否，都能贡献自己的力量。
-  button: 参与贡献
+  button: 为文档作贡献
   button_path: /zh/docs/contribute
-- name: download
-  title: 下载 Kubernetes
-  description: 如果你正在安装或升级 Kubernetes 的话，最好参考最新的发行版说明。
+- name: release-notes
+  title: 发布说明
+  description: 如果你正在安装或升级 Kubernetes，最好参考最新的发布说明。
+  button: "下载 Kubernetes"
+  button_path: "/zh/docs/setup/release/notes"
 - name: about
   title: 关于文档
-  description: 该网站包含了当前版本以及前 4 个版本的 Kubernetes 文档。
+  description: 本网站包含了当前及前 4 个版本的 Kubernetes 文档。
 ---

content/zh/docs/reference/glossary/index.md

@@ -1,14 +1,11 @@
 ---
-approvers:
-- chenopis
-- abiogenesis-now
 title: 标准化词汇表
 layout: glossary
 noedit: true
 default_active_tag: fundamental
 weight: 5
 card:
-  name: 参考
+  name: reference
   weight: 10
   title: 词汇表
 ---

content/zh/docs/reference/setup-tools/kubeadm/kubeadm.md

@@ -1,33 +1,63 @@
 ---
-# title: Overview of kubeadm
 title: kubeadm 概述
 weight: 10
+card:
+  name: reference
+  weight: 40
 ---
+<!--
+reviewers:
+- luxas
+- jbeda
+title: Overview of kubeadm
+weight: 10
+card:
+  name: reference
+  weight: 40
+-->
+
 <img src="https://raw.githubusercontent.com/cncf/artwork/master/projects/kubernetes/certified-kubernetes/versionless/color/certified-kubernetes-color.png" align="right" width="150px">
-<!-- Kubeadm is a tool built to provide `kubeadm init` and `kubeadm join` as best-practice “fast paths” for creating Kubernetes clusters. -->
+<!--
+Kubeadm is a tool built to provide `kubeadm init` and `kubeadm join` as best-practice “fast paths” for creating Kubernetes clusters.
+-->
 Kubeadm 是一个工具，它提供了 `kubeadm init` 以及 `kubeadm join` 这两个命令作为快速创建 kubernetes 集群的最佳实践。
 
-<!-- kubeadm performs the actions necessary to get a minimum viable cluster up and running. By design, it cares only about bootstrapping, not about provisioning machines. Likewise, installing various nice-to-have addons, like the Kubernetes Dashboard, monitoring solutions, and cloud-specific addons, is not in scope. -->
+<!--
+kubeadm performs the actions necessary to get a minimum viable cluster up and running. By design, it cares only about bootstrapping, not about provisioning machines. Likewise, installing various nice-to-have addons, like the Kubernetes Dashboard, monitoring solutions, and cloud-specific addons, is not in scope.
+-->
 kubeadm 通过执行必要的操作来启动和运行一个最小可用的集群。它被故意设计为只关心启动集群，而不是准备节点环境的工作。同样的，诸如安装各种各样的可有可无的插件，例如 Kubernetes 控制面板、监控解决方案以及特定云提供商的插件，这些都不在它负责的范围。
 
-<!-- Instead, we expect higher-level and more tailored tooling to be built on top of kubeadm, and ideally, using kubeadm as the basis of all deployments will make it easier to create conformant clusters. -->
+<!--
+Instead, we expect higher-level and more tailored tooling to be built on top of kubeadm, and ideally, using kubeadm as the basis of all deployments will make it easier to create conformant clusters.
+-->
 相反，我们期望由一个基于 kubeadm 从更高层设计的更加合适的工具来做这些事情；并且，理想情况下，使用 kubeadm 作为所有部署的基础将会使得创建一个符合期望的集群变得容易。
 
+<!--
+## How to install
+
+To install kubeadm, see the [installation guide](/docs/setup/production-environment/tools/kubeadm/install-kubeadm).
+-->
+## 如何安装
+要安装 kubeadm，请参考[安装指南](/docs/setup/production-environment/tools/kubeadm/install-kubeadm)。
+
 ## 接下可以做什么
 
-<!-- * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init) to bootstrap a Kubernetes master node -->
-* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init) 启动一个 Kubernetes 主节点
-<!-- * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join) to bootstrap a Kubernetes worker node and join it to the cluster -->
-* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join) 启动一个 Kubernetes 工作节点并且将其加入到集群
-<!-- * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade) to upgrade a Kubernetes cluster to a newer version -->
-* [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade) 更新一个 Kubernetes 集群到新版本
-<!-- * [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config) if you initialized your cluster using kubeadm v1.7.x or lower, to configure your cluster for `kubeadm upgrade` -->
+<!--
+* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init) to bootstrap a Kubernetes master node
+* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join) to bootstrap a Kubernetes worker node and join it to the cluster
+* [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade) to upgrade a Kubernetes cluster to a newer version
+* [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config) if you initialized your cluster using kubeadm v1.7.x or lower, to configure your cluster for `kubeadm upgrade`
+* [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token) to manage tokens for `kubeadm join`
+* [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
+* [kubeadm version](/docs/reference/setup-tools/kubeadm/kubeadm-version) to print the kubeadm version
+* [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha) to preview a set of features made available for gathering feedback from the community
+-->
+* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init) 启动引导一个 Kubernetes 主节点
+* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join) 启动引导一个 Kubernetes 工作节点并且将其加入到集群
+* [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade) 更新 Kubernetes 集群到新版本
 * [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config) 如果你使用 kubeadm v1.7.x 或者更低版本，你需要对你的集群做一些配置以便使用 `kubeadm upgrade` 命令
-<!-- * [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token) to manage tokens for `kubeadm join` -->
 * [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token) 使用 `kubeadm join` 来管理令牌
-<!-- * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset) to revert any changes made to this host by `kubeadm init` or `kubeadm join` --> 
-* [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset) 还原之前使用 `kubeadm init` 或者 `kubeadm join` 对节点产生的改变
-<!-- * [kubeadm version](/docs/reference/setup-tools/kubeadm/kubeadm-version) to print the kubeadm version -->
+* [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset) 还原之前使用 `kubeadm init` 或者 `kubeadm join` 对节点所作改变
 * [kubeadm version](/docs/reference/setup-tools/kubeadm/kubeadm-version) 打印出 kubeadm 版本
-<!-- * [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha) to preview a set of features made available for gathering feedback from the community -->
 * [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha) 预览一组可用的新功能以便从社区搜集反馈
+

content/zh/docs/setup/_index.md

@@ -5,7 +5,7 @@ main_menu: true
 weight: 20
 content_type: concept
 card:
-  name: 设置
+  name: setup
   weight: 20
   anchors:
   - anchor: "#learning-environment"
@@ -15,7 +15,6 @@ card:
 ---
 
 <!--
----
 reviewers:
 - brendandburns
 - erictune
@@ -33,7 +32,6 @@ card:
     title: Learning environment
   - anchor: "#production-environment"
     title: Production environment  
----
 -->
 
 <!-- overview -->