whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 3/17/21

Browse Source 
Fixed merge conflict with /docs/reference/command-line-tools-reference/kube-apiserver.md and preferred master
This commit is contained in:
Rey Lejano
2021-03-17 21:29:04 -07:00
parent 7afd404212 cb7edbf398
commit 9d56683e8b
60 changed files with 1705 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/docs/reference/glossary/api-group.md
+2 -2
View File
@@ -2,7 +2,7 @@
title: API Group
id: api-group
date: 2019-09-02
full_link: /zh/docs/concepts/overview/kubernetes-api/#api-groups
full_link: /zh/docs/concepts/overview/kubernetes-api/#api-groups-and-versioning
short_description: >
Kubernetes API 中的一组相关路径
@@ -17,7 +17,7 @@ tags:
title: API Group
id: api-group
date: 2019-09-02
full_link: /docs/concepts/overview/kubernetes-api/#api-groups
full_link: /docs/concepts/overview/kubernetes-api/#api-groups-and-versioning
short_description: >
A set of related paths in the Kubernetes API.