Skip to content

Commit 24b887c

Browse files
authored
Merge pull request #26250 from chenxuc/misc_batch2
[zh] Sync web page for tasks
2 parents e064d78 + b60b592 commit 24b887c

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ for the pathnames of the certificate files. You need to change these to the actu
211211
of certificate files in your environment.
212212

213213
Sometimes you may want to use Base64-encoded data embedded here instead of separate
214-
certificate files; in that case you need add the suffix `-data` to the keys, for example,
214+
certificate files; in that case you need to add the suffix `-data` to the keys, for example,
215215
`certificate-authority-data`, `client-certificate-data`, `client-key-data`.
216216
-->
217217
其中的 `fake-ca-file`、`fake-cert-file` 和 `fake-key-file` 是证书文件路径名的占位符。

content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ case you can try several things:
7979
8080
* Add more nodes to the cluster.
8181
82-
* [Terminate unneeded pods](/docs/concepts/workloads/pods/#pod-termination)
82+
* [Terminate unneeded pods](/docs/concepts/workloads/pods/pod-lifecycle/#pod-termination)
8383
to make room for pending pods.
8484
8585
* Check that the pod is not larger than your nodes. For example, if all

content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,17 @@ and
657657
658658
[`kubectl apply`](/docs/reference/generated/kubectl/kubectl-commands/#apply)。
659659
660+
661+
<!--
662+
{{< note >}}
663+
Strategic merge patch is not supported for custom resources.
664+
{{< /note >}}
665+
-->
666+
{{< note >}}
667+
定制资源不支持策略性合并 patch。
668+
{{< /note >}}
669+
670+
660671
## {{% heading "whatsnext" %}}
661672
662673
<!--

0 commit comments

Comments
 (0)