[zh] Sync guestbook.md and overview.md

windsonsea · windsonsea · commit 39d3ddd86dd6 · 2023-09-07T21:30:58.000+08:00
diff --git a/content/zh-cn/docs/concepts/configuration/overview.md b/content/zh-cn/docs/concepts/configuration/overview.md
@@ -296,11 +296,11 @@ for a comprehensive list.
 <!--
 - Use label selectors for `get` and `delete` operations instead of specific object names. See the
   sections on [label selectors](/docs/concepts/overview/working-with-objects/labels/#label-selectors)
-  and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively).
+  and [using labels effectively](/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively).
 -->
 - &#20351;&#29992;&#26631;&#31614;&#36873;&#25321;&#22120;&#36827;&#34892; `get` &#21644; `delete` &#25805;&#20316;&#65292;&#32780;&#19981;&#26159;&#29305;&#23450;&#30340;&#23545;&#35937;&#21517;&#31216;&#12290;
 - &#35831;&#21442;&#38405;[&#26631;&#31614;&#36873;&#25321;&#22120;](/zh-cn/docs/concepts/overview/working-with-objects/labels/#label-selectors)&#21644;
-  [&#26377;&#25928;&#20351;&#29992;&#26631;&#31614;](/zh-cn/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively)&#37096;&#20998;&#12290;
+  [&#26377;&#25928;&#20351;&#29992;&#26631;&#31614;](/zh-cn/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively)&#37096;&#20998;&#12290;
 
 <!--
 - Use `kubectl create deployment` and `kubectl expose` to quickly create single-container
diff --git a/content/zh-cn/docs/tutorials/stateless-application/guestbook.md b/content/zh-cn/docs/tutorials/stateless-application/guestbook.md
@@ -1,5 +1,5 @@
 ---
-title: "&#31034;&#20363;&#65306;&#20351;&#29992; Redis &#37096;&#32626; PHP &#30041;&#35328;&#26495;&#24212;&#29992;&#31243;&#24207;"
+title: "&#31034;&#20363;&#65306;&#20351;&#29992; Redis &#37096;&#32626; PHP &#30041;&#35328;&#26495;&#24212;&#29992;"
 content_type: tutorial
 weight: 20
 card:
@@ -9,7 +9,6 @@ card:
 min-kubernetes-server-version: v1.14
 source: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
 ---
-
 <!--
 title: "Example: Deploying PHP Guestbook application with Redis"
 reviewers:
@@ -34,7 +33,7 @@ ready)_, multi-tier web application using Kubernetes and
 components:
 -->
 &#26412;&#25945;&#31243;&#21521;&#20320;&#23637;&#31034;&#22914;&#20309;&#20351;&#29992; Kubernetes &#21644; [Docker](https://www.docker.com/)
-&#26500;&#24314;&#21644;&#37096;&#32626;&#19968;&#20010;&#31616;&#21333;&#30340; **(&#38750;&#38754;&#21521;&#29983;&#20135;&#30340;)** &#22810;&#23618; Web &#24212;&#29992;&#31243;&#24207;&#12290;&#26412;&#20363;&#30001;&#20197;&#19979;&#32452;&#20214;&#32452;&#25104;&#65306;
+&#26500;&#24314;&#21644;&#37096;&#32626;&#19968;&#20010;&#31616;&#21333;&#30340; **(&#38750;&#38754;&#21521;&#29983;&#20135;&#30340;)** &#22810;&#23618; Web &#24212;&#29992;&#12290;&#26412;&#20363;&#30001;&#20197;&#19979;&#32452;&#20214;&#32452;&#25104;&#65306;
 
 <!--
 * A single-instance [Redis](https://www.redis.io/) to store guestbook entries
@@ -73,7 +72,7 @@ components:
 <!--
 The guestbook application uses Redis to store its data.
 -->
-&#30041;&#35328;&#26495;&#24212;&#29992;&#31243;&#24207;&#20351;&#29992; Redis &#23384;&#20648;&#25968;&#25454;&#12290;
+&#30041;&#35328;&#26495;&#24212;&#29992;&#20351;&#29992; Redis &#23384;&#20648;&#25968;&#25454;&#12290;
 
 <!--
 ### Creating the Redis Deployment
@@ -85,7 +84,7 @@ The manifest file, included below, specifies a Deployment controller that runs a
 -->
 &#19979;&#38754;&#21253;&#21547;&#30340;&#28165;&#21333;&#25991;&#20214;&#25351;&#23450;&#20102;&#19968;&#20010; Deployment &#25511;&#21046;&#22120;&#65292;&#35813;&#25511;&#21046;&#22120;&#36816;&#34892;&#19968;&#20010; Redis Pod &#21103;&#26412;&#12290;
 
-{{< code file="application/guestbook/redis-leader-deployment.yaml" >}}
+{{% code_sample file="application/guestbook/redis-leader-deployment.yaml" %}}
 
 <!--
 1. Launch a terminal window in the directory you downloaded the manifest files.
@@ -142,16 +141,16 @@ You need to apply a [Service](/docs/concepts/services-networking/service/) to
 proxy the traffic to the Redis Pod. A Service defines a policy to access the
 Pods.
 -->
-&#30041;&#35328;&#26495;&#24212;&#29992;&#31243;&#24207;&#38656;&#35201;&#24448; Redis &#20013;&#20889;&#25968;&#25454;&#12290;&#22240;&#27492;&#65292;&#38656;&#35201;&#21019;&#24314;
+&#30041;&#35328;&#26495;&#24212;&#29992;&#38656;&#35201;&#24448; Redis &#20013;&#20889;&#25968;&#25454;&#12290;&#22240;&#27492;&#65292;&#38656;&#35201;&#21019;&#24314;
 [Service](/zh-cn/docs/concepts/services-networking/service/) &#26469;&#36716;&#21457; Redis Pod
 &#30340;&#27969;&#37327;&#12290;Service &#23450;&#20041;&#20102;&#35775;&#38382; Pod &#30340;&#31574;&#30053;&#12290;
 
-{{< code file="application/guestbook/redis-leader-service.yaml" >}}
+{{% code_sample file="application/guestbook/redis-leader-service.yaml" %}}
 
 <!--
 1. Apply the Redis Service from the following `redis-leader-service.yaml` file:
 -->
-1. &#20351;&#29992;&#19979;&#38754;&#30340; `redis-leader-service.yaml` &#25991;&#20214;&#21019;&#24314; Redis&#30340;&#26381;&#21153;&#65306;
+1. &#20351;&#29992;&#19979;&#38754;&#30340; `redis-leader-service.yaml` &#25991;&#20214;&#21019;&#24314; Redis &#30340;&#26381;&#21153;&#65306;
 
    <!---
    for local testing of the content via relative file path
@@ -188,8 +187,8 @@ This manifest file creates a Service named `redis-leader` with a set of labels
 that match the labels previously defined, so the Service routes network
 traffic to the Redis Pod.
 -->
-&#36825;&#20010;&#28165;&#21333;&#25991;&#20214;&#21019;&#24314;&#20102;&#19968;&#20010;&#21517;&#20026; `redis-leader` &#30340; Service&#65292;&#20854;&#20013;&#21253;&#21547;&#19968;&#32452;
-&#19982;&#21069;&#38754;&#23450;&#20041;&#30340;&#26631;&#31614;&#21305;&#37197;&#30340;&#26631;&#31614;&#65292;&#22240;&#27492;&#26381;&#21153;&#23558;&#32593;&#32476;&#27969;&#37327;&#36335;&#30001;&#21040; Redis Pod &#19978;&#12290;
+&#36825;&#20010;&#28165;&#21333;&#25991;&#20214;&#21019;&#24314;&#20102;&#19968;&#20010;&#21517;&#20026; `redis-leader` &#30340; Service&#65292;
+&#20854;&#20013;&#21253;&#21547;&#19968;&#32452;&#19982;&#21069;&#38754;&#23450;&#20041;&#30340;&#26631;&#31614;&#21305;&#37197;&#30340;&#26631;&#31614;&#65292;&#22240;&#27492;&#26381;&#21153;&#23558;&#32593;&#32476;&#27969;&#37327;&#36335;&#30001;&#21040; Redis Pod &#19978;&#12290;
 {{< /note >}}
 
 <!--
@@ -203,7 +202,7 @@ and meet traffic demands by adding a few Redis followers, or replicas.
 &#23613;&#31649; Redis &#39046;&#23548;&#32773;&#21482;&#26377;&#19968;&#20010; Pod&#65292;&#20320;&#21487;&#20197;&#36890;&#36807;&#28155;&#21152;&#33509;&#24178; Redis &#36319;&#38543;&#32773;&#26469;&#23558;&#20854;&#37197;&#32622;&#20026;&#39640;&#21487;&#29992;&#29366;&#24577;&#65292;
 &#20197;&#28385;&#36275;&#27969;&#37327;&#38656;&#27714;&#12290;
 
-{{< code file="application/guestbook/redis-follower-deployment.yaml" >}}
+{{% code_sample file="application/guestbook/redis-follower-deployment.yaml" %}}
 
 <!--
 1. Apply the Redis Deployment from the following `redis-follower-deployment.yaml` file:
@@ -253,7 +252,7 @@ Guestbook &#24212;&#29992;&#38656;&#35201;&#19982; Redis &#36319;&#38543;&#32773;&#36890;&#20449;&#20197;&#35835;&#21462;&#25968;&#25454;&#12290;
 &#20026;&#20102;&#35753; Redis &#36319;&#38543;&#32773;&#21487;&#34987;&#21457;&#29616;&#65292;&#20320;&#24517;&#39035;&#21019;&#24314;&#21478;&#19968;&#20010;
 [Service](/zh-cn/docs/concepts/services-networking/service/)&#12290;
 
-{{< code file="application/guestbook/redis-follower-service.yaml" >}}
+{{% code_sample file="application/guestbook/redis-follower-service.yaml" %}}
 
 <!--
 1. Apply the Redis Service from the following `redis-follower-service.yaml` file:
@@ -301,7 +300,6 @@ traffic to the Redis Pod.
 Redis Pod &#20043;&#19978;&#12290;
 {{< /note >}}
 
-
 <!--
 ## Set up and Expose the Guestbook Frontend
 -->
@@ -321,16 +319,16 @@ jQuery-Ajax-based UX.
 &#25509;&#19979;&#26469;&#21487;&#20197;&#21551;&#21160; Guestbook &#30340; Web &#26381;&#21153;&#22120;&#20102;&#12290;
 &#19982; Redis &#36319;&#38543;&#32773;&#31867;&#20284;&#65292;&#21069;&#31471;&#20063;&#26159;&#20351;&#29992; Kubernetes Deployment &#26469;&#37096;&#32626;&#30340;&#12290;
 
-Guestbook &#24212;&#29992;&#20351;&#29992; PHP &#21069;&#31471;&#12290;&#35813;&#21069;&#31471;&#34987;&#37197;&#32622;&#25104;&#19982;&#21518;&#31471;&#30340; Redis &#36319;&#38543;&#32773;&#25110;&#32773;
-&#39046;&#23548;&#32773;&#26381;&#21153;&#36890;&#20449;&#65292;&#20855;&#20307;&#36873;&#25321;&#21738;&#20010;&#26381;&#21153;&#21462;&#20915;&#20110;&#35831;&#27714;&#26159;&#35835;&#25805;&#20316;&#36824;&#26159;&#20889;&#25805;&#20316;&#12290;
+Guestbook &#24212;&#29992;&#20351;&#29992; PHP &#21069;&#31471;&#12290;&#35813;&#21069;&#31471;&#34987;&#37197;&#32622;&#25104;&#19982;&#21518;&#31471;&#30340; Redis
+&#36319;&#38543;&#32773;&#25110;&#32773;&#39046;&#23548;&#32773;&#26381;&#21153;&#36890;&#20449;&#65292;&#20855;&#20307;&#36873;&#25321;&#21738;&#20010;&#26381;&#21153;&#21462;&#20915;&#20110;&#35831;&#27714;&#26159;&#35835;&#25805;&#20316;&#36824;&#26159;&#20889;&#25805;&#20316;&#12290;
 &#21069;&#31471;&#23545;&#22806;&#26292;&#38706;&#19968;&#20010; JSON &#25509;&#21475;&#65292;&#24182;&#25552;&#20379;&#22522;&#20110; jQuery-Ajax &#30340;&#29992;&#25143;&#20307;&#39564;&#12290;
 
 <!--
 ### Creating the Guestbook Frontend Deployment
 -->
 ### &#21019;&#24314; Guestbook &#21069;&#31471; Deployment   {#creating-the-guestbook-frontend-deployment}
 
-{{< code file="application/guestbook/frontend-deployment.yaml" >}}
+{{% code_sample file="application/guestbook/frontend-deployment.yaml" %}}
 
 <!--
 1. Apply the frontend Deployment from the `frontend-deployment.yaml` file:
@@ -401,12 +399,12 @@ Some cloud providers, like Google Compute Engine or Google Kubernetes Engine,
 support external load balancers. If your cloud provider supports load
 balancers and you want to use it, uncomment `type: LoadBalancer`.
 -->
-&#19968;&#20123;&#20113;&#25552;&#20379;&#21830;&#65292;&#22914; Google Compute Engine &#25110; Google Kubernetes Engine&#65292;
-&#25903;&#25345;&#22806;&#37096;&#36127;&#36733;&#22343;&#34913;&#22120;&#12290;&#22914;&#26524;&#20320;&#30340;&#20113;&#25552;&#20379;&#21830;&#25903;&#25345;&#36127;&#36733;&#22343;&#34913;&#22120;&#65292;&#24182;&#19988;&#20320;&#24076;&#26395;&#20351;&#29992;&#23427;&#65292;
+Google Compute Engine &#25110; Google Kubernetes Engine
+&#36825;&#20123;&#20113;&#24179;&#21488;&#25903;&#25345;&#22806;&#37096;&#36127;&#36733;&#22343;&#34913;&#22120;&#12290;&#22914;&#26524;&#20320;&#30340;&#20113;&#24179;&#21488;&#25903;&#25345;&#36127;&#36733;&#22343;&#34913;&#22120;&#65292;&#24182;&#19988;&#20320;&#24076;&#26395;&#20351;&#29992;&#23427;&#65292;
 &#21482;&#38656;&#21462;&#28040;&#27880;&#37322; `type: LoadBalancer`&#12290;
 {{< /note >}}
 
-{{< code file="application/guestbook/frontend-service.yaml" >}}
+{{% code_sample file="application/guestbook/frontend-service.yaml" %}}
 
 <!--
 1. Apply the frontend Service from the `frontend-service.yaml` file:
@@ -655,10 +653,10 @@ labels to delete multiple resources with one command.
 * Complete the [Kubernetes Basics](/docs/tutorials/kubernetes-basics/) Interactive Tutorials
 * Use Kubernetes to create a blog using [Persistent Volumes for MySQL and Wordpress](/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/#visit-your-new-wordpress-blog)
 * Read more about [connecting applications with services](/docs/tutorials/services/connect-applications-service/)
-* Read more about [Managing Resources](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively)
+* Read more about [using labels effectively](/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively)
 -->
 * &#23436;&#25104; [Kubernetes &#22522;&#30784;](/zh-cn/docs/tutorials/kubernetes-basics/) &#20132;&#20114;&#24335;&#25945;&#31243;
 * &#20351;&#29992; Kubernetes &#21019;&#24314;&#19968;&#20010;&#21338;&#23458;&#65292;&#20351;&#29992;
   [MySQL &#21644; Wordpress &#30340;&#25345;&#20037;&#21367;](/zh-cn/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/#visit-your-new-wordpress-blog)
 * &#36827;&#19968;&#27493;&#38405;&#35835;[&#20351;&#29992; Service &#36830;&#25509;&#21040;&#24212;&#29992;](/zh-cn/docs/tutorials/services/connect-applications-service/)
-* &#36827;&#19968;&#27493;&#38405;&#35835;[&#31649;&#29702;&#36164;&#28304;](/zh-cn/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively)
+* &#36827;&#19968;&#27493;&#38405;&#35835;[&#26377;&#25928;&#20351;&#29992;&#26631;&#31614;](/zh-cn/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively)

-Original file line number
+Diff line change
 <!--
 - Use label selectors for `get` and `delete` operations instead of specific object names. See the
   sections on [label selectors](/docs/concepts/overview/working-with-objects/labels/#label-selectors)
 -  and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively).
 +  and [using labels effectively](/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively).
 -->
 - 使用标签选择器进行 `get` 和 `delete` 操作，而不是特定的对象名称。
 - 请参阅[标签选择器](/zh-cn/docs/concepts/overview/working-with-objects/labels/#label-selectors)和
 -  [有效使用标签](/zh-cn/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively)部分。
 +  [有效使用标签](/zh-cn/docs/concepts/overview/working-with-objects/labels/#using-labels-effectively)部分。
 <!--
 - Use `kubectl create deployment` and `kubectl expose` to quickly create single-container