Skip to content

Commit

Permalink
sync style-guide api-concepts patch-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
asa3311 committed Jun 23, 2023
1 parent d2612e2 commit babdf20
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion content/zh-cn/docs/contribute/style/style-guide.md
Expand Up @@ -865,7 +865,7 @@ For example:
1. Preheat oven to 350˚F
1. Prepare the batter, and pour into springform pan.
`{{</* note */>}}Grease the pan for best results.{{</* /note */>}}`
{{</* note */>}}Grease the pan for best results.{{</* /note */>}}
1. Bake for 20-25 minutes or until set.
Expand Down
8 changes: 4 additions & 4 deletions content/zh-cn/docs/reference/using-api/api-concepts.md
Expand Up @@ -1766,15 +1766,15 @@ Continue Token, Exact
{{< note >}}
<!--
When you **list** resources and receive a collection response, the response includes the
[metadata](/docs/reference/generated/kubernetes-api/v1.21/#listmeta-v1-meta) of the collection as
well as [object metadata](/docs/reference/generated/kubernetes-api/v1.21/#listmeta-v1-meta)
[list metadata](/docs/reference/generated/kubernetes-api/v{{<skew currentVersion >}}/#listmeta-v1-meta) of the collection as
well as [object metadata](/docs/reference/generated/kubernetes-api/v{{<skew currentVersion >}}/#objectmeta-v1-meta)
for each item in that collection. For individual objects found within a collection response,
`.metadata.resourceVersion` tracks when that object was last updated, and not how up-to-date
the object is when served.
-->
当你 **list** 资源并收到集合响应时,
响应包括集合的[元数据](/docs/reference/generated/kubernetes-api/v1.21/#listmeta-v1-meta)
以及该集合中每个项目的[对象元数据](/docs/reference/generated/kubernetes-api/v1.21/#listmeta-v1-meta)
响应包括集合的[列表元数据](/zh-cn/docs/reference/generated/kubernetes-api/v{{<skew currentVersion >}}/#listmeta-v1-meta)
以及该集合中每个项目的[对象元数据](/zh-cn/docs/reference/generated/kubernetes-api/v{{<skew currentVersion >}}/#objectmeta-v1-meta)。
对于在集合响应中找到的单个对象,`.metadata.resourceVersion` 跟踪该对象的最后更新时间,
而不是对象在服务时的最新程度。
{{< /note >}}
Expand Down
6 changes: 2 additions & 4 deletions content/zh-cn/releases/patch-releases.md
Expand Up @@ -149,17 +149,15 @@ releases may also occur in between these.
<!--
| Monthly Patch Release | Cherry Pick Deadline | Target date |
| --------------------- | -------------------- | ----------- |
| May 2023 | 2023-05-12 | 2023-05-17 |
| June 2023 | 2023-06-09 | 2023-06-14 |
| July 2023 | 2023-07-07 | 2023-07-12 |
| August 2023 | 2023-08-04 | 2023-08-09 |
| September 2023 | 2023-09-08 | 2023-09-13 |
-->
| 月度补丁发布 | Cherry Pick 截止日期 | 目标日期 |
|------------|------------------|------------|
| 2023 年 5 月 | 2023-05-12 | 2023-05-17 |
| 2023 年 6 月 | 2023-06-09 | 2023-06-14 |
| 2023 年 7 月 | 2023-07-07 | 2023-07-12 |
| 2023 年 8 月 | 2023-08-04 | 2023-08-09 |
| 2023 年 9 月 | 2023-09-08 | 2023-09-13 |

<!--
## Detailed Release History for Active Branches
Expand Down

0 comments on commit babdf20

Please sign in to comment.