add zh in /zh、update lintcheck ci、fix conflicts (#5823)

archetypes/blog.md

@@ -1,10 +1,8 @@
 ---
 title: My Title
 subtitle: My optional on-line subtitle
-description: My one-line description for the page
+description: My one-line description for the page.
 publishdate: 2017-05-24
-attribution: My Name
+attribution: My Name (My Company Name)
 keywords: [keyword1,keyword2]
----
-
-
+---

archetypes/news.md

@@ -1,10 +1,7 @@
 ---
 title: My Title
 subtitle: My optional on-line subtitle
-description: My one-line description for the page
+description: My one-line description for the page.
 publishdate: 2017-05-24
-attribution: My Name
 keywords: [keyword1,keyword2]
----
-
-
+---

content/en/about/community/join/index.md

@@ -54,6 +54,6 @@ consider participating in our
 
 {{< community_item logo="./servicemesher.svg" alt="ServiceMesher" >}}
 Our Chinese-language documentation is maintained by the
-[ServiceMesher community](http://www.servicemesher.com), join us and get involved!
+[ServiceMesher community](https://www.servicemesher.com), join us and get involved!
 {{< /community_item >}}
 

content/zh/_index.md

@@ -2,6 +2,32 @@
 title: Istio
 description: 用于连接、保护、控制和观测服务。
 ---
+<!-- these script blocks are only for the primary English home page -->
+<script type="application/ld+json">
+    {
+        "@context": "http://schema.org",
+        "@type": "Organization",
+        "url": "https://istio.io",
+        "logo": "https://istio.io/img/logo.png",
+        "sameAs": [
+            "https://twitter.com/IstioMesh",
+            "https://discuss.istio.io/"
+        ]
+    }
+</script>
+<script type="application/ld+json">
+    {
+        "@context": "http://schema.org",
+        "@type": "WebSite",
+        "url": "https://istio.io/",
+        "potentialAction": {
+            "@type": "SearchAction",
+            "target": "https://istio.io/search?q={search_term_string}",
+            "query-input": "required name=search_term_string"
+        }
+    }
+</script>
+
 <main class="landing">
     <div id="banner">
         {{< inline_image "landing/istio-logo.svg" >}}
@@ -16,7 +42,7 @@ description: 用于连接、保护、控制和观测服务。
             <a href="/zh/docs/concepts/traffic-management/">
                 <div class="panel-img-top">
                     {{< inline_image "landing/routing-and-load-balancing.svg" >}}
-                 </div>
+                </div>
                 <div class="panel-body">
                     <hr class="panel-line">
                     <h5 class="panel-title">连接</h5>
@@ -51,7 +77,7 @@ description: 用于连接、保护、控制和观测服务。
                 </div>
                 <div class="panel-body">
                     <hr class="panel-line">
-                    <h5 class="panel-title">控制</h5>
+                    <h5 class="panel-title">Control</h5>
                     <hr class="panel-line">
                     <p class="panel-text">
                         应用策略并确保其执行，使得资源在消费者之间公平分配。
@@ -80,6 +106,5 @@ description: 用于连接、保护、控制和观测服务。
     <div id="buttons">
         <a title="在 Kubernetes 上安装 Istio。" class="btn" href="/zh/docs/setup/getting-started/">开始吧</a>
         <a title="深入了解 Istio 是什么以及它是如何工作的。" class="btn" href="/zh/docs/concepts/what-is-istio/">了解更多</a>
-        <a title="下载最新版本。" class="btn" href="/docs/setup/getting-started/#download">下载 {{< istio_release_name >}}</a>
-    </div>
-</main>
+        <a title="下载最新版本。" class="btn" href="/zh/docs/setup/getting-started/#download">下载 {{< istio_release_name >}}</a>
+    </div>

content/zh/about/bugs/index.md

@@ -15,7 +15,7 @@ icon: bugs
 
 搜索我们的 [问题数据库](https://github.com/istio/istio/issues/) 来查看是否我们已经知道您的问题，并了解何时可以解决它。如果您在该数据库中没有找到你的问题，请打开一个 [新问题](https://github.com/istio/istio/issues/new/choose) 让我们知道出现了什么错误。
 
-如果您认为错误实际上是一个安全漏洞，请访问 [报告安全漏洞](/about/security-vulnerabilities/) 了解如何处理。
+如果您认为错误实际上是一个安全漏洞，请访问 [报告安全漏洞](/zh/about/security-vulnerabilities/) 了解如何处理。
 
 ### Kubernetes 集群状态档案{#Kubernetes-cluster-state-archives}
 

content/zh/about/community/customers/index.md

@@ -17,7 +17,7 @@ skip_seealso: true
     {{< company_logo link="https://www.daocloud.io" logo="./daocloud.svg" alt="DaoCloud" >}}
     {{< company_logo link="https://www.descarteslabs.com" logo="./descarteslabs.png" alt="Descartes Labs" >}}
     {{< company_logo link="https://www.ebay.com" logo="./ebay.png" alt="eBay" >}}
-    {{< company_logo link="https://www.flexe.com/" logo="/about/community/customers/flexe.svg" alt="FLEXE" >}}
+    {{< company_logo link="https://www.flexe.com/" logo="./flexe.svg" alt="FLEXE" >}}
     {{< company_logo link="https://www.fitstation.com" logo="./fitstation.png" alt="FitStation" >}}
     {{< company_logo link="https://www.getyourguide.com/" logo="./getyourguide.svg" alt="GetYourGuide" >}}
     {{< company_logo link="https://juspay.in" logo="./juspay.png" alt="JUSPAY" >}}

content/zh/about/community/join/index.md

@@ -49,5 +49,5 @@ Istio 是一个开源项目，拥有一个支持其使用和持续开发的活
 
 {{< community_item logo="./servicemesher.svg" alt="ServiceMesher" >}}
 中文内容由
-[ServiceMesher 社区](https://www.servicemesher.com) 维护，加入我们并参与进来吧！
+[ServiceMesher community](https://www.servicemesher.com) 维护，加入我们并参与进来吧！
 {{< /community_item >}}

content/zh/about/contribute/creating-and-editing-pages/index.md

@@ -15,7 +15,7 @@ This page shows how to create, test, and maintain Istio documentation topics.
 ## Before you begin
 
 Before you can work on Istio documentation, you first need to create a fork of the Istio documentation repository as described in
-[Working with GitHub](/about/contribute/github/).
+[Working with GitHub](/zh/about/contribute/github/).
 
 ## Choosing a page type
 
@@ -229,7 +229,7 @@ the hierarchy of the site:
 current hierarchy:
 
     {{< text markdown >}}
-    [see here](/docs/adir/afile/)
+    [see here](/zh/docs/adir/afile/)
     {{< /text >}}
 
 ### GitHub

content/zh/about/contribute/diagrams/index.md

@@ -27,7 +27,7 @@ To create your diagrams, follow these steps:
 1. Connect the shapes with the appropriate style of line.
 1. Label the shapes and lines with descriptive yet short text.
 1. Add a legend for any labels that apply multiple times.
-1. [Contribute](/about/contribute/github/#add) you diagram to our
+1. [Contribute](/zh/about/contribute/github/#add) you diagram to our
    documentation.
 
 If you create the diagram in Google Draw, follow these steps:

content/zh/about/contribute/style-guide/index.md

@@ -215,6 +215,6 @@ be considered new in a few months.
 
 ### Minimize use of callouts
 
-[Callouts](/about/contribute/creating-and-editing-pages/#callouts) let you highlight some particular content in your pages, but
+[Callouts](/zh/about/contribute/creating-and-editing-pages/#callouts) let you highlight some particular content in your pages, but
 they need to be used sparingly. Callouts are intended for special notes to the user and over-using them
 throughout the site neutralizes their special attention-grabbing nature.

content/zh/about/feature-stages/index.md

@@ -27,13 +27,13 @@ within the project, not to the project as a whole. Here is a high level descript
 |   **API**         | No guarantees on backward compatibility    | APIs are versioned         | Dependable, production-worthy. APIs are versioned, with automated version conversion for backward compatibility
 |  **Performance**         | Not quantified or guaranteed     | Not quantified or guaranteed         | Performance (latency/scale) is quantified, documented, with guarantees against regression
 |   **Deprecation Policy**        | None     | Weak - 3 months         | Dependable,  Firm. 1 year notice will be provided before changes
-| **Security** | Security vulnerabilities will be handled publicly as simple bug fixes | Security vulnerabilities will be handled according to our [security vulnerability policy](/about/security-vulnerabilities/) | Security vulnerabilities will be handled according to our [security vulnerability policy](/about/security-vulnerabilities/)
+| **Security** | Security vulnerabilities will be handled publicly as simple bug fixes | Security vulnerabilities will be handled according to our [security vulnerability policy](/zh/about/security-vulnerabilities/) | Security vulnerabilities will be handled according to our [security vulnerability policy](/zh/about/security-vulnerabilities/)
 
 ## Istio features
 
 Below is our list of existing features and their current phases. This information will be updated after every monthly release.
 
-### Traffic Management
+### Traffic management
 
 | Feature           | Phase
 |-------------------|-------------------
@@ -44,69 +44,66 @@ Below is our list of existing features and their current phases. This informatio
 | Gateway: Ingress, Egress for all protocols | Stable
 | TLS termination and SNI Support in Gateways | Stable
 | SNI (multiple certs) at ingress | Stable
-| [Locality load balancing](/docs/ops/traffic-management/locality-load-balancing/) | Beta
+| [Locality load balancing](/zh/docs/ops/traffic-management/locality-load-balancing/) | Beta
 | Enabling custom filters in Envoy | Alpha
 | CNI container interface | Alpha
-| [Sidecar API](/docs/reference/config/networking/sidecar/) | Beta
+| [Sidecar API](/zh/docs/reference/config/networking/sidecar/) | Beta
 
 ### Observability
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Prometheus Integration](/docs/tasks/observability/metrics/querying-metrics/) | Stable
-| [Local Logging (STDIO)](/docs/tasks/observability/logs/collecting-logs/) | Stable
-| [Statsd Integration](/docs/reference/config/policy-and-telemetry/adapters/statsd/) | Stable
-| [Client and Server Telemetry Reporting](/docs/reference/config/policy-and-telemetry/) | Stable
-| [Service Dashboard in Grafana](/docs/tasks/observability/metrics/using-istio-dashboard/) | Stable
-| [Istio Component Dashboard in Grafana](/docs/tasks/observability/metrics/using-istio-dashboard/) | Stable
-| [Distributed Tracing](/docs/tasks/observability/distributed-tracing/) | Stable
-| [Stackdriver Integration](/docs/reference/config/policy-and-telemetry/adapters/stackdriver/) | Beta
-| [Distributed Tracing to Zipkin / Jaeger](/docs/tasks/observability/distributed-tracing/) | Beta
-| [Logging with Fluentd](/docs/tasks/observability/logs/fluentd/) | Beta
-| [Trace Sampling](/docs/tasks/observability/distributed-tracing/overview/#trace-sampling) | Beta
-
-### Security and Policy Enforcement
+| [Prometheus Integration](/zh/docs/tasks/observability/metrics/querying-metrics/) | Stable
+| [Local Logging (STDIO)](/zh/docs/tasks/observability/logs/collecting-logs/) | Stable
+| [Statsd Integration](/zh/docs/reference/config/policy-and-telemetry/adapters/statsd/) | Stable
+| [Client and Server Telemetry Reporting](/zh/docs/reference/config/policy-and-telemetry/) | Stable
+| [Service Dashboard in Grafana](/zh/docs/tasks/observability/metrics/using-istio-dashboard/) | Stable
+| [Istio Component Dashboard in Grafana](/zh/docs/tasks/observability/metrics/using-istio-dashboard/) | Stable
+| [Distributed Tracing](/zh/docs/tasks/observability/distributed-tracing/) | Stable
+| [Stackdriver Integration](/zh/docs/reference/config/policy-and-telemetry/adapters/stackdriver/) | Beta
+| [Distributed Tracing to Zipkin / Jaeger](/zh/docs/tasks/observability/distributed-tracing/) | Beta
+| [Logging with Fluentd](/zh/docs/tasks/observability/logs/fluentd/) | Beta
+| [Trace Sampling](/zh/docs/tasks/observability/distributed-tracing/overview/#trace-sampling) | Beta
+
+### Security and policy enforcement
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Deny Checker](/docs/reference/config/policy-and-telemetry/adapters/denier/)         | Stable
-| [List Checker](/docs/reference/config/policy-and-telemetry/adapters/list/)        | Stable
-| [Pluggable Key/Cert Support for Istio CA](/docs/tasks/security/citadel-config/plugin-ca-cert/)        | Stable
-| [Service-to-service mutual TLS](/docs/concepts/security/#mutual-tls-authentication)         | Stable
-| [Kubernetes: Service Credential Distribution](/docs/concepts/security/#pki)   | Stable
-| [VM: Service Credential Distribution](/docs/concepts/security/#pki)         | Beta
-| [Mutual TLS Migration](/docs/tasks/security/authentication/mtls-migration)    | Beta
-| [Cert management on Ingress Gateway](/docs/tasks/traffic-management/ingress/secure-ingress-sds) | Beta
-| [Authorization (RBAC)](/docs/concepts/security/#authorization)   | Alpha
-| [End User (JWT) Authentication](/docs/concepts/security/#authentication)  | Alpha
-| [OPA Checker](/docs/reference/config/policy-and-telemetry/adapters/opa/)    | Alpha
-| [TCP Authorization (RBAC)](/docs/tasks/security/authorization/authz-tcp) | Alpha
-| [SDS Integration](/docs/tasks/security/citadel-config/auth-sds/) | Alpha
-
-The 'Authorization (RBAC)' runtime is considered Beta.  However, its API is still subject to a backwards incompatible change.  Due to this, we advertise it as Alpha.
+| [Deny Checker](/zh/docs/reference/config/policy-and-telemetry/adapters/denier/)         | Stable
+| [List Checker](/zh/docs/reference/config/policy-and-telemetry/adapters/list/)        | Stable
+| [Pluggable Key/Cert Support for Istio CA](/zh/docs/tasks/security/citadel-config/plugin-ca-cert/)        | Stable
+| [Service-to-service mutual TLS](/zh/docs/concepts/security/#mutual-TLS-authentication)         | Stable
+| [Kubernetes: Service Credential Distribution](/zh/docs/concepts/security/#PKI)   | Stable
+| [VM: Service Credential Distribution](/zh/docs/concepts/security/#PKI)         | Beta
+| [Mutual TLS Migration](/zh/docs/tasks/security/authentication/mtls-migration)    | Beta
+| [Cert management on Ingress Gateway](/zh/docs/tasks/traffic-management/ingress/secure-ingress-sds) | Beta
+| [Authorization](/zh/docs/concepts/security/#authorization)   | Beta
+| [End User (JWT) Authentication](/zh/docs/concepts/security/#authentication)  | Alpha
+| [OPA Checker](/zh/docs/reference/config/policy-and-telemetry/adapters/opa/)    | Alpha
+| [SDS Integration](/zh/docs/tasks/security/citadel-config/auth-sds/) | Alpha
 
 ### Core
 
 | Feature           | Phase
 |-------------------|-------------------
-| [Standalone Operator](/docs/setup/install/standalone-operator/) | Alpha
-| [Kubernetes: Envoy Installation and Traffic Interception](/docs/setup/) | Stable
-| [Kubernetes: Istio Control Plane Installation](/docs/setup/) | Stable
-| [Attribute Expression Language](/docs/reference/config/policy-and-telemetry/expression-language/) | Stable
+| [Standalone Operator](/zh/docs/setup/install/standalone-operator/) | Alpha
+| [Kubernetes: Envoy Installation and Traffic Interception](/zh/docs/setup/) | Stable
+| [Kubernetes: Istio Control Plane Installation](/zh/docs/setup/) | Stable
+| [Attribute Expression Language](/zh/docs/reference/config/policy-and-telemetry/expression-language/) | Stable
 | Mixer Out-of-Process Adapter Authoring Model | Beta
-| [Helm](/docs/setup/install/helm/) | Beta
-| [Multicluster Mesh over VPN](/docs/setup/install/multicluster/) | Alpha
-| [Kubernetes: Istio Control Plane Upgrade](/docs/setup/) | Beta
+| [Helm](/zh/docs/setup/install/helm/) | Beta
+| [Multicluster Mesh over VPN](/zh/docs/setup/install/multicluster/) | Alpha
+| [Kubernetes: Istio Control Plane Upgrade](/zh/docs/setup/) | Beta
 | Consul Integration | Alpha
 | Basic Configuration Resource Validation | Beta
 | Configuration Processing with Galley | Beta
-| [Mixer Self Monitoring](/faq/mixer/#mixer-self-monitoring) | Beta
+| [Mixer Self Monitoring](/zh/faq/mixer/#mixer-self-monitoring) | Beta
 | [Custom Mixer Build Model](https://github.com/istio/istio/wiki/Mixer-Compiled-In-Adapter-Dev-Guide) | deprecated
 | [Out of Process Mixer Adapters (gRPC Adapters)](https://github.com/istio/istio/wiki/Mixer-Out-Of-Process-Adapter-Dev-Guide) | Beta
-| [Istio CNI plugin](/docs/setup/additional-setup/cni/) | Alpha
+| [Istio CNI plugin](/zh/docs/setup/additional-setup/cni/) | Alpha
 | IPv6 support for Kubernetes | Alpha
-| [Distroless base images for Istio](/docs/ops/security/harden-docker-images/) | Alpha
+| [Distroless base images for Istio](/zh/docs/ops/security/harden-docker-images/) | Alpha
 
 {{< idea >}}
-Please get in touch by joining our [community](/about/community/) if there are features you'd like to see in our future releases!
+Please get in touch by joining our [community](/zh/about/community/) if there are features you'd like to see in our future releases!
 {{< /idea >}}

content/zh/about/security-vulnerabilities/index.md

@@ -14,7 +14,7 @@ To make a report, send an email to the private
 [istio-security-vulnerability-reports@googlegroups.com](mailto:istio-security-vulnerability-reports@googlegroups.com)
 mailing list with the vulnerability details. For normal product bugs
 unrelated to latent security vulnerabilities, please head to
-our [Reporting Bugs](/about/bugs/) page to learn what to do.
+our [Reporting Bugs](/zh/about/bugs/) page to learn what to do.
 
 ### When to report a security vulnerability?
 
@@ -69,7 +69,7 @@ branches.
 
 - Once the binaries are available, an announcement is sent out on the following channels:
 
-    - The [Istio blog](/blog)
+    - The [Istio blog](/zh/blog)
     - The [Announcements](https://discuss.istio.io/c/announcements) category on discuss.istio.io
     - The [Istio Twitter feed](https://twitter.com/IstioMesh)
     - The [#announcements channel on Slack](https://istio.slack.com/messages/CFXS256EQ/)

content/zh/blog/2017/0.1-canary/index.md

@@ -34,7 +34,7 @@ Whether we use one deployment or two, canary management using deployment feature
 
 With Istio, traffic routing and replica deployment are two completely independent functions. The number of pods implementing services are free to scale up and down based on traffic load, completely orthogonal to the control of version traffic routing. This makes managing a canary version in the presence of autoscaling a much simpler problem. Autoscalers may, in fact, respond to load variations resulting from traffic routing changes, but they are nevertheless functioning independently and no differently than when loads change for other reasons.
 
-Istio’s [routing rules](/docs/concepts/traffic-management/#routing-rules) also provide other important advantages; you can easily control
+Istio’s [routing rules](/zh/docs/concepts/traffic-management/#routing-rules) also provide other important advantages; you can easily control
 fine-grained traffic percentages (e.g., route 1% of traffic without requiring 100 pods) and you can control traffic using other criteria (e.g., route traffic for specific users to the canary version). To illustrate, let’s look at deploying the **helloworld** service and see how simple the problem becomes.
 
 We begin by defining the **helloworld** Service, just like any other Kubernetes service, something like this:
@@ -90,7 +90,7 @@ spec:
 
 Note that this is exactly the same way we would do a [canary deployment](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) using plain Kubernetes, but in that case we would need to adjust the number of replicas of each Deployment to control the distribution of traffic. For example, to send 10% of the traffic to the canary version (**v2**), the replicas for **v1** and **v2** could be set to 9 and 1, respectively.
 
-However, since we are going to deploy the service in an [Istio enabled](/docs/setup/) cluster, all we need to do is set a routing
+However, since we are going to deploy the service in an [Istio enabled](/zh/docs/setup/) cluster, all we need to do is set a routing
 rule to control the traffic distribution. For example if we want to send 10% of the traffic to the canary, we could use `kubectl`
 to set a routing rule something like this:
 

content/zh/blog/2017/0.1-using-network-policy/index.md

@@ -104,7 +104,7 @@ spec:
 Here is the service graph for the Bookinfo application.
 
 {{< image width="80%"
-    link="/docs/examples/bookinfo/withistio.svg"
+    link="/zh/docs/examples/bookinfo/withistio.svg"
     caption="Bookinfo Service Graph"
     >}}