From 4b35d4d401e6f637815d3421fabe0dc0dc0917c3 Mon Sep 17 00:00:00 2001
From: Karen Bradshaw <kbhawkey@gmail.com>
Date: Mon, 1 Jun 2020 09:23:39 -0400
Subject: [PATCH] add zh pages

---
 content/zh/docs/concepts/_index.md            | 17 +++++-----
 .../concepts/architecture/cloud-controller.md | 12 +++----
 .../docs/concepts/architecture/controller.md  | 15 +++++----
 .../zh/docs/concepts/architecture/nodes.md    | 17 +++++-----
 .../concepts/cluster-administration/addons.md | 10 +++---
 .../cluster-administration/certificates.md    | 10 +++---
 .../cluster-administration/cloud-providers.md | 12 +++----
 .../cluster-administration-overview.md        | 10 +++---
 .../controller-metrics.md                     | 12 +++----
 .../cluster-administration/federation.md      | 15 +++++----
 .../kubelet-garbage-collection.md             | 17 +++++-----
 .../cluster-administration/logging.md         | 10 +++---
 .../manage-deployment.md                      | 15 +++++----
 .../cluster-administration/monitoring.md      | 15 +++++----
 .../cluster-administration/networking.md      | 15 +++++----
 .../cluster-administration/proxies.md         | 10 +++---
 .../concepts/configuration/assign-pod-node.md | 17 +++++-----
 .../docs/concepts/configuration/configmap.md  | 15 +++++----
 .../manage-compute-resources-container.md     | 17 +++++-----
 .../organize-cluster-access-kubeconfig.md     | 17 +++++-----
 .../docs/concepts/configuration/overview.md   | 12 +++----
 .../concepts/configuration/pod-overhead.md    | 15 +++++----
 .../configuration/resource-bin-packing.md     | 12 +++----
 .../zh/docs/concepts/configuration/secret.md  | 13 ++++----
 .../configuration/taint-and-toleration.md     |  8 ++---
 .../container-environment-variables.md        | 15 +++++----
 .../containers/container-environment.md       | 15 +++++----
 .../containers/container-lifecycle-hooks.md   | 17 +++++-----
 content/zh/docs/concepts/containers/images.md | 12 +++----
 .../zh/docs/concepts/containers/overview.md   | 15 +++++----
 .../docs/concepts/containers/runtime-class.md | 15 +++++----
 .../docs/concepts/example-concept-template.md | 17 +++++-----
 .../api-extension/apiserver-aggregation.md    | 17 +++++-----
 .../compute-storage-net/device-plugins.md     | 15 +++++----
 .../compute-storage-net/network-plugins.md    | 17 +++++-----
 .../extend-kubernetes/extend-cluster.md       | 17 +++++-----
 .../concepts/extend-kubernetes/operator.md    | 17 +++++-----
 .../extend-kubernetes/service-catalog.md      | 17 +++++-----
 .../zh/docs/concepts/overview/components.md   | 17 +++++-----
 .../docs/concepts/overview/kubernetes-api.md  | 10 +++---
 .../concepts/overview/what-is-kubernetes.md   | 17 +++++-----
 .../working-with-objects/annotations.md       | 17 +++++-----
 .../working-with-objects/common-labels.md     | 12 +++----
 .../kubernetes-objects.md                     | 17 +++++-----
 .../overview/working-with-objects/labels.md   | 12 +++----
 .../overview/working-with-objects/names.md    | 15 +++++----
 .../working-with-objects/namespaces.md        | 17 +++++-----
 .../working-with-objects/object-management.md | 15 +++++----
 .../zh/docs/concepts/policy/limit-range.md    | 15 +++++----
 .../docs/concepts/policy/resource-quotas.md   | 17 +++++-----
 .../scheduling-eviction/kube-scheduler.md     | 17 +++++-----
 .../scheduler-perf-tuning.md                  | 12 +++----
 .../scheduling-framework.md                   | 12 +++----
 ...ries-to-pod-etc-hosts-with-host-aliases.md | 10 +++---
 .../connect-applications-service.md           | 14 ++++----
 .../services-networking/dns-pod-service.md    | 15 +++++----
 .../services-networking/dual-stack.md         | 17 +++++-----
 .../services-networking/endpoint-slices.md    | 17 +++++-----
 .../ingress-controllers.md                    | 17 +++++-----
 .../concepts/services-networking/ingress.md   | 17 +++++-----
 .../services-networking/network-policies.md   | 17 +++++-----
 .../services-networking/service-topology.md   | 15 +++++----
 .../concepts/services-networking/service.md   | 17 +++++-----
 .../concepts/storage/dynamic-provisioning.md  | 12 +++----
 .../docs/concepts/storage/storage-classes.md  | 10 +++---
 .../docs/concepts/storage/storage-limits.md   | 12 +++----
 .../concepts/storage/volume-pvc-datasource.md | 12 +++----
 .../storage/volume-snapshot-classes.md        | 10 +++---
 .../docs/concepts/storage/volume-snapshots.md | 12 +++----
 content/zh/docs/concepts/storage/volumes.md   | 15 +++++----
 .../workloads/controllers/cron-jobs.md        | 13 ++++----
 .../workloads/controllers/daemonset.md        | 12 +++----
 .../workloads/controllers/deployment.md       | 10 +++---
 .../controllers/garbage-collection.md         | 17 +++++-----
 .../workloads/controllers/replicaset.md       | 10 +++---
 .../controllers/replicationcontroller.md      | 12 +++----
 .../workloads/controllers/statefulset.md      | 17 +++++-----
 .../workloads/controllers/ttlafterfinished.md | 17 +++++-----
 .../concepts/workloads/pods/disruptions.md    | 17 +++++-----
 .../workloads/pods/ephemeral-containers.md    | 12 +++----
 .../workloads/pods/init-containers.md         | 15 +++++----
 .../concepts/workloads/pods/pod-lifecycle.md  | 10 +++---
 .../concepts/workloads/pods/pod-overview.md   | 17 +++++-----
 .../pods/pod-topology-spread-constraints.md   | 12 +++----
 .../zh/docs/concepts/workloads/pods/pod.md    | 12 +++----
 .../docs/concepts/workloads/pods/podpreset.md | 17 +++++-----
 content/zh/docs/contribute/_index.md          | 12 +++----
 content/zh/docs/contribute/advanced.md        | 12 +++----
 .../generate-ref-docs/contribute-upstream.md  | 22 +++++++------
 .../contribute/generate-ref-docs/kubectl.md   | 21 ++++++------
 .../generate-ref-docs/kubernetes-api.md       | 21 ++++++------
 .../kubernetes-components.md                  | 21 ++++++------
 content/zh/docs/contribute/intermediate.md    | 17 +++++-----
 content/zh/docs/contribute/localization.md    | 17 +++++-----
 content/zh/docs/contribute/participating.md   | 15 +++++----
 content/zh/docs/contribute/start.md           | 17 +++++-----
 .../contribute/style/content-organization.md  | 17 +++++-----
 .../contribute/style/hugo-shortcodes/index.md | 17 +++++-----
 .../docs/contribute/style/page-templates.md   | 29 +++++++++--------
 .../docs/contribute/style/write-new-topic.md  | 22 +++++++------
 .../zh/docs/home/supported-doc-versions.md    | 10 +++---
 content/zh/docs/reference/_index.md           | 12 +++----
 .../docs/reference/access-authn-authz/abac.md | 12 +++----
 .../admission-controllers.md                  | 12 +++----
 .../access-authn-authz/authorization.md       | 14 ++++----
 .../extensible-admission-controllers.md       | 12 +++----
 .../docs/reference/access-authn-authz/node.md | 12 +++----
 .../docs/reference/access-authn-authz/rbac.md | 12 +++----
 .../reference/access-authn-authz/webhook.md   | 12 +++----
 .../feature-gates.md                          | 17 +++++-----
 .../kube-proxy.md                             | 10 +++---
 .../kube-scheduler.md                         | 10 +++---
 .../command-line-tools-reference/kubelet.md   | 10 +++---
 .../reference/issues-security/security.md     | 12 +++----
 .../zh/docs/reference/kubectl/cheatsheet.md   | 17 +++++-----
 .../zh/docs/reference/kubectl/conventions.md  | 12 +++----
 .../kubectl/docker-cli-to-kubectl.md          | 12 +++----
 content/zh/docs/reference/kubectl/jsonpath.md | 12 +++----
 content/zh/docs/reference/kubectl/kubectl.md  | 15 +++++----
 content/zh/docs/reference/kubectl/overview.md | 17 +++++-----
 .../labels-annotations-taints.md              | 10 +++---
 .../setup-tools/kubeadm/kubeadm-config.md     | 15 +++++----
 .../setup-tools/kubeadm/kubeadm-init.md       | 17 +++++-----
 .../setup-tools/kubeadm/kubeadm-join.md       | 15 +++++----
 .../setup-tools/kubeadm/kubeadm-reset.md      | 17 +++++-----
 .../setup-tools/kubeadm/kubeadm-token.md      | 17 +++++-----
 .../setup-tools/kubeadm/kubeadm-upgrade.md    | 17 +++++-----
 .../setup-tools/kubeadm/kubeadm-version.md    | 10 +++---
 content/zh/docs/reference/tools.md            | 12 +++----
 .../docs/reference/using-api/api-overview.md  | 12 +++----
 .../reference/using-api/client-libraries.md   | 12 +++----
 content/zh/docs/setup/_index.md               | 12 +++----
 .../docs/setup/best-practices/certificates.md | 12 +++----
 .../independent/create-cluster-kubeadm.md     | 15 +++++----
 .../setup/learning-environment/minikube.md    | 12 +++----
 .../container-runtimes.md                     | 12 +++----
 .../on-premises-vm/dcos.md                    | 12 +++----
 .../on-premises-vm/ovirt.md                   | 12 +++----
 .../production-environment/tools/kops.md      | 17 +++++-----
 .../tools/kubeadm/control-plane-flags.md      | 12 +++----
 .../tools/kubeadm/ha-topology.md              | 17 +++++-----
 .../tools/kubeadm/high-availability.md        | 17 +++++-----
 .../tools/kubeadm/install-kubeadm.md          | 20 ++++++------
 .../tools/kubeadm/kubelet-integration.md      | 12 +++----
 .../tools/kubeadm/self-hosting.md             | 12 +++----
 .../kubeadm/setup-ha-etcd-with-kubeadm.md     | 22 +++++++------
 .../tools/kubeadm/troubleshooting-kubeadm.md  | 12 +++----
 .../production-environment/turnkey/aws.md     | 17 +++++-----
 .../windows/user-guide-windows-containers.md  | 12 +++----
 .../docs/setup/release/version-skew-policy.md |  8 ++---
 content/zh/docs/tasks/_index.md               | 17 +++++-----
 .../access-cluster.md                         | 12 +++----
 ...icate-containers-same-pod-shared-volume.md | 24 +++++++-------
 .../configure-access-multiple-clusters.md     | 20 ++++++------
 .../configure-cloud-provider-firewall.md      | 15 +++++----
 .../configure-dns-cluster.md                  | 12 +++----
 .../connecting-frontend-backend.md            | 25 ++++++++-------
 .../create-external-load-balancer.md          | 17 +++++-----
 .../list-all-running-container-images.md      | 26 ++++++++-------
 ...port-forward-access-application-cluster.md | 26 ++++++++-------
 .../service-access-application-cluster.md     | 32 +++++++++++--------
 .../web-ui-dashboard.md                       | 17 +++++-----
 .../configure-aggregation-layer.md            | 22 +++++++------
 .../custom-resource-definition-versioning.md  | 17 +++++-----
 .../http-proxy-access-api.md                  | 22 +++++++------
 .../setup-extension-api-server.md             | 27 +++++++++-------
 .../administer-cluster/access-cluster-api.md  | 17 +++++-----
 .../access-cluster-services.md                | 15 +++++----
 .../change-default-storage-class.md           | 20 ++++++------
 .../change-pv-reclaim-policy.md               | 20 ++++++------
 .../configure-multiple-schedulers.md          | 21 ++++++------
 .../configure-upgrade-etcd.md                 | 17 +++++-----
 .../docs/tasks/administer-cluster/coredns.md  | 22 +++++++------
 .../cpu-management-policies.md                | 17 +++++-----
 .../declare-network-policy.md                 | 15 +++++----
 .../developing-cloud-controller-manager.md    | 12 +++----
 .../dns-custom-nameservers.md                 | 21 ++++++------
 .../dns-debugging-resolution.md               | 28 ++++++++--------
 .../dns-horizontal-autoscaling.md             | 26 ++++++++-------
 .../enabling-endpointslices.md                | 15 +++++----
 .../tasks/administer-cluster/encrypt-data.md  | 22 +++++++------
 .../extended-resource-node.md                 | 22 +++++++------
 ...aranteed-scheduling-critical-addon-pods.md | 10 +++---
 .../highly-available-master.md                | 21 ++++++------
 .../tasks/administer-cluster/ip-masq-agent.md | 21 ++++++------
 .../tasks/administer-cluster/kms-provider.md  | 17 +++++-----
 .../kubeadm/kubeadm-certs.md                  | 16 +++++-----
 .../kubeadm/kubeadm-upgrade.md                | 17 +++++-----
 .../administer-cluster/kubelet-config-file.md | 21 ++++++------
 .../limit-storage-consumption.md              | 21 ++++++------
 .../cpu-constraint-namespace.md               | 22 +++++++------
 .../manage-resources/cpu-default-namespace.md | 22 +++++++------
 .../memory-constraint-namespace.md            | 22 +++++++------
 .../memory-default-namespace.md               | 22 +++++++------
 .../quota-memory-cpu-namespace.md             | 22 +++++++------
 .../manage-resources/quota-pod-namespace.md   | 20 ++++++------
 .../namespaces-walkthrough.md                 | 17 +++++-----
 .../tasks/administer-cluster/namespaces.md    | 26 ++++++++-------
 .../calico-network-policy.md                  | 20 ++++++------
 .../cilium-network-policy.md                  | 24 +++++++-------
 .../kube-router-network-policy.md             | 20 ++++++------
 .../romana-network-policy.md                  | 20 ++++++------
 .../weave-network-policy.md                   | 20 ++++++------
 .../tasks/administer-cluster/nodelocaldns.md  | 17 +++++-----
 .../administer-cluster/out-of-resource.md     | 12 +++----
 .../administer-cluster/quota-api-object.md    | 22 +++++++------
 .../administer-cluster/reconfigure-kubelet.md | 21 ++++++------
 .../reserve-compute-resources.md              | 21 ++++++------
 .../running-cloud-controller.md               | 11 +++----
 .../administer-cluster/securing-a-cluster.md  | 17 +++++-----
 .../administer-cluster/sysctl-cluster.md      | 21 ++++++------
 .../administer-cluster/topology-manager.md    | 17 +++++-----
 .../assign-cpu-resource.md                    | 22 +++++++------
 .../assign-memory-resource.md                 | 22 +++++++------
 .../assign-pods-nodes.md                      | 22 +++++++------
 .../attach-handler-lifecycle-event.md         | 26 ++++++++-------
 ...igure-liveness-readiness-startup-probes.md | 20 ++++++------
 .../configure-persistent-volume-storage.md    | 26 ++++++++-------
 .../configure-pod-configmap.md                | 26 ++++++++-------
 .../configure-pod-initialization.md           | 22 +++++++------
 .../configure-projected-volume-storage.md     | 22 +++++++------
 .../configure-runasusername.md                | 18 ++++++-----
 .../configure-service-account.md              | 17 +++++-----
 .../configure-volume-storage.md               | 22 +++++++------
 .../extended-resource.md                      | 22 +++++++------
 .../pull-image-private-registry.md            | 22 +++++++------
 .../quality-service-pod.md                    | 22 +++++++------
 .../share-process-namespace.md                | 21 ++++++------
 .../configure-pod-container/static-pod.md     | 15 +++++----
 .../translate-compose-kubernetes.md           | 21 ++++++------
 .../tasks/debug-application-cluster/audit.md  | 10 +++---
 .../tasks/debug-application-cluster/crictl.md | 21 ++++++------
 .../debug-application-introspection.md        | 15 +++++----
 .../debug-init-containers.md                  | 21 ++++++------
 .../debug-pod-replication-controller.md       | 17 +++++-----
 .../debug-service.md                          | 17 +++++-----
 .../debug-stateful-set.md                     | 20 ++++++------
 .../determine-reason-pod-failure.md           | 22 +++++++------
 .../events-stackdriver.md                     | 12 +++----
 .../tasks/debug-application-cluster/falco.md  | 12 +++----
 .../get-shell-running-container.md            | 26 ++++++++-------
 .../local-debugging.md                        | 22 +++++++------
 .../logging-elasticsearch-kibana.md           | 17 +++++-----
 .../monitor-node-health.md                    | 21 ++++++------
 .../resource-metrics-pipeline.md              | 12 +++----
 .../resource-usage-monitoring.md              | 12 +++----
 .../troubleshooting.md                        | 12 +++----
 .../zh/docs/tasks/example-task-template.md    | 26 ++++++++-------
 .../tasks/extend-kubectl/kubectl-plugins.md   | 20 ++++++------
 .../administer-federation/configmap.md        | 17 +++++-----
 .../administer-federation/daemonset.md        | 17 +++++-----
 .../administer-federation/deployment.md       | 17 +++++-----
 .../administer-federation/events.md           | 12 +++----
 .../federation/administer-federation/job.md   | 17 +++++-----
 .../administer-federation/namespaces.md       | 17 +++++-----
 .../administer-federation/replicaset.md       | 17 +++++-----
 .../administer-federation/secret.md           | 12 +++----
 .../federation-service-discovery.md           | 21 ++++++------
 .../set-up-coredns-provider-federation.md     | 22 +++++++------
 .../set-up-placement-policies-federation.md   | 17 +++++-----
 .../define-command-argument-container.md      | 22 +++++++------
 .../define-environment-variable-container.md  | 22 +++++++------
 .../distribute-credentials-secure.md          | 20 ++++++------
 ...nward-api-volume-expose-pod-information.md | 24 +++++++-------
 ...ronment-variable-expose-pod-information.md | 20 ++++++------
 .../job/automated-tasks-with-cron-jobs.md     | 17 +++++-----
 .../coarse-parallel-processing-work-queue.md  | 21 ++++++------
 .../fine-parallel-processing-work-queue.md    | 25 ++++++++-------
 .../job/parallel-processing-expansion.md      | 12 +++----
 .../manage-daemon/rollback-daemon-set.md      | 19 +++++------
 .../tasks/manage-daemon/update-daemon-set.md  | 22 +++++++------
 .../docs/tasks/manage-gpus/scheduling-gpus.md | 10 +++---
 .../manage-hugepages/scheduling-hugepages.md  | 17 +++++-----
 .../imperative-config.md                      | 22 +++++++------
 .../docs/tasks/network/validate-dual-stack.md | 17 +++++-----
 .../tasks/run-application/configure-pdb.md    | 21 ++++++------
 .../run-application/delete-stateful-set.md    | 20 ++++++------
 .../force-delete-stateful-set-pod.md          | 22 +++++++------
 .../horizontal-pod-autoscale-walkthrough.md   | 19 +++++------
 .../horizontal-pod-autoscale.md               | 15 +++++----
 .../rolling-update-replication-controller.md  |  4 +--
 .../run-replicated-stateful-application.md    | 32 +++++++++++--------
 ...un-single-instance-stateful-application.md | 25 ++++++++-------
 .../run-stateless-application-deployment.md   | 25 ++++++++-------
 .../run-application/scale-stateful-set.md     | 20 ++++++------
 .../update-api-object-kubectl-patch.md        | 22 +++++++------
 .../install-service-catalog-using-helm.md     | 22 +++++++------
 .../install-service-catalog-using-sc.md       | 22 +++++++------
 .../zh/docs/tasks/tls/certificate-rotation.md | 15 +++++----
 .../tasks/tls/managing-tls-in-a-cluster.md    | 17 +++++-----
 .../zh/docs/tasks/tools/install-kubectl.md    | 22 +++++++------
 .../zh/docs/tasks/tools/install-minikube.md   | 22 +++++++------
 content/zh/docs/tutorials/_index.md           | 17 +++++-----
 .../zh/docs/tutorials/clusters/apparmor.md    | 27 +++++++++-------
 .../configure-redis-using-configmap.md        | 25 ++++++++-------
 content/zh/docs/tutorials/hello-minikube.md   | 27 +++++++++-------
 .../tutorials/online-training/overview.md     | 12 +++----
 .../zh/docs/tutorials/services/source-ip.md   | 30 +++++++++--------
 .../basic-stateful-set.md                     | 25 ++++++++-------
 .../mysql-wordpress-persistent-volume.md      | 30 +++++++++--------
 .../stateful-application/zookeeper.md         | 25 ++++++++-------
 .../expose-external-ip-address.md             | 32 +++++++++++--------
 .../stateless-application/guestbook.md        | 32 +++++++++++--------
 303 files changed, 2764 insertions(+), 2439 deletions(-)

diff --git a/content/zh/docs/concepts/_index.md b/content/zh/docs/concepts/_index.md
index 8e5c1413bf..90e2d6b4f1 100644
--- a/content/zh/docs/concepts/_index.md
+++ b/content/zh/docs/concepts/_index.md
@@ -1,18 +1,18 @@
 ---
 title: 概念
 main_menu: true
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
 <!-- ---
 title: Concepts
 main_menu: true
-content_template: templates/concept
+content_type: concept
 weight: 40
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The Concepts section helps you learn about the parts of the Kubernetes system and the abstractions Kubernetes uses to represent your {{< glossary_tooltip text="cluster" term_id="cluster" length="all" >}}, and helps you obtain a deeper understanding of how Kubernetes works.
@@ -20,9 +20,9 @@ The Concepts section helps you learn about the parts of the Kubernetes system an
 
 概念部分可以帮助你了解 Kubernetes 的各个组成部分以及 Kubernetes 用来表示集群的一些抽象概念，并帮助你更加深入的理解 Kubernetes 是如何工作的。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview
@@ -138,9 +138,10 @@ The nodes in a cluster are the machines (VMs, physical servers, etc) that run yo
 集群中的 node 节点（虚拟机、物理机等等）都是用来运行你的应用和云工作流的机器。Kubernetes master 节点控制所有 node 节点；你很少需要和 node 节点进行直接通信。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 If you would like to write a concept page, see
@@ -150,4 +151,4 @@ for information about the concept page type and the concept template.
 
 如果你想编写一个概念页面，请参阅[使用页面模板](/docs/home/contribute/page-templates/)获取更多有关概念页面类型和概念模板的信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/architecture/cloud-controller.md b/content/zh/docs/concepts/architecture/cloud-controller.md
index d6e47fe681..8e1ab7c05f 100644
--- a/content/zh/docs/concepts/architecture/cloud-controller.md
+++ b/content/zh/docs/concepts/architecture/cloud-controller.md
@@ -1,19 +1,19 @@
 ---
 title: 云控制器管理器的基础概念
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 <!--
 ---
 title: Concepts Underlying the Cloud Controller Manager
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The cloud controller manager (CCM) concept (not to be confused with the binary) was originally created to allow cloud specific vendor code and the Kubernetes core to evolve independent of one another. The cloud controller manager runs alongside other master components such as the Kubernetes controller manager, the API server, and scheduler. It can also be started as a Kubernetes addon, in which case it runs on top of Kubernetes.
@@ -45,10 +45,10 @@ Here's the architecture of a Kubernetes cluster without the cloud controller man
 
 ![没有云控制器管理器的 Kubernetes 架构](/images/docs/pre-ccm-arch.png)
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Design
@@ -496,5 +496,5 @@ Complete instructions for configuring and running the CCM are provided
 
 [这里](/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)提供了有关配置和运行 CCM 的完整说明。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/architecture/controller.md b/content/zh/docs/concepts/architecture/controller.md
index ecbd1f3726..2d2b4e4317 100644
--- a/content/zh/docs/concepts/architecture/controller.md
+++ b/content/zh/docs/concepts/architecture/controller.md
@@ -1,10 +1,10 @@
 ---
 title: 控制器
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 In robotics and automation, a _control loop_ is
 a non-terminating loop that regulates the state of a system.
@@ -25,10 +25,10 @@ closer to the desired state, by turning equipment on or off.
 
 {{< glossary_definition term_id="controller" length="short">}}
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Controller pattern
 
@@ -244,11 +244,12 @@ Deployment 控制器和 Job 控制器是 Kubernetes 内置控制器的典型例
 
 你会发现控制平面外面运行的控制器，扩展了 Kubernetes 的能力。或者，如果你愿意，你也可以写一个新控制器。你可以以一组 Pod 来运行你的控制器，或者运行在 Kubernetes 外面。什么是最合适的控制器，这将取决于特定控制器的功能。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 * 请阅读 [Kubernetes 控制平面](/docs/concepts/#kubernetes-control-plane)
 * 了解一些基本的 [Kubernetes 对象](/docs/concepts/#kubernetes-objects)
 * 学习更多的 [Kubernetes API](/docs/concepts/overview/kubernetes-api/)
 * 如果你想写自己的控制器，请看 Kubernetes 的[扩展模式](/docs/concepts/extend-kubernetes/extend-cluster/#extension-patterns)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/architecture/nodes.md b/content/zh/docs/concepts/architecture/nodes.md
index d62eaf8185..4ad6f81c64 100644
--- a/content/zh/docs/concepts/architecture/nodes.md
+++ b/content/zh/docs/concepts/architecture/nodes.md
@@ -1,6 +1,6 @@
 ---
 title: 节点
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -9,12 +9,12 @@ reviewers:
 - caesarxuchao
 - dchen1107
 title: Nodes
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 A node is a worker machine in Kubernetes, previously known as a `minion`. A node
@@ -27,10 +27,10 @@ architecture design doc for more details.
 在 Kubernetes 中，节点（Node）是执行工作的机器，以前叫做 `minion`。根据你的集群环境，节点可以是一个虚拟机或者物理机器。每个节点都包含用于运行 [pods](/docs/concepts/workloads/pods/pod/) 的必要服务，并由主控组件管理。节点上的服务包括 [容器运行时](/docs/concepts/overview/components/#node-components)、kubelet 和 kube-proxy。查阅架构设计文档中 [Kubernetes 节点](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md#the-kubernetes-node) 一节获取更多细节。
 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Node Status
@@ -527,12 +527,13 @@ API object can be found at:
 -->
 节点是 Kubernetes REST API 的顶级资源。更多关于 API 对象的细节可以在这里找到：[节点 API 对象](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#node-v1-core)。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Read about [node components](https://kubernetes.io/docs/concepts/overview/components/#node-components)
 * Read about node-level topology: [Control Topology Management Policies on a node](/docs/tasks/administer-cluster/topology-manager/)
 -->
 * 了解有关[节点组件](https://kubernetes.io/docs/concepts/overview/components/#node-components)的信息。
 * 阅读有关节点级拓扑的信息：[控制节点上的拓扑管理策略](/docs/tasks/administer-cluster/topology-manager/)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/addons.md b/content/zh/docs/concepts/cluster-administration/addons.md
index 9aa9b8a348..10eb8adb08 100644
--- a/content/zh/docs/concepts/cluster-administration/addons.md
+++ b/content/zh/docs/concepts/cluster-administration/addons.md
@@ -1,10 +1,10 @@
 ---
 
 title: 安装扩展（Addons）
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 
 <!--
@@ -21,10 +21,10 @@ Add-ons 扩展了 Kubernetes 的功能。
 
 每个 add-ons 按字母顺序排序 - 顺序不代表任何优先地位。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Networking and Network Policy
@@ -110,4 +110,4 @@ Well-maintained ones should be linked to here. PRs welcome!
 
 维护完善的 add-ons 应该被链接到这里。欢迎提出 PRs！
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/certificates.md b/content/zh/docs/concepts/cluster-administration/certificates.md
index 9193f4b07f..9c7e0a9174 100644
--- a/content/zh/docs/concepts/cluster-administration/certificates.md
+++ b/content/zh/docs/concepts/cluster-administration/certificates.md
@@ -2,12 +2,12 @@
 cn-approvers:
 - lichuqiang
 title: 证书
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 When using client certificate authentication, you can generate certificates
@@ -17,10 +17,10 @@ manually through `easyrsa`, `openssl` or `cfssl`.
 当使用客户端证书进行认证时，用户可以使用现有部署脚本，或者通过 `easyrsa`、`openssl` 或
 `cfssl` 手动生成证书。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 ### easyrsa
 
@@ -473,4 +473,4 @@ x509 certificates to use for authentication as documented
 您可以按照[这里](/docs/tasks/tls/managing-tls-in-a-cluster)记录的方式，
 使用 `certificates.k8s.io` API 来准备 x509 证书，用于认证。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/cloud-providers.md b/content/zh/docs/concepts/cluster-administration/cloud-providers.md
index 4b6f6a36e1..f568c57304 100644
--- a/content/zh/docs/concepts/cluster-administration/cloud-providers.md
+++ b/content/zh/docs/concepts/cluster-administration/cloud-providers.md
@@ -1,26 +1,26 @@
 ---
 title: 云驱动
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 <!--
 ---
 title: Cloud Providers
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page explains how to manage Kubernetes running on a specific
 cloud provider.
 -->
 本文介绍了如何管理运行在特定云驱动上的 Kubernetes 集群。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ### kubeadm
 [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) is a popular option for creating kubernetes clusters.
@@ -592,7 +592,7 @@ Kubernetes network plugin and should appear in the `[Route]` section of the
 
 [kubenet]: /docs/concepts/cluster-administration/network-plugins/#kubenet
 
-{{% /capture %}}
+
 
 ## OVirt
 
diff --git a/content/zh/docs/concepts/cluster-administration/cluster-administration-overview.md b/content/zh/docs/concepts/cluster-administration/cluster-administration-overview.md
index f8d6d2e568..76462847fd 100644
--- a/content/zh/docs/concepts/cluster-administration/cluster-administration-overview.md
+++ b/content/zh/docs/concepts/cluster-administration/cluster-administration-overview.md
@@ -1,10 +1,10 @@
 ---
 title: 集群管理概述
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The cluster administration overview is for anyone creating or administering a Kubernetes cluster.
@@ -13,9 +13,9 @@ It assumes some familiarity with core Kubernetes [concepts](/docs/concepts/).
 
 集群管理概述面向任何创建和管理 Kubernetes 集群的读者人群。
 我们假设你对[用户指南](/docs/user-guide/)中的概念大概了解。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Planning a cluster
@@ -142,4 +142,4 @@ Note: Not all distros are actively maintained. Choose distros which have been te
 
 * [记录和监控集群活动](/docs/concepts/cluster-administration/logging/)阐述了 Kubernetes 的日志如何工作以及怎样实现。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/controller-metrics.md b/content/zh/docs/concepts/cluster-administration/controller-metrics.md
index 85a46101ff..c865ce7e5b 100644
--- a/content/zh/docs/concepts/cluster-administration/controller-metrics.md
+++ b/content/zh/docs/concepts/cluster-administration/controller-metrics.md
@@ -1,18 +1,18 @@
 ---
 title: 控制器管理器指标
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 
 <!--
 ---
 title: Controller manager metrics
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Controller manager metrics provide important insight into the performance and health of
@@ -21,9 +21,9 @@ the controller manager.
 
 控制器管理器指标为控制器管理器的性能和健康提供了重要的观测手段。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## What are controller manager metrics
@@ -79,4 +79,4 @@ to periodically gather these metrics and make them available in some kind of tim
 
 在生产环境中，您可能想配置 prometheus 或其他一些指标收集工具，以定期收集这些指标数据，并将它们应用到某种时间序列数据库中。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/federation.md b/content/zh/docs/concepts/cluster-administration/federation.md
index 649e7b261c..e0f86e8823 100644
--- a/content/zh/docs/concepts/cluster-administration/federation.md
+++ b/content/zh/docs/concepts/cluster-administration/federation.md
@@ -1,13 +1,13 @@
 ---
 title: 联邦
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本页面阐明了为何以及如何使用联邦创建Kubernetes集群。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## 为何使用联邦
 
 联邦可以使多个集群的管理简单化。它提供了两个主要构件模块：
@@ -105,13 +105,14 @@ Kubernetes集群数量选择也许是一个相对静止的选择，因为对其
 
 最后，如果你的集群需求超过一个Kubernetes集群推荐的最大节点数，那么你可能需要更多的集群。Kubernetes1.3版本支持多达1000个节点的集群规模。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 * 进一步学习[联邦提案](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/multicluster/federation.md)。
 * 集群联邦参考该[配置指导](/docs/tutorials/federation/set-up-cluster-federation-kubefed/)。
 * 查看[Kubecon2016浅谈联邦](https://www.youtube.com/watch?v=pq9lbkmxpS8)
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/concepts/cluster-administration/kubelet-garbage-collection.md b/content/zh/docs/concepts/cluster-administration/kubelet-garbage-collection.md
index ca25be40df..d9ffdaeb01 100644
--- a/content/zh/docs/concepts/cluster-administration/kubelet-garbage-collection.md
+++ b/content/zh/docs/concepts/cluster-administration/kubelet-garbage-collection.md
@@ -1,18 +1,18 @@
 ---
 title: 配置 kubelet 垃圾回收策略
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 
 <!--
 ---
 title: Configuring kubelet Garbage Collection
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 垃圾回收是 kubelet 的一个有用功能，它将清理未使用的镜像和容器。
 
@@ -32,10 +32,10 @@ Kubelet will perform garbage collection for containers every minute and garbage
 External garbage collection tools are not recommended as these tools can potentially break the behavior of kubelet by removing containers expected to exist.
 -->
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 镜像回收
 
@@ -202,9 +202,10 @@ Including:
 | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |
 -->
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 查阅 [配置驱逐回收资源的策略](/docs/tasks/administer-cluster/out-of-resource/) 获取更多细节。
 
@@ -212,4 +213,4 @@ Including:
 See [Configuring Out Of Resource Handling](/docs/tasks/administer-cluster/out-of-resource/) for more details.
 -->
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/logging.md b/content/zh/docs/concepts/cluster-administration/logging.md
index da727e4113..349f408109 100755
--- a/content/zh/docs/concepts/cluster-administration/logging.md
+++ b/content/zh/docs/concepts/cluster-administration/logging.md
@@ -3,11 +3,11 @@ reviewers:
 - piosz
 - x13n
 title: 日志架构
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Application and systems logs can help you understand what is happening inside your cluster. The logs are particularly useful for debugging problems and monitoring cluster activity. Most modern applications have some kind of logging mechanism; as such, most container engines are likewise designed to support some kind of logging. The easiest and most embraced logging method for containerized applications is to write to the standard output and standard error streams.
@@ -19,9 +19,9 @@ However, the native functionality provided by a container engine or runtime is u
 -->
 但是，由容器引擎或 runtime 提供的原生功能通常不足以满足完整的日志记录方案。例如，如果发生容器崩溃、pod 被逐出或节点宕机等情况，您仍然想访问到应用日志。因此，日志应该具有独立的存储和生命周期，与节点、pod 或容器的生命周期相独立。这个概念叫 _集群级的日志_ 。集群级日志方案需要一个独立的后台来存储、分析和查询日志。Kubernetes 没有为日志数据提供原生存储方案，但是您可以集成许多现有的日志解决方案到 Kubernetes 集群中。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 Cluster-level logging architectures are described in assumption that
@@ -478,4 +478,4 @@ is outside the scope of Kubernetes.
 -->
 通过暴露或推送每个应用的日志，您可以实现集群级日志记录；然而，这种日志记录机制的实现已超出 Kubernetes 的范围。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/manage-deployment.md b/content/zh/docs/concepts/cluster-administration/manage-deployment.md
index a7d90c8bd7..f67f7f9487 100644
--- a/content/zh/docs/concepts/cluster-administration/manage-deployment.md
+++ b/content/zh/docs/concepts/cluster-administration/manage-deployment.md
@@ -1,20 +1,20 @@
 ---
 title: 管理资源
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 You've deployed your application and exposed it via a service. Now what? Kubernetes provides a number of tools to help you manage your application deployment, including scaling and updating. Among the features that we will discuss in more depth are [configuration files](/docs/concepts/configuration/overview/) and [labels](/docs/concepts/overview/working-with-objects/labels/).
  -->
 您已经部署了应用并通过服务暴露它。然后呢？Kubernetes 提供了一些工具来帮助管理您的应用部署，包括缩扩容和更新。我们将更深入讨论的特性包括[配置文件](/docs/concepts/configuration/overview/)和[标签](/docs/concepts/overview/working-with-objects/labels/)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Organizing resource configurations
@@ -651,9 +651,10 @@ That's it! The Deployment will declaratively update the deployed nginx applicati
  -->
 没错，就是这样！Deployment 将在后台逐步更新已经部署的 nginx 应用。它确保在更新过程中，只有一定数量的旧副本被开闭，并且只有一定基于所需 pod 数量的新副本被创建。想要了解更多细节，请参考 [Deployment](/docs/concepts/workloads/controllers/deployment/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - [Learn about how to use `kubectl` for application introspection and debugging.](/docs/tasks/debug-application-cluster/debug-application-introspection/)
@@ -662,4 +663,4 @@ That's it! The Deployment will declaratively update the deployed nginx applicati
 - [学习怎么样使用 `kubectl` 观察和调试应用](/docs/tasks/debug-application-cluster/debug-application-introspection/)
 - [配置最佳实践和技巧](/docs/concepts/configuration/overview/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/monitoring.md b/content/zh/docs/concepts/cluster-administration/monitoring.md
index 2eeb0b0c99..5025857051 100644
--- a/content/zh/docs/concepts/cluster-administration/monitoring.md
+++ b/content/zh/docs/concepts/cluster-administration/monitoring.md
@@ -1,10 +1,10 @@
 ---
 title: Kubernetes 控制面的指标
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 System component metrics can give a better look into what is happening inside them. Metrics are particularly useful for building dashboards and alerts.
@@ -16,9 +16,9 @@ Metrics in Kubernetes control plane are emitted in [prometheus format](https://p
 
 Kubernetes 控制面板中的指标是以 [prometheus](https://prometheus.io/docs/instrumenting/exposition_formats/) 格式发出的，而且是易于阅读的。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Metrics in Kubernetes
@@ -205,9 +205,10 @@ cloudprovider_gce_api_request_duration_seconds { request = "detach_disk"}
 cloudprovider_gce_api_request_duration_seconds { request = "list_disk"}
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read about the [Prometheus text format](https://github.com/prometheus/docs/blob/master/content/docs/instrumenting/exposition_formats.md#text-based-format) for metrics
@@ -219,4 +220,4 @@ cloudprovider_gce_api_request_duration_seconds { request = "list_disk"}
 * 查看 [Kubernetes 稳定版指标](https://github.com/kubernetes/kubernetes/blob/master/test/instrumentation/testdata/stable-metrics-list.yaml)列表
 * 了解有关 [Kubernetes 指标弃用策略](https://kubernetes.io/docs/reference/using-api/deprecation-policy/#deprecating-a-feature-or-behavior )
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/networking.md b/content/zh/docs/concepts/cluster-administration/networking.md
index a5865efc2f..0b4a329207 100644
--- a/content/zh/docs/concepts/cluster-administration/networking.md
+++ b/content/zh/docs/concepts/cluster-administration/networking.md
@@ -2,11 +2,11 @@
 reviewers:
 - thockin
 title: 集群网络系统
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Networking is a central part of Kubernetes, but it can be challenging to
 understand exactly how it is expected to work.  There are 4 distinct networking
@@ -25,10 +25,10 @@ problems to address:
 3. Pod 和 Service 间通信：这个已经在 [services](/docs/concepts/services-networking/service/) 里讲述过了。
 4. 外部和 Service 间通信：这个也已经在 [services](/docs/concepts/services-networking/service/) 讲述过了。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 Kubernetes is all about sharing machines between applications.  Typically,
@@ -555,9 +555,10 @@ to run, and in both cases, the network provides one IP address per pod - as is s
 
 [Weave Net](https://www.weave.works/products/weave-net/) 是 Kubernetes 及其托管应用程序的弹性和易于使用的网络系统。Weave Net 可以作为 [CNI plug-in](https://www.weave.works/docs/net/latest/cni-plugin/) 运行或者独立运行。在这两种运行方式里，都不需要任何配置或额外的代码即可运行，并且在两种情况下，网络都为每个 Pod 提供一个 IP 地址-这是 Kubernetes 的标准配置。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 The early design of the networking model and its rationale, and some future
@@ -567,4 +568,4 @@ document](https://git.k8s.io/community/contributors/design-proposals/network/net
 网络模型的早期设计、运行原理以及未来的一些计划，都在 [networking design
 document](https://git.k8s.io/community/contributors/design-proposals/network/networking.md) 文档里进行了更详细的描述。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/cluster-administration/proxies.md b/content/zh/docs/concepts/cluster-administration/proxies.md
index bfd327690b..5b1941d4ae 100644
--- a/content/zh/docs/concepts/cluster-administration/proxies.md
+++ b/content/zh/docs/concepts/cluster-administration/proxies.md
@@ -1,13 +1,13 @@
 ---
 title: Kubernetes 中的代理
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本文讲述了 Kubernetes 中所使用的代理。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 代理
 
@@ -59,4 +59,4 @@ Kubernetes 用户通常只需要关心前两种类型的代理，集群管理员
 
 代理已经取代重定向功能，重定向已被弃用。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/assign-pod-node.md b/content/zh/docs/concepts/configuration/assign-pod-node.md
index fbe7a56764..92d26f57cf 100644
--- a/content/zh/docs/concepts/configuration/assign-pod-node.md
+++ b/content/zh/docs/concepts/configuration/assign-pod-node.md
@@ -1,6 +1,6 @@
 ---
 title: 将 Pod 分配给节点
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
@@ -11,13 +11,13 @@ reviewers:
 - kevin-wangzefeng
 - bsalamat
 title: Assigning Pods to Nodes
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 You can constrain a {{< glossary_tooltip text="Pod" term_id="pod" >}} to only be able to run on particular
@@ -33,9 +33,9 @@ services that communicate a lot into the same availability zone.
 
 你可以约束一个 {{< glossary_tooltip text="Pod" term_id="pod" >}} 只能在特定的 {{< glossary_tooltip text="Node(s)" term_id="node" >}} 上运行，或者优先运行在特定的节点上。有几种方法可以实现这点，推荐的方法都是用[标签选择器](/docs/concepts/overview/working-with-objects/labels/)来进行选择。通常这样的约束不是必须的，因为调度器将自动进行合理的放置（比如，将 pod 分散到节点上，而不是将 pod 放置在可用资源不足的节点上等等），但在某些情况下，你可以需要更多控制 pod 停靠的节点，例如，确保 pod 最终落在连接了 SSD 的机器上，或者将来自两个不同的服务且有大量通信的 pod 放置在同一个可用区。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## nodeSelector
 
@@ -664,9 +664,10 @@ The above pod will run on the node kube-01.
 
 上面的 pod 将运行在 kube-01 节点上。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 [Taints](/docs/concepts/configuration/taint-and-toleration/) allow a Node to *repel* a set of Pods.
@@ -690,4 +691,4 @@ resource allocation decisions.
 
 一旦 pod 分配给 节点，kubelet 应用将运行该 pod 并且分配节点本地资源。[拓扑管理](/docs/tasks/administer-cluster/topology-manager/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/configmap.md b/content/zh/docs/concepts/configuration/configmap.md
index 0658b11ab6..9e746b06b7 100644
--- a/content/zh/docs/concepts/configuration/configmap.md
+++ b/content/zh/docs/concepts/configuration/configmap.md
@@ -1,10 +1,10 @@
 ---
 title: ConfigMap
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< glossary_definition term_id="configmap" prepend="ConfigMap 是" length="all" >}}
 
@@ -18,9 +18,9 @@ or use additional (third party) tools to keep your data private.
 ConfigMap 并不提供保密或者加密功能。如果你想存储的数据是机密的，请使用 {{< glossary_tooltip text="Secret" term_id="secret" >}} ，或者使用其他第三方工具来保证你的数据的私密性，而不是用 ConfigMap。
 {{< /caution >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Motivation
 
@@ -213,8 +213,9 @@ ConfigMap 最常见的用法是为同一命名空间里某 Pod 中运行的容
 {{< /note >}}
 
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read about [Secrets](/docs/concepts/configuration/secret/).
@@ -226,4 +227,4 @@ ConfigMap 最常见的用法是为同一命名空间里某 Pod 中运行的容
 * 阅读 [配置 Pod 来使用 ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/)。
 * 阅读 [Twelve-Factor 应用](https://12factor.net/) 来了解将代码和配置分开的动机。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/manage-compute-resources-container.md b/content/zh/docs/concepts/configuration/manage-compute-resources-container.md
index 8bf3244ed9..4b0e364050 100644
--- a/content/zh/docs/concepts/configuration/manage-compute-resources-container.md
+++ b/content/zh/docs/concepts/configuration/manage-compute-resources-container.md
@@ -1,6 +1,6 @@
 ---
 title: 为容器管理计算资源
-content_template: templates/concept
+content_type: concept
 weight: 20
 feature:
   title: 自动装箱
@@ -11,7 +11,7 @@ feature:
 <!--
 ---
 title: Managing Compute Resources for Containers
-content_template: templates/concept
+content_type: concept
 weight: 20
 feature:
   title: Automatic binpacking
@@ -20,7 +20,7 @@ feature:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 When you specify a [Pod](/docs/concepts/workloads/pods/pod/), you can optionally specify how
@@ -33,10 +33,10 @@ the difference between requests and limits, see
 -->
 当您定义 [Pod](/docs/user-guide/pods) 的时候可以选择为每个容器指定需要的 CPU 和内存（RAM）大小。当为容器指定了资源请求后，调度器就能够更好的判断出将容器调度到哪个节点上。如果您还为容器指定了资源限制，Kubernetes 就可以按照指定的方式来处理节点上的资源竞争。关于资源请求和限制的不同点和更多资料请参考 [Resource QoS](https://git.k8s.io/community/contributors/design-proposals/resource-qos.md)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Resource types
@@ -945,10 +945,11 @@ spec:
         example.com/foo: 1
 ```
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Get hands-on experience [assigning Memory resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/).
@@ -968,4 +969,4 @@ spec:
 
 * [资源需求](/docs/resources-reference/{{< param "version" >}}/#resourcerequirements-v1-core)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/organize-cluster-access-kubeconfig.md b/content/zh/docs/concepts/configuration/organize-cluster-access-kubeconfig.md
index 2ec4a80c75..c44ad088a9 100644
--- a/content/zh/docs/concepts/configuration/organize-cluster-access-kubeconfig.md
+++ b/content/zh/docs/concepts/configuration/organize-cluster-access-kubeconfig.md
@@ -1,17 +1,17 @@
 ---
 title: 使用 kubeconfig 文件组织集群访问
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 <!--
 ---
 title: Organizing Cluster Access Using kubeconfig Files
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Use kubeconfig files to organize information about clusters, users, namespaces, and
@@ -46,10 +46,10 @@ For step-by-step instructions on creating and specifying kubeconfig files, see
 --->
 有关创建和指定 kubeconfig 文件的分步说明，请参阅[配置对多集群的访问](/docs/tasks/access-application-cluster/configure-access-multiple-clusters)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Supporting multiple clusters, users, and authentication mechanisms
@@ -264,10 +264,11 @@ are stored absolutely.
 --->
 kubeconfig 文件中的文件和路径引用是相对于 kubeconfig 文件的位置。命令行上的文件引用是相当对于当前工作目录的。在 `$HOME/.kube/config` 中，相对路径按相对路径存储，绝对路径按绝对路径存储。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Configure Access to Multiple Clusters](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
@@ -275,6 +276,6 @@ kubeconfig 文件中的文件和路径引用是相对于 kubeconfig 文件的位
 --->
 * [配置对多集群的访问](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
 * [`kubectl config`](/docs/reference/generated/kubectl/kubectl-commands#config)
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/concepts/configuration/overview.md b/content/zh/docs/concepts/configuration/overview.md
index 04a56b5425..da540c0a89 100644
--- a/content/zh/docs/concepts/configuration/overview.md
+++ b/content/zh/docs/concepts/configuration/overview.md
@@ -2,7 +2,7 @@
 reviewers:
 - mikedanese
 title: 配置最佳实践
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 10
 reviewers:
 - mikedanese
 title: Configuration Best Practices
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This document highlights and consolidates configuration best practices that are introduced throughout the user guide, Getting Started documentation, and examples.
 -->
@@ -26,9 +26,9 @@ This is a living document. If you think of something that is not on this list bu
 -->
 这是一份活文件。
 如果您认为某些内容不在此列表中但可能对其他人有用，请不要犹豫，提交问题或提交 PR。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## General Configuration Tips
 -->
@@ -264,4 +264,4 @@ The caching semantics of the underlying image provider make even `imagePullPolic
 - 使用`kubectl run`和`kubectl expose`来快速创建单容器部署和服务。
   有关示例，请参阅[使用服务访问集群中的应用程序](/docs/tasks/access-application-cluster/service-access-application-cluster/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/pod-overhead.md b/content/zh/docs/concepts/configuration/pod-overhead.md
index 85a3bc3f57..3c81b3607a 100644
--- a/content/zh/docs/concepts/configuration/pod-overhead.md
+++ b/content/zh/docs/concepts/configuration/pod-overhead.md
@@ -1,10 +1,10 @@
 ---
 title: Pod 开销
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.18" state="beta" >}}
 
@@ -18,10 +18,10 @@ on top of the container requests & limits.
 在节点上运行 Pod 时，Pod 本身占用大量系统资源。这些资源是运行 Pod 内容器所需资源的附加资源。
 _POD 开销_ 是一个特性，用于计算 Pod 基础设施在容器请求和限制之上消耗的资源。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Pod Overhead
@@ -298,11 +298,12 @@ from source in the meantime.
 在 [kube-state-metrics](https://github.com/kubernetes/kube-state-metrics) 中可以通过 `kube_pod_overhead` 指标来协助确定何时使用 PodOverhead 以及协助观察以一个既定开销运行的工作负载的稳定性。
 该特性在 kube-state-metrics 的 1.9 发行版本中不可用，不过预计将在后续版本中发布。在此之前，用户需要从源代码构建 kube-state-metrics. 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * [RuntimeClass](/docs/concepts/containers/runtime-class/)
 * [PodOverhead 设计](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190226-pod-overhead.md)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/configuration/resource-bin-packing.md b/content/zh/docs/concepts/configuration/resource-bin-packing.md
index 1a3bb9c2ce..b43257f47f 100644
--- a/content/zh/docs/concepts/configuration/resource-bin-packing.md
+++ b/content/zh/docs/concepts/configuration/resource-bin-packing.md
@@ -4,7 +4,7 @@ reviewers:
 - k82cn
 - ahg-g
 title: 扩展资源的资源箱打包
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -14,12 +14,12 @@ reviewers:
 - k82cn
 - ahg-g
 title: Resource Bin Packing for Extended Resources
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.16" state="alpha" >}}
 
@@ -29,9 +29,9 @@ The kube-scheduler can be configured to enable bin packing of resources along wi
 可以将 kube-scheduler 配置为使用 `RequestedToCapacityRatioResourceAllocation` 优先级函数启用资源箱打包以及扩展资源。
 优先级函数可用于根据自定义需求微调 kube-scheduler 。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Enabling Bin Packing using RequestedToCapacityRatioResourceAllocation
@@ -254,5 +254,5 @@ NodeScore   =  (5 * 5) + (7 * 1) + (10 * 3) / (5 + 1 + 3)
 
 ```
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/configuration/secret.md b/content/zh/docs/concepts/configuration/secret.md
index f1f0b18809..4556f72dcd 100644
--- a/content/zh/docs/concepts/configuration/secret.md
+++ b/content/zh/docs/concepts/configuration/secret.md
@@ -1,11 +1,11 @@
 ---
 title: Secret
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes `secret` objects let you store and manage sensitive information, such
@@ -18,9 +18,9 @@ is safer and more flexible than putting it verbatim in a
 将这些信息放在 `secret` 中比放在 {{< glossary_tooltip term_id="pod" >}} 的定义或者 {{< glossary_tooltip text="容器镜像" term_id="image" >}} 中来说更加安全和灵活。
 参阅 [Secret 设计文档](https://git.k8s.io/community/contributors/design-proposals/auth/secrets.md) 获取更多详细信息。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview of Secrets
@@ -1561,6 +1561,7 @@ for secret data, so that the secrets are not stored in the clear into {{< glossa
 - 可以创建和使用 secret 的 pod 的用户也可以看到该 secret 的值。即使 API server 策略不允许用户读取 secret 对象，用户也可以运行暴露 secret 的 pod。
 - 目前，任何节点的 root 用户都可以通过模拟 kubelet 来读取 API server 中的任何 secret。只有向实际需要它们的节点发送 secret 才能限制单个节点的根漏洞的影响，该功能还在计划中。
 
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
+
+
 
-{{% /capture %}}
diff --git a/content/zh/docs/concepts/configuration/taint-and-toleration.md b/content/zh/docs/concepts/configuration/taint-and-toleration.md
index dd65da90b8..5e72941c25 100755
--- a/content/zh/docs/concepts/configuration/taint-and-toleration.md
+++ b/content/zh/docs/concepts/configuration/taint-and-toleration.md
@@ -1,11 +1,11 @@
 ---
 title: Taint 和 Toleration
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Node affinity, described [here](/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature),
 is a property of *pods* that *attracts* them to a set of nodes (either as a
@@ -23,9 +23,9 @@ onto nodes with matching taints.
 -->
 Taint 和 toleration 相互配合，可以用来避免 pod 被分配到不合适的节点上。每个节点上都可以应用一个或多个 taint ，这表示对于那些不能容忍这些 taint 的 pod，是不会被该节点接受的。如果将 toleration 应用于 pod 上，则表示这些 pod 可以（但不要求）被调度到具有匹配 taint 的节点上。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 
diff --git a/content/zh/docs/concepts/containers/container-environment-variables.md b/content/zh/docs/concepts/containers/container-environment-variables.md
index 4cd656b9de..5f797a856c 100644
--- a/content/zh/docs/concepts/containers/container-environment-variables.md
+++ b/content/zh/docs/concepts/containers/container-environment-variables.md
@@ -3,18 +3,18 @@ approvers:
 - mikedanese
 - thockin
 title: 容器环境变量
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文介绍容器环境中对容器可用的资源。
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture body %}}
+<!-- body -->
 
 ## 容器环境
 
@@ -50,13 +50,14 @@ FOO_SERVICE_PORT=<服务所启用的端口>
 
 服务具有专用 IP 地址，如果启用了 [DNS 插件](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addons/dns/)，还可以在容器中通过 DNS 进行访问。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 查看[容器生命周期挂钩（hooks）](/docs/concepts/containers/container-lifecycle-hooks/)了解更多。
 * 获取[为容器生命周期事件附加处理程序](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/)的实践经验。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/concepts/containers/container-environment.md b/content/zh/docs/concepts/containers/container-environment.md
index 26d599f9fd..777f746f67 100644
--- a/content/zh/docs/concepts/containers/container-environment.md
+++ b/content/zh/docs/concepts/containers/container-environment.md
@@ -1,20 +1,20 @@
 ---
 title: 容器环境
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page describes the resources available to Containers in the Container environment. 
 -->
 本页描述了在容器环境里容器可用的资源。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Container environment
@@ -81,9 +81,10 @@ if [DNS addon](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addon
 -->
 Service 具有专用的 IP 地址。如果启用了 [DNS插件](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addons/dns/)，就可以在容器中通过 DNS 来访问。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Container lifecycle hooks](/docs/concepts/containers/container-lifecycle-hooks/).
@@ -93,4 +94,4 @@ Service 具有专用的 IP 地址。如果启用了 [DNS插件](http://releases.
 * 学习更多有关[容器生命周期钩子](/docs/concepts/containers/container-lifecycle-hooks/)的知识。
 * 动手获得经验[将处理程序附加到容器生命周期事件](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/containers/container-lifecycle-hooks.md b/content/zh/docs/concepts/containers/container-lifecycle-hooks.md
index 379d7535d7..14063a4003 100644
--- a/content/zh/docs/concepts/containers/container-lifecycle-hooks.md
+++ b/content/zh/docs/concepts/containers/container-lifecycle-hooks.md
@@ -3,7 +3,7 @@ reviewers:
 - mikedanese
 - thockin
 title: 容器生命周期钩子
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
@@ -12,12 +12,12 @@ reviewers:
 - mikedanese
 - thockin
 title: Container Lifecycle Hooks
-content_template: templates/concept
+content_type: concept
 weight: 30
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page describes how kubelet managed Containers can use the Container lifecycle hook framework
@@ -25,10 +25,10 @@ to run code triggered by events during their management lifecycle.
 -->
 这个页面描述了 kubelet 管理的容器如何使用容器生命周期钩子框架来运行在其管理生命周期中由事件触发的代码。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview
@@ -214,9 +214,10 @@ Events:
   1m         22s         2     {kubelet gke-test-cluster-default-pool-a07e5d30-siqd}    spec.containers{main}    Warning        FailedPostStartHook
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about the [Container environment](/docs/concepts/containers/container-environment-variables/).
@@ -227,4 +228,4 @@ Events:
 * 了解更多关于[容器环境](/docs/concepts/containers/container-environment-variables/)。
 * 获取实践经验[将处理程序附加到容器生命周期事件](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/containers/images.md b/content/zh/docs/concepts/containers/images.md
index d0cf178b3e..cde48800a3 100644
--- a/content/zh/docs/concepts/containers/images.md
+++ b/content/zh/docs/concepts/containers/images.md
@@ -1,6 +1,6 @@
 ---
 title: 镜像
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -9,12 +9,12 @@ reviewers:
 - erictune
 - thockin
 title: Images
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 You create your Docker image and push it to a registry before referring to it in a Kubernetes pod.
@@ -25,10 +25,10 @@ The `image` property of a container supports the same syntax as the `docker` com
 
 容器的 `image` 属性支持与 `docker` 命令相同的语法，包括私有仓库和标签。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Updating Images
@@ -663,7 +663,7 @@ common use cases and suggested solutions.
    - 为每个租户获取仓库凭证，放置在 secret 中，并发布到每个租户的命名空间下。
    - 租户将 secret 增加到每个命名空间下的 imagePullSecrets 中。
 
-{{% /capture %}}
+
 
 <!--
 If you need access to multiple registries, you can create one secret for each registry.
diff --git a/content/zh/docs/concepts/containers/overview.md b/content/zh/docs/concepts/containers/overview.md
index db597b4603..15c881bd51 100644
--- a/content/zh/docs/concepts/containers/overview.md
+++ b/content/zh/docs/concepts/containers/overview.md
@@ -1,10 +1,10 @@
 ---
 title: 容器概述
-content_template: templates/concept
+content_type: concept
 weight: 1
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Containers are a technnology for packaging the (compiled) code for an
@@ -20,10 +20,10 @@ This makes deployment easier in different cloud or OS environments.
 
 容器将应用程序和底层主机架构解耦，这使得在不同的云或OS环境中部署应用更加容易。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Container images
@@ -50,12 +50,13 @@ the change, then recreate the container to start from the updated image.
 
 {{< glossary_definition term_id="container-runtime" length="all" >}}
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Read about [container images](/docs/concepts/containers/images/)
 * Read about [Pods](/docs/concepts/workloads/pods/)
 -->
 * 阅读有关[容器镜像](/docs/concepts/containers/images/)
 * 阅读有关 [Pods](/docs/concepts/workloads/pods/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/containers/runtime-class.md b/content/zh/docs/concepts/containers/runtime-class.md
index 6229009612..693e156cc3 100644
--- a/content/zh/docs/concepts/containers/runtime-class.md
+++ b/content/zh/docs/concepts/containers/runtime-class.md
@@ -3,11 +3,11 @@ reviewers:
 - tallclair
 - dchen1107
 title: 容器运行时类(Runtime Class)
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.14" state="beta" >}}
 
@@ -22,10 +22,10 @@ configuration is used to run a Pod's containers.
 -->
 RuntimeClass 是一个用于选择容器运行时配置的特性，容器运行时配置用于运行 Pod 中的容器。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- 
 ## Motivation
@@ -307,8 +307,9 @@ are accounted for in Kubernetes.
 -->
 Pod 开销通过 RuntimeClass 的 `overhead` 字段定义。通过使用这些字段，你可以指定使用该 RuntimeClass 运行 Pod 时的开销并确保 Kubernetes 将这些开销计算在内。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - [RuntimeClass Design](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/runtime-class.md)
@@ -321,4 +322,4 @@ Pod 开销通过 RuntimeClass 的 `overhead` 字段定义。通过使用这些
 - 阅读关于 [Pod 开销](/docs/concepts/configuration/pod-overhead/) 的概念
 - [PodOverhead 特性设计](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190226-pod-overhead.md)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/example-concept-template.md b/content/zh/docs/concepts/example-concept-template.md
index eadfd09445..c88d280c9c 100644
--- a/content/zh/docs/concepts/example-concept-template.md
+++ b/content/zh/docs/concepts/example-concept-template.md
@@ -1,18 +1,18 @@
 ---
 title: 概念模板示例
-content_template: templates/concept
+content_type: concept
 toc_hide: true
 ---
 
 <!--
 ---
 title: Example Concept Template
-content_template: templates/concept
+content_type: concept
 toc_hide: true
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Be sure to also [create an entry in the table of contents](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) for your new document.
@@ -28,9 +28,9 @@ This page explains ...
 
 本页解释了 ...
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Understanding ...
@@ -52,9 +52,10 @@ To use ...
 -->
 使用 ...
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 <!--
@@ -70,6 +71,6 @@ To use ...
 * 了解有关[撰写新主题](/docs/home/contribute/write-new-topic/)的更多信息。
 * 有关如何使用此模板的信息，请参阅[使用页面模板 - 概念模板](/docs/home/contribute/page-templates/#concept_template)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md b/content/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md
index 6e8da52b45..acac52ab5f 100644
--- a/content/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md
+++ b/content/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md
@@ -1,6 +1,6 @@
 ---
 title: 通过聚合层扩展 Kubernetes API
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -10,21 +10,21 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The aggregation layer allows Kubernetes to be extended with additional APIs, beyond what is offered by the core Kubernetes APIs.
 -->
 聚合层允许 Kubernetes 通过额外的 API 进行扩展，而不局限于 Kubernetes 核心 API 提供的功能。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview
@@ -57,9 +57,10 @@ extension-apiserver 与 kube-apiserver 之间的连接应具有低延迟。
 特别是，发现请求需要在五秒钟或更短的时间内从 kube-apiserver 往返。
 如果您的部署无法实现此目的，则应考虑如何进行更改。目前，在 kube-apiserver 上设置 `EnableAggregatedDiscoveryTimeout=false` 功能开关将禁用超时限制。它将在将来的版本中被删除。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * To get the aggregator working in your environment, [configure the aggregation layer](/docs/tasks/access-kubernetes-api/configure-aggregation-layer/).
@@ -70,6 +71,6 @@ extension-apiserver 与 kube-apiserver 之间的连接应具有低延迟。
 * 然后[安装扩展的 api-server](/docs/tasks/access-kubernetes-api/setup-extension-api-server/) 来开始使用聚合层。
 * 也可以学习怎样 [使用自定义资源定义扩展 Kubernetes API](/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md b/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md
index 257406596c..ce02f811f2 100644
--- a/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md
+++ b/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md
@@ -1,11 +1,11 @@
 ---
 title: 设备插件
 description: 使用 Kubernetes 设备插件框架来实现适用于 GPU、NIC、FPGA、InfiniBand 以及类似的需要特定于供应商设置的资源的插件。
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.10" state="beta" >}}
 
 <!--
@@ -23,9 +23,9 @@ Kubernetes 提供了一个[设备插件框架](https://github.com/kubernetes/com
 
 供应商可以实现设备插件，由您手动部署或作为 {{< glossary_tooltip term_id="daemonset" >}} 来部署，而不必定制 Kubernetes 本身的代码。目标设备包括 GPU、高性能 NIC、FPGA、InfiniBand 适配器以及其他类似的、可能需要特定于供应商的初始化和设置的计算资源。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 注册设备插件
 
@@ -339,8 +339,9 @@ Here are some examples of device plugin implementations:
 * [SR-IOV Network device plugin](https://github.com/intel/sriov-network-device-plugin)
 * [Xilinx FPGA device plugins](https://github.com/Xilinx/FPGA_as_a_Service/tree/master/k8s-fpga-device-plugin/trunk)
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn about [scheduling GPU resources](/docs/tasks/manage-gpus/scheduling-gpus/) using device plugins
@@ -353,4 +354,4 @@ Here are some examples of device plugin implementations:
 * 阅读如何在 Kubernetes 中如何使用 [TLS 入口的硬件加速](https://kubernetes.io/blog/2019/04/24/hardware-accelerated-ssl/tls-termination-in-ingress-controllers-using-kubernetes-device-plugins-and-runtimeclass/) 
 * 学习 [Topology Manager] (/docs/tasks/adminster-cluster/topology-manager/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md b/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md
index 506539c3be..a6fe50363a 100644
--- a/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md
+++ b/content/zh/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md
@@ -1,16 +1,16 @@
 ---
 title: 网络插件
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
 title: Network Plugins
-content_template: templates/concept
+content_type: concept
 weight: 10
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="alpha" >}}
 <!--
@@ -29,9 +29,9 @@ Kubernetes中的网络插件有几种类型：
 * CNI 插件： 遵守 appc/CNI 规约，为互操作性设计。
 * Kubenet 插件：使用 `bridge` 和 `host-local` CNI 插件实现了基本的 `cbr0`。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Installation
@@ -266,8 +266,9 @@ This option is provided to the network-plugin; currently **only kubenet supports
 * `--network-plugin=kubenet` 用来表明我们要使用 `kubenet` 网络插件，CNI `bridge` 和 `host-local` 插件位于 `/opt/cni/bin` 或 `cni-bin-dir` 中。
 * `--network-plugin-mtu=9001` 指定了我们使用的 MTU，当前仅被 `kubenet` 网络插件使用。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
 
-{{% /capture %}}
+## {{% heading "whatsnext" %}}
+
+
+
diff --git a/content/zh/docs/concepts/extend-kubernetes/extend-cluster.md b/content/zh/docs/concepts/extend-kubernetes/extend-cluster.md
index ae231de49d..58e6154f6a 100644
--- a/content/zh/docs/concepts/extend-kubernetes/extend-cluster.md
+++ b/content/zh/docs/concepts/extend-kubernetes/extend-cluster.md
@@ -1,6 +1,6 @@
 ---
 title: 扩展 Kubernetes 集群
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -11,12 +11,12 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes is highly configurable and extensible. As a result,
@@ -34,10 +34,10 @@ Kubernetes 是高度可配置和可扩展的。因此，极少需要分发或提
 
 本文档介绍自定义 Kubernetes 集群的选项。本文档的目标读者 {{< glossary_tooltip text="cluster operators" term_id="cluster-operator" >}} 是希望了解如何使 Kubernetes 集群满足其业务环境需求的集群运维人员。Kubernetes 项目的贡献者 {{< glossary_tooltip text="Contributors" term_id="contributor" >}} 或潜在的平台开发人员 {{< glossary_tooltip text="Platform Developers" term_id="platform-developer" >}} 也可以从本文找到有用的信息，如对已存在扩展点和模式的介绍，以及它们的权衡和限制。 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview
@@ -343,10 +343,11 @@ the nodes chosen for a pod.
 
 调度器也支持 [webhook](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/scheduler_extender.md)，它允许一个 webhook 后端（调度器扩展程序）为 pod 筛选节点和确定节点的优先级。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Custom Resources](/docs/concepts/api-extension/custom-resources/)
@@ -365,4 +366,4 @@ the nodes chosen for a pod.
 * 了解 [kubectl 插件](/docs/tasks/extend-kubectl/kubectl-plugins/)
 * 了解[操作者模式](/docs/concepts/extend-kubernetes/operator/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/extend-kubernetes/operator.md b/content/zh/docs/concepts/extend-kubernetes/operator.md
index c2c8166863..c34a54676e 100644
--- a/content/zh/docs/concepts/extend-kubernetes/operator.md
+++ b/content/zh/docs/concepts/extend-kubernetes/operator.md
@@ -1,18 +1,18 @@
 ---
 title: Operator 模式
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 <!--
 ---
 title: Operator pattern
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Operators are software extensions to Kubernetes that make use of [custom
@@ -24,9 +24,9 @@ Kubernetes principles, notably the [control loop](/docs/concepts/#kubernetes-con
 Operator 是 Kubernetes 的扩展软件，它利用[自定义资源](/docs/concepts/extend-kubernetes/api-extension/custom-resources/)管理应用及其组件。
 Operator 遵循 Kubernetes 的理念，特别是在[控制回路](/docs/concepts/#kubernetes-control-plane)方面。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Motivation
@@ -200,9 +200,10 @@ that can act as a [client for the Kubernetes API](/docs/reference/using-api/clie
 
 您还可以使用任何支持 [Kubernetes API 客户端](/docs/reference/using-api/client-libraries/)的语言或运行时来实现 Operator（即控制器）。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
@@ -229,4 +230,4 @@ that can act as a [client for the Kubernetes API](/docs/reference/using-api/clie
 * 阅读 [CoreOS 原文](https://coreos.com/blog/introducing-operators.html)，其介绍了 Operator 介绍
 * 阅读这篇来自谷歌云的关于构建 Operator 最佳实践的[文章](https://cloud.google.com/blog/products/containers-kubernetes/best-practices-for-building-kubernetes-operators-and-stateful-apps)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/extend-kubernetes/service-catalog.md b/content/zh/docs/concepts/extend-kubernetes/service-catalog.md
index ab8494e637..0ee381052c 100644
--- a/content/zh/docs/concepts/extend-kubernetes/service-catalog.md
+++ b/content/zh/docs/concepts/extend-kubernetes/service-catalog.md
@@ -2,7 +2,7 @@
 title: 服务目录
 reviewers:
 - chenopis
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 40
 title: Service Catalog
 reviewers:
 - chenopis
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< glossary_definition term_id="service-catalog" length="all" prepend="" >}}  
 
 <!--
@@ -29,10 +29,10 @@ Using Service Catalog, a {{< glossary_tooltip text="cluster operator" term_id="c
 
 使用服务目录，集群操作者可以浏览其提供的托管服务列表，提供托管服务实例并与之绑定，以使其可以被 Kubernetes 集群中的应用程序使用。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Example use case
 
@@ -437,10 +437,11 @@ The following example describes how to map secret values into application enviro
                    key: topic
 ```
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * If you are familiar with {{< glossary_tooltip text="Helm Charts" term_id="helm-chart" >}}, [install Service Catalog using Helm](/docs/tasks/service-catalog/install-service-catalog-using-helm/) into your Kubernetes cluster. Alternatively, you can [install Service Catalog using the SC tool](/docs/tasks/service-catalog/install-service-catalog-using-sc/).
 * View [sample service brokers](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers).
@@ -451,7 +452,7 @@ The following example describes how to map secret values into application enviro
 * 查看[服务代理示例](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers)。
 * 浏览 [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) 项目。
 * 查看 [svc-cat.io](https://svc-cat.io/docs/)。
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/concepts/overview/components.md b/content/zh/docs/concepts/overview/components.md
index 8e2ad9dc3e..f05be27399 100644
--- a/content/zh/docs/concepts/overview/components.md
+++ b/content/zh/docs/concepts/overview/components.md
@@ -1,6 +1,6 @@
 ---
 title: Kubernetes 组件
-content_template: templates/concept
+content_type: concept
 weight: 20
 card: 
   name: concepts
@@ -11,7 +11,7 @@ card:
 reviewers:
 - lavalamp
 title: Kubernetes Components
-content_template: templates/concept
+content_type: concept
 weight: 20
 card: 
   name: concepts
@@ -30,7 +30,7 @@ Here's the diagram of a Kubernetes cluster with all the components tied together
 
 ![Components of Kubernetes](/images/docs/components-of-kubernetes.png)
 -->
-{{% capture overview %}}
+<!-- overview -->
 当你部署完 Kubernetes, 即拥有了一个完整的集群。
 {{< glossary_definition term_id="cluster" length="all" prepend="一个 Kubernetes 集群包含">}}
 
@@ -40,9 +40,9 @@ Here's the diagram of a Kubernetes cluster with all the components tied together
 
 ![Components of Kubernetes](/images/docs/components-of-kubernetes.png)
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!-- 
 ## Control Plane Components
 -->
@@ -222,8 +222,9 @@ saving container logs to a central log store with search/browsing interface.
 -->
 [集群层面日志](/docs/concepts/cluster-administration/logging/) 机制负责将容器的日志数据保存到一个集中的日志存储中，该存储能够提供搜索和浏览接口。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Learn about [Nodes](/docs/concepts/architecture/nodes/)
 * Learn about [kube-scheduler](/docs/concepts/scheduling/kube-scheduler/)
@@ -232,4 +233,4 @@ saving container logs to a central log store with search/browsing interface.
 * 进一步了解 [Nodes](/docs/concepts/architecture/nodes/)
 * 进一步了解 [kube-scheduler](/docs/concepts/scheduling/kube-scheduler/)
 * 阅读 etcd 官方[文档](https://etcd.io/docs/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/kubernetes-api.md b/content/zh/docs/concepts/overview/kubernetes-api.md
index 35ca28fa56..9a40a3b74b 100644
--- a/content/zh/docs/concepts/overview/kubernetes-api.md
+++ b/content/zh/docs/concepts/overview/kubernetes-api.md
@@ -1,13 +1,13 @@
 ---
 title: Kubernetes API
-content_template: templates/concept
+content_type: concept
 weight: 30
 card:
   name: concepts
   weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Overall API conventions are described in the [API conventions doc](https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md).
@@ -34,10 +34,10 @@ Kubernetes 通过API资源存储自己序列化状态(现在存储在[etcd](http
 
 Kubernetes 被分成多个组件，各部分通过API相互交互。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## API changes
@@ -271,4 +271,4 @@ Individual resource enablement/disablement is only supported in the `extensions/
 
 {{< /note >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/what-is-kubernetes.md b/content/zh/docs/concepts/overview/what-is-kubernetes.md
index 427073cd09..317b3ef79b 100644
--- a/content/zh/docs/concepts/overview/what-is-kubernetes.md
+++ b/content/zh/docs/concepts/overview/what-is-kubernetes.md
@@ -1,6 +1,6 @@
 ---
 title: Kubernetes 是什么？
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: concepts
@@ -12,7 +12,7 @@ reviewers:
 - bgrant0607
 - mikedanese
 title: What is Kubernetes
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: concepts
@@ -20,14 +20,14 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page is an overview of Kubernetes.
 -->
 此页面是 Kubernetes 的概述。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 Kubernetes is a portable, extensible, open-source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation. It has a large, rapidly growing ecosystem. Kubernetes services, support, and tools are widely available.
 -->
@@ -205,13 +205,14 @@ Kubernetes：
 * Kubernetes 不提供也不采用任何全面的机器配置、维护、管理或自我修复系统。
 * 此外，Kubernetes 不仅仅是一个编排系统，实际上它消除了编排的需要。编排的技术定义是执行已定义的工作流程：首先执行 A，然后执行 B，再执行 C。相比之下，Kubernetes 包含一组独立的、可组合的控制过程，这些过程连续地将当前状态驱动到所提供的所需状态。从 A 到 C 的方式无关紧要，也不需要集中控制，这使得系统更易于使用且功能更强大、健壮、弹性和可扩展性。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 *   Take a look at the [Kubernetes Components](/docs/concepts/overview/components/)
 *   Ready to [Get Started](/docs/setup/)?
 -->
 *   查阅 [Kubernetes 组件](/docs/concepts/overview/components/)
 *   开始 [Kubernetes 入门](/docs/setup/)?
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/working-with-objects/annotations.md b/content/zh/docs/concepts/overview/working-with-objects/annotations.md
index 9480250faa..8e8b0f3f5b 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/annotations.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/annotations.md
@@ -1,27 +1,27 @@
 ---
 title: 注解
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
 <!--
 ---
 title: Annotations
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 你可以使用 Kubernetes 注解为对象附加任意的非标识的元数据。客户端程序（例如工具和库）能够获取这些元数据信息。
 <!--
 You can use Kubernetes annotations to attach arbitrary non-identifying metadata
 to objects. Clients such as tools and libraries can retrieve this metadata.
 -->
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## 为对象附加元数据
 <!--
 ## Attaching metadata to objects
@@ -163,11 +163,12 @@ spec:
 
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 进一步了解[标签和选择器](/docs/concepts/overview/working-with-objects/labels/)。
 <!--
 Learn more about [Labels and Selectors](/docs/concepts/overview/working-with-objects/labels/).
 -->
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/working-with-objects/common-labels.md b/content/zh/docs/concepts/overview/working-with-objects/common-labels.md
index 9e7334bab8..be60e6f10f 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/common-labels.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/common-labels.md
@@ -1,15 +1,15 @@
 ---
 title: 推荐使用的标签
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
 title: Recommended Labels
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 You can visualize and manage Kubernetes objects with more tools than kubectl and
 the dashboard. A common set of labels allows tools to work interoperably, describing
@@ -23,9 +23,9 @@ in a way that can be queried.
 -->
 除了支持工具外，推荐的标签还以一种可以查询的方式描述了应用程序。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 The metadata is organized around the concept of an _application_. Kubernetes is not
 a platform as a service (PaaS) and doesn't have or enforce a formal notion of an application.
@@ -254,4 +254,4 @@ With the MySQL `StatefulSet` and `Service` you'll notice information about both
 -->
 使用 MySQL `StatefulSet` 和 `Service`，您会注意到有关 MySQL 和 Wordpress 的信息，包括更广泛的应用程序。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/working-with-objects/kubernetes-objects.md b/content/zh/docs/concepts/overview/working-with-objects/kubernetes-objects.md
index 156fa61d56..f340841e19 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/kubernetes-objects.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/kubernetes-objects.md
@@ -1,6 +1,6 @@
 ---
 title: 理解 Kubernetes 对象
-content_template: templates/concept
+content_type: concept
 weight: 10
 card: 
   name: 概念
@@ -9,21 +9,21 @@ card:
 
 <!---
 title: Understanding Kubernetes Objects
-content_template: templates/concept
+content_type: concept
 weight: 10
 card: 
   name: concepts
   weight: 40
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page explains how Kubernetes objects are represented in the Kubernetes API, and how you can express them in `.yaml` format.
 -->
 本页说明了 Kubernetes 对象在 Kubernetes API 中是如何表示的，以及如何在 `.yaml` 格式的文件中表示。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Understanding Kubernetes Objects
 
@@ -155,9 +155,10 @@ and the `spec` format for a `Deployment` can be found
 并且可以从
 [这里](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#deploymentspec-v1-apps)
 查看 `Deployment` 的 `spec` 格式。
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * [Kubernetes API overview](/docs/reference/using-api/api-overview/) explains some more API concepts
 * Learn about the most important basic Kubernetes objects, such as [Pod](/docs/concepts/workloads/pods/pod-overview/).
@@ -166,6 +167,6 @@ and the `spec` format for a `Deployment` can be found
 * [Kubernetes API 概述](/docs/reference/using-api/api-overview/) 提供关于 API 概念的进一步阐述
 * 了解最重要的 Kubernetes 基本对象，例如 [Pod](/docs/concepts/workloads/pods/pod-overview/)。
 * 了解 Kubernetes 中的[控制器](/docs/concepts/architecture/controller/)。
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/concepts/overview/working-with-objects/labels.md b/content/zh/docs/concepts/overview/working-with-objects/labels.md
index e8d607e732..718ad4fc93 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/labels.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/labels.md
@@ -1,6 +1,6 @@
 ---
 title: 标签和选择器
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -8,11 +8,11 @@ weight: 40
 reviewers:
 - mikedanese
 title: Labels and Selectors
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 _Labels_ are key/value pairs that are attached to objects, such as pods.
@@ -40,10 +40,10 @@ We'll eventually index and reverse-index labels for efficient queries and watche
 
 我们最终将标签索引和反向索引，用于高效查询和监视，使用它们在 UI 和 CLI 中进行排序和分组等。我们不希望将非标识性的、尤其是大型或结构化数据用作标签，给后者带来污染。应使用 [注解](/docs/concepts/overview/working-with-objects/annotations/) 记录非识别信息
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Motivation
@@ -375,4 +375,4 @@ See the documentation on [node selection](/docs/concepts/configuration/assign-po
 通过标签进行选择的一个用例是确定节点集，方便 pod 调度。
 有关更多信息，请参阅 [选择节点](/docs/concepts/configuration/assign-pod-node/) 上的文档。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/working-with-objects/names.md b/content/zh/docs/concepts/overview/working-with-objects/names.md
index bcf75f4991..e7b7da5afd 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/names.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/names.md
@@ -1,10 +1,10 @@
 ---
 title: 对象名称和IDs
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Each object in your cluster has a [_Name_](#names) that is unique for that type of resource.
@@ -36,10 +36,10 @@ See the [identifiers design doc](https://git.k8s.io/community/contributors/desig
 
 有关名称和 UID 的精确语法规则，请参见[标识符设计文档](https://git.k8s.io/community/contributors/design-proposals/architecture/identifiers.md)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Names
@@ -148,9 +148,10 @@ UUIDs are standardized as ISO/IEC 9834-8 and as ITU-T X.667.
 Kubernetes UIDs 是通用的唯一标识符 (也叫 UUIDs).  
 UUIDs 是标准化的，见 ISO/IEC 9834-8 和 ITU-T X.667.  
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Read about [labels](/docs/concepts/overview/working-with-objects/labels/) in Kubernetes.
 * See the [Identifiers and Names in Kubernetes](https://git.k8s.io/community/contributors/design-proposals/architecture/identifiers.md) design document.
@@ -158,4 +159,4 @@ UUIDs 是标准化的，见 ISO/IEC 9834-8 和 ITU-T X.667.
 * 阅读关于 Kubernetes [labels](/docs/concepts/overview/working-with-objects/labels/)。  
 * 更多参见 [Kubernetes 标识符和名称设计文档](https://git.k8s.io/community/contributors/design-proposals/architecture/identifiers.md).
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/overview/working-with-objects/namespaces.md b/content/zh/docs/concepts/overview/working-with-objects/namespaces.md
index b15f49167c..a6456f6400 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/namespaces.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/namespaces.md
@@ -1,6 +1,6 @@
 ---
 title: 命名空间
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 <!--
@@ -10,12 +10,12 @@ reviewers:
 - mikedanese
 - thockin
 title: Namespaces
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes supports multiple virtual clusters backed by the same physical cluster.
@@ -24,9 +24,9 @@ These virtual clusters are called namespaces.
 Kubernetes 支持多个虚拟集群，它们底层依赖于同一个物理集群。
 这些虚拟集群被称为命名空间。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## When to Use Multiple Namespaces
@@ -197,9 +197,10 @@ kubectl api-resources --namespaced=true
 kubectl api-resources --namespaced=false
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Learn more about [creating a new namespace](/docs/tasks/administer-cluster/namespaces/#creating-a-new-namespace).
 * Learn more about [deleting a namespace](/docs/tasks/administer-cluster/namespaces/#deleting-a-namespace).
@@ -207,5 +208,5 @@ kubectl api-resources --namespaced=false
 * 进一步了解[建立新的命名空间](/docs/tasks/administer-cluster/namespaces/#creating-a-new-namespace)。
 * 进一步了解[删除命名空间](/docs/tasks/administer-cluster/namespaces/#deleting-a-namespace)。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/overview/working-with-objects/object-management.md b/content/zh/docs/concepts/overview/working-with-objects/object-management.md
index a6225ff4c8..5ae25eeebd 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/object-management.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/object-management.md
@@ -1,10 +1,10 @@
 ---
 title: Kubernetes 对象管理
-content_template: templates/concept
+content_type: concept
 weight: 15
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 The `kubectl` command-line tool supports several different ways to create and manage
 Kubernetes objects. This document provides an overview of the different
@@ -12,9 +12,9 @@ approaches. Read the [Kubectl book](https://kubectl.docs.kubernetes.io) for
 details of managing objects by Kubectl.
 -->
 `kubectl` 命令行工具支持多种不同的方式来创建和管理 Kubernetes 对象。本文档概述了不同的方法。阅读 [Kubectl book](https://kubectl.docs.kubernetes.io) 来了解 kubectl 管理对象的详细信息。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Management techniques
@@ -310,9 +310,10 @@ Disadvantages compared to imperative object configuration:
 - 声明式对象配置难于调试并且出现异常时结果难以理解。
 - 使用 diff 产生的部分更新会创建复杂的合并和补丁操作。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - [Managing Kubernetes Objects Using Imperative Commands](/docs/tasks/manage-kubernetes-objects/imperative-command/)
@@ -331,4 +332,4 @@ Disadvantages compared to imperative object configuration:
 - [Kubectl Book](https://kubectl.docs.kubernetes.io)
 - [Kubernetes API 参考](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/policy/limit-range.md b/content/zh/docs/concepts/policy/limit-range.md
index aa217f3311..34d97b3995 100644
--- a/content/zh/docs/concepts/policy/limit-range.md
+++ b/content/zh/docs/concepts/policy/limit-range.md
@@ -1,10 +1,10 @@
 ---
 title: 限制范围
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 By default, containers run with unbounded [compute resources](/docs/user-guide/compute-resources) on a Kubernetes cluster.
@@ -16,10 +16,10 @@ Within a namespace, a Pod or Container can consume as much CPU and memory as def
 使用资源配额，集群管理员可以以命名空间为单位，限制其资源的使用与创建。
 在命名空间中，一个 Pod 或 Container 最多能够使用命名空间的资源配额所定义的 CPU 和内存用量。有人担心，一个 Pod 或 Container 会垄断所有可用的资源。LimitRange 是在命名空间内限制资源分配（给多个 Pod 或 Container）的策略对象。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 A _LimitRange_ provides constraints that can:
@@ -135,9 +135,10 @@ Neither contention nor changes to a LimitRange will affect already created resou
 - 查看[如何配置每个命名空间最小和最大存储使用量](/docs/tasks/administer-cluster/limit-storage-consumption/#limitrange-to-limit-requests-for-storage)。
 - 查看[配置每个命名空间的配额的详细例子](/docs/tasks/administer-cluster/quota-memory-cpu-namespace/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 See [LimitRanger design doc](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_limit_range.md) for more information.
@@ -145,4 +146,4 @@ See [LimitRanger design doc](https://git.k8s.io/community/contributors/design-pr
 
 查看 [LimitRanger 设计文档](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_limit_range.md)获取更多信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/policy/resource-quotas.md b/content/zh/docs/concepts/policy/resource-quotas.md
index e2e3a9c2e5..af65151588 100644
--- a/content/zh/docs/concepts/policy/resource-quotas.md
+++ b/content/zh/docs/concepts/policy/resource-quotas.md
@@ -2,7 +2,7 @@
 approvers:
 - derekwaynecarr
 title: 资源配额
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
@@ -11,12 +11,12 @@ weight: 10
 reviewers:
 - derekwaynecarr
 title: Resource Quotas
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 When several users or teams share a cluster with a fixed number of nodes,
@@ -29,10 +29,10 @@ Resource quotas are a tool for administrators to address this concern.
 -->
 资源配额是帮助管理员解决这一问题的工具。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 A resource quota, defined by a `ResourceQuota` object, provides constraints that limit
@@ -879,13 +879,14 @@ See a [detailed example for how to use resource quota](/docs/tasks/administer-cl
 -->
 查看[如何使用资源配额的详细示例](/docs/tasks/administer-cluster/quota-api-object/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 See [ResourceQuota design doc](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_resource_quota.md) for more information.
 -->
 查看[资源配额设计文档](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_resource_quota.md)了解更多信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/scheduling-eviction/kube-scheduler.md b/content/zh/docs/concepts/scheduling-eviction/kube-scheduler.md
index cc1bbda060..7d0e65d619 100644
--- a/content/zh/docs/concepts/scheduling-eviction/kube-scheduler.md
+++ b/content/zh/docs/concepts/scheduling-eviction/kube-scheduler.md
@@ -1,17 +1,17 @@
 ---
 title: Kubernetes 调度器
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
 <!--
 ---
 title: Kubernetes Scheduler
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 In Kubernetes, _scheduling_ refers to making sure that {{< glossary_tooltip text="Pods" term_id="pod" >}}
@@ -21,9 +21,9 @@ are matched to {{< glossary_tooltip text="Nodes" term_id="node" >}} so that
 在 Kubernetes 中，_调度_ 是指将 {{< glossary_tooltip text="Pod" term_id="pod" >}} 放置到合适的
 {{< glossary_tooltip text="Node" term_id="node" >}} 上，然后对应 Node 上的 {{< glossary_tooltip term_id="kubelet" >}} 才能够运行这些 pod。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Scheduling overview {#scheduling}
 -->
@@ -148,8 +148,9 @@ of the scheduler:
 1. [调度策略](/docs/reference/scheduling/policies) 允许你配置过滤的 _谓词(Predicates)_ 和打分的 _优先级(Priorities)_ 。
 2. [调度配置](/docs/reference/scheduling/profiles) 允许你配置实现不同调度阶段的插件，包括：`QueueSort`, `Filter`, `Score`, `Bind`, `Reserve`, `Permit` 等等。你也可以配置 kube-scheduler 运行不同的配置文件。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- 
 * Read about [scheduler performance tuning](/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
@@ -166,4 +167,4 @@ of the scheduler:
 * 了解关于 [配置多个调度器](/zh/docs/tasks/administer-cluster/configure-multiple-schedulers/) 的方式
 * 了解关于 [拓扑结构管理策略](/zh/docs/tasks/administer-cluster/topology-manager/)
 * 了解关于 [Pod 额外开销](/zh/docs/concepts/configuration/pod-overhead/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md b/content/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md
index ee0b285712..b38314d989 100644
--- a/content/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md
+++ b/content/zh/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md
@@ -1,6 +1,6 @@
 ---
 title: 调度器性能调优
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 <!--
@@ -8,12 +8,12 @@ weight: 70
 reviewers:
 - bsalamat
 title: Scheduler Performance Tuning
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.14" state="beta" >}}
 
@@ -40,9 +40,9 @@ large Kubernetes clusters.
 -->
 这篇文章将会介绍一些在大规模 Kubernetes 集群下调度器性能优化的方式。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- 
 In large clusters, you can tune the scheduler's behaviour balancing
@@ -273,4 +273,4 @@ After going over all the Nodes, it goes back to Node 1.
 -->
 在评估完所有 Node 后，将会返回到 Node 1，从头开始。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/scheduling-eviction/scheduling-framework.md b/content/zh/docs/concepts/scheduling-eviction/scheduling-framework.md
index bebea8d02e..d62f206d76 100644
--- a/content/zh/docs/concepts/scheduling-eviction/scheduling-framework.md
+++ b/content/zh/docs/concepts/scheduling-eviction/scheduling-framework.md
@@ -2,7 +2,7 @@
 reviewers:
 - ahg-g
 title: 调度框架
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
@@ -11,12 +11,12 @@ weight: 60
 reviewers:
 - ahg-g
 title: Scheduling Framework
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.15" state="alpha" >}}
 
@@ -34,9 +34,9 @@ framework.
 
 [kep]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-scheduling/20180409-scheduling-framework.md
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 # Framework workflow
@@ -458,4 +458,4 @@ Learn more at [multiple profiles](/docs/reference/scheduling/profiles/#multiple-
 如果你正在使用 Kubernetes v1.18 或更高版本，你可以将一组插件设置为一个调度器配置文件，然后定义不同的配置文件来满足各类工作负载。
 了解更多关于 [多配置文件](/docs/reference/scheduling/profiles/#multiple-profiles)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md b/content/zh/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
index dc442fcdf9..6db722eed5 100644
--- a/content/zh/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
+++ b/content/zh/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
@@ -1,12 +1,12 @@
 ---
 title: 使用 HostAliases 向 Pod /etc/hosts 文件添加条目
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
 {{< toc >}}
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Adding entries to a Pod's /etc/hosts file provides Pod-level override of hostname resolution when DNS and other options are not applicable. In 1.7, users can add these custom entries with the HostAliases field in PodSpec.
@@ -17,9 +17,9 @@ Modification not using HostAliases is not suggested because the file is managed
 当 DNS 配置以及其它选项不合理的时候，通过向 Pod 的 /etc/hosts 文件中添加条目，可以在 Pod 级别覆盖对主机名的解析。在 1.7 版本，用户可以通过 PodSpec 的 HostAliases 字段来添加这些自定义的条目。
 
 建议通过使用 HostAliases 来进行修改，因为该文件由 Kubelet 管理，并且可以在 Pod 创建/重启过程中被重写。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Default Hosts File Content
@@ -176,5 +176,5 @@ kubelet [管理](https://github.com/kubernetes/kubernetes/issues/14633) Pod 中
 
 因为该文件是托管性质的文件，无论容器重启或 Pod 重新调度，用户修改该 hosts 文件的任何内容，都会在 Kubelet 重新安装后被覆盖。因此，不建议修改该文件的内容。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/services-networking/connect-applications-service.md b/content/zh/docs/concepts/services-networking/connect-applications-service.md
index 8c2087156b..d49d61294b 100644
--- a/content/zh/docs/concepts/services-networking/connect-applications-service.md
+++ b/content/zh/docs/concepts/services-networking/connect-applications-service.md
@@ -1,11 +1,11 @@
 ---
 title: 应用连接到 Service
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 ## The Kubernetes model for connecting containers
@@ -38,9 +38,9 @@ Kubernetes 假设 Pod 可与其它 Pod 通信，不管它们在哪个主机上
 该指南使用一个简单的 Nginx server 来演示并证明谈到的概念。同样的原则也体现在一个更加完整的 [Jenkins CI 应用](http://kubernetes.io/blog/2015/07/strong-simple-ssl-for-kubernetes.html) 中。
 
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Exposing pods to the cluster
@@ -598,9 +598,10 @@ LoadBalancer Ingress:   a320587ffd19711e5a37606cf4a74574-1142138393.us-east-1.el
 ...
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Kubernetes also supports Federated Services, which can span multiple
@@ -613,4 +614,3 @@ for further information.
 Kubernetes 也支持联合 Service，能够跨多个集群和云提供商，为 Service 提供逐步增强的可用性、更优的容错、更好的可伸缩性。
 查看 [联合 Service 用户指南](/docs/concepts/cluster-administration/federation-service-discovery/) 获取更进一步信息。
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/concepts/services-networking/dns-pod-service.md b/content/zh/docs/concepts/services-networking/dns-pod-service.md
index bde7d79b60..bbdda7e18a 100644
--- a/content/zh/docs/concepts/services-networking/dns-pod-service.md
+++ b/content/zh/docs/concepts/services-networking/dns-pod-service.md
@@ -1,17 +1,17 @@
 ---
 title: Pod 与 Service 的 DNS
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page provides an overview of DNS support by Kubernetes.
 -->
 该页面概述了Kubernetes对DNS的支持。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -404,9 +404,10 @@ Pod DNS 配置和 DNS 策略 "`None`" 的版本对应如下所示。
 | 1.10 | Beta (on by default)|
 | 1.9 | Alpha |
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 For guidance on administering DNS configurations, check
@@ -416,5 +417,5 @@ For guidance on administering DNS configurations, check
 有关管理 DNS 配置的指导，请查看
 [配置 DNS 服务](/docs/tasks/administer-cluster/dns-custom-nameservers/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/services-networking/dual-stack.md b/content/zh/docs/concepts/services-networking/dual-stack.md
index 589b9813a7..4fe0dad18c 100644
--- a/content/zh/docs/concepts/services-networking/dual-stack.md
+++ b/content/zh/docs/concepts/services-networking/dual-stack.md
@@ -5,7 +5,7 @@ feature:
   description: >
     Allocation of IPv4 and IPv6 addresses to Pods and Services
 
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 <!--
@@ -20,12 +20,12 @@ feature:
   description: >
     Allocation of IPv4 and IPv6 addresses to Pods and Services
 
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.16" state="alpha" >}}
 
@@ -39,9 +39,9 @@ If you enable IPv4/IPv6 dual-stack networking for your Kubernetes cluster, the c
 -->
 如果你为 Kubernetes 集群启用了 IPv4/IPv6 双协议栈网络，则该集群将支持同时分配 IPv4 和 IPv6 地址。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Supported Features
@@ -185,14 +185,15 @@ The use of publicly routable and non-publicly routable IPv6 address blocks is ac
 -->
    * Kubenet 强制 IPv4，IPv6 的 IPs 位置报告 (--cluster-cidr)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Validate IPv4/IPv6 dual-stack](/docs/tasks/network/validate-dual-stack) networking
 -->
 * [验证 IPv4/IPv6 双协议栈](/docs/tasks/network/validate-dual-stack)网络
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/services-networking/endpoint-slices.md b/content/zh/docs/concepts/services-networking/endpoint-slices.md
index 4777c92d3d..8a71b19b3c 100644
--- a/content/zh/docs/concepts/services-networking/endpoint-slices.md
+++ b/content/zh/docs/concepts/services-networking/endpoint-slices.md
@@ -7,7 +7,7 @@ feature:
   description: >
     Kubernetes 集群中网络端点的可扩展跟踪。
 
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
@@ -21,12 +21,12 @@ feature:
   description: >
     Scalable tracking of network endpoints in a Kubernetes cluster.
 
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.17" state="beta" >}}
 
@@ -37,9 +37,9 @@ Endpoints.
 -->
 _Endpoint Slices_ 提供了一种简单的方法来跟踪 Kubernetes 集群中的网络端点（network endpoints）。它们为 Endpoints 提供了一种可伸缩和可拓展的替代方案。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Endpoint Slice resources {#endpointslice-resource}
@@ -137,9 +137,10 @@ Endpoints API 提供了一种简单明了的方法在 Kubernetes 中跟踪网络
 由于服务的所有网络端点都存储在单个 Endpoints 资源中，因此这些资源可能会变得很大。这影响了 Kubernetes 组件（尤其是主控制平面）的性能，并在 Endpoints 发生更改时导致大量网络流量和处理。Endpoint Slices 可帮助您缓解这些问题并提供可扩展的
 附加特性（例如拓扑路由）平台。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Enabling Endpoint Slices](/docs/tasks/administer-cluster/enabling-endpoint-slices)
@@ -147,4 +148,4 @@ Endpoints API 提供了一种简单明了的方法在 Kubernetes 中跟踪网络
 -->
 * [启用 Endpoint Slices](/docs/tasks/administer-cluster/enabling-endpoint-slices)
 * 阅读 [Connecting Applications with Services](/docs/concepts/services-networking/connect-applications-service/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/ingress-controllers.md b/content/zh/docs/concepts/services-networking/ingress-controllers.md
index c6bdeccd00..46d166d9d9 100644
--- a/content/zh/docs/concepts/services-networking/ingress-controllers.md
+++ b/content/zh/docs/concepts/services-networking/ingress-controllers.md
@@ -1,6 +1,6 @@
 ---
 title: Ingress 控制器
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
@@ -8,12 +8,12 @@ weight: 40
 ---
 title: Ingress Controllers
 reviewers:
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 In order for the Ingress resource to work, the cluster must have an ingress controller running. 
@@ -35,9 +35,9 @@ Kubernetes as a project currently supports and maintains [GCE](https://git.k8s.i
 Kubernetes 作为一个项目，目前支持和维护 [GCE](https://git.k8s.io/ingress-gce/README.md) 
 和 [nginx](https://git.k8s.io/ingress-nginx/README.md) 控制器。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Additional controllers
@@ -121,13 +121,14 @@ Make sure you review your ingress controller's documentation to understand the c
 确保您查看了 ingress 控制器的文档，以了解选择它的注意事项。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Learn more about [Ingress](/docs/concepts/services-networking/ingress/).
 * [Set up Ingress on Minikube with the NGINX Controller](/docs/tasks/access-application-cluster/ingress-minikube).
 -->
 * 进一步了解 [Ingress](/docs/concepts/services-networking/ingress/)。
 * [在 Minikube 上使用 NGINX 控制器安装 Ingress](/docs/tasks/access-application-cluster/ingress-minikube)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/ingress.md b/content/zh/docs/concepts/services-networking/ingress.md
index 3d5e922b22..24b2acd5dc 100644
--- a/content/zh/docs/concepts/services-networking/ingress.md
+++ b/content/zh/docs/concepts/services-networking/ingress.md
@@ -1,6 +1,6 @@
 ---
 title: Ingress
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -8,17 +8,17 @@ weight: 40
 reviewers:
 - bprashanth
 title: Ingress
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.1" state="beta" >}}
 {{< glossary_definition term_id="ingress" length="all" >}}
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Terminology
@@ -818,9 +818,10 @@ You can expose a Service in multiple ways that don't directly involve the Ingres
 * 使用 [Service.Type=LoadBalancer](/docs/concepts/services-networking/service/#loadbalancer)
 * 使用 [Service.Type=NodePort](/docs/concepts/services-networking/service/#nodeport)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Learn about the [Ingress API](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#ingress-v1beta1-networking-k8s-io)
 * Learn about [Ingress Controllers](/docs/concepts/services-networking/ingress-controllers/)
@@ -829,4 +830,4 @@ You can expose a Service in multiple ways that don't directly involve the Ingres
 * 了解更多 [Ingress API](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#ingress-v1beta1-networking-k8s-io)
 * 了解更多 [Ingress 控制器](/docs/concepts/services-networking/ingress-controllers/)
 * [使用 NGINX 控制器在 Minikube 上安装 Ingress](/docs/tasks/access-application-cluster/ingress-minikube)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/network-policies.md b/content/zh/docs/concepts/services-networking/network-policies.md
index fa38f36fd7..2ad44866c6 100644
--- a/content/zh/docs/concepts/services-networking/network-policies.md
+++ b/content/zh/docs/concepts/services-networking/network-policies.md
@@ -1,6 +1,6 @@
 ---
 title: 网络策略
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
@@ -11,14 +11,14 @@ reviewers:
 - caseydavenport
 - danwinship
 title: Network Policies
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
  -->
 
 {{< toc >}}
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 A network policy is a specification of how groups of {{< glossary_tooltip text="pods" term_id="pod">}} are allowed to communicate with each other and other network endpoints.
@@ -30,9 +30,9 @@ NetworkPolicy resources use {{< glossary_tooltip text="labels" term_id="label">}
 
 NetworkPolicy 资源使用 {{< glossary_tooltip text="标签" term_id="label">}} 选择 Pod，并定义选定 Pod 所允许的通信规则。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Prerequisites
@@ -372,9 +372,10 @@ You must be using a {{< glossary_tooltip text="CNI" term_id="cni" >}} plugin tha
 {{< /note >}}
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - See the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/)
@@ -386,4 +387,4 @@ You must be using a {{< glossary_tooltip text="CNI" term_id="cni" >}} plugin tha
   来进行更多的示例演练
 - 有关 NetworkPolicy 资源启用的常见场景的更多信息，请参见 [指南](https://github.com/ahmetb/kubernetes-network-policy-recipes)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/service-topology.md b/content/zh/docs/concepts/services-networking/service-topology.md
index 4e8afac2bf..95459727a0 100644
--- a/content/zh/docs/concepts/services-networking/service-topology.md
+++ b/content/zh/docs/concepts/services-networking/service-topology.md
@@ -8,12 +8,12 @@ feature:
   description: >
     基于集群拓扑的服务流量路由。
 
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.17" state="alpha" >}}
 
@@ -26,9 +26,9 @@ in the same availability zone.
 
 `Service` 拓扑可以让一个服务基于集群的 `Node` 拓扑进行流量路由。例如，一个服务可以指定流量是被优先路由到一个和客户端在同一个 `Node` 或者在同一可用区域的端点。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -176,9 +176,10 @@ traffic as follows.
 
 * 通配符：`"*"`，如果要用，那必须是拓扑键值的最后一个值。 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read about [enabling Service Topology](/docs/tasks/administer-cluster/enabling-service-topology)
@@ -188,4 +189,4 @@ traffic as follows.
 * 阅读关于[启用服务拓扑](/docs/tasks/administer-cluster/enabling-service-topology)
 * 阅读[用 `Services` 连接应用程序](/zh/docs/concepts/services-networking/connect-applications-service/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/services-networking/service.md b/content/zh/docs/concepts/services-networking/service.md
index cea1cd7b67..b4636869d3 100644
--- a/content/zh/docs/concepts/services-networking/service.md
+++ b/content/zh/docs/concepts/services-networking/service.md
@@ -7,7 +7,7 @@ feature:
   description: >
     无需修改您的应用程序即可使用陌生的服务发现机制。Kubernetes 为容器提供了自己的 IP 地址和一个 DNS 名称，并且可以在它们之间实现负载平衡。
 
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
@@ -21,12 +21,12 @@ feature:
   description: >
     No need to modify your application to use an unfamiliar service discovery mechanism. Kubernetes gives containers their own IP addresses and a single DNS name for a set of containers, and can load-balance across them.
 
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< glossary_definition term_id="service" length="short" >}}
 
@@ -38,9 +38,9 @@ and can load-balance across them.
 使用Kubernetes，您无需修改应用程序即可使用不熟悉的服务发现机制。
 Kubernetes为Pods提供自己的IP地址和一组Pod的单个DNS名称，并且可以在它们之间进行负载平衡。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Motivation
@@ -1872,9 +1872,10 @@ Kubernetes 项目打算为 L7（HTTP）`Service` 改进我们对它的支持。
 Kubernetes 项目打算为 `Service` 实现更加灵活的请求进入模式，这些 `Service` 包含当前 `ClusterIP`、`NodePort` 和 `LoadBalancer` 模式，或者更多。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read [Connecting Applications with Services](/docs/concepts/services-networking/connect-applications-service/)
@@ -1886,4 +1887,4 @@ Kubernetes 项目打算为 `Service` 实现更加灵活的请求进入模式，
 * 阅读 [Ingress](/docs/concepts/services-networking/ingress/)
 * 阅读 [Endpoint Slices](/docs/concepts/services-networking/endpoint-slices/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/dynamic-provisioning.md b/content/zh/docs/concepts/storage/dynamic-provisioning.md
index 78c9aeabf8..56ae59f48a 100644
--- a/content/zh/docs/concepts/storage/dynamic-provisioning.md
+++ b/content/zh/docs/concepts/storage/dynamic-provisioning.md
@@ -1,6 +1,6 @@
 ---
 title: 动态卷供应
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -11,12 +11,12 @@ reviewers:
 - thockin
 - msau42
 title: Dynamic Volume Provisioning
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Dynamic volume provisioning allows storage volumes to be created on-demand.
@@ -32,9 +32,9 @@ automatically provisions storage when it is requested by users.
 然后在 Kubernetes 集群创建 [`PersistentVolume` 对象](/docs/concepts/storage/persistent-volumes/)来表示这些卷。
 动态供应功能消除了集群管理员预先配置存储的需要。 相反，它在用户请求时自动供应存储。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Background
@@ -212,4 +212,4 @@ Mode](/docs/concepts/storage/storage-classes/#volume-binding-mode).
 单区域存储后端应该被供应到 Pod 被调度到的区域。
 这可以通过设置[卷绑定模式](/docs/concepts/storage/storage-classes/#volume-binding-mode)来实现。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/storage-classes.md b/content/zh/docs/concepts/storage/storage-classes.md
index 0ccc19d65b..1e68f8b2a7 100644
--- a/content/zh/docs/concepts/storage/storage-classes.md
+++ b/content/zh/docs/concepts/storage/storage-classes.md
@@ -5,11 +5,11 @@ reviewers:
 - thockin
 - msau42
 title: Storage Classes
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This document describes the concept of a StorageClass in Kubernetes. Familiarity
@@ -19,9 +19,9 @@ with [volumes](/docs/concepts/storage/volumes/) and
 本文描述了 Kubernetes 中 StorageClass 的概念。建议先熟悉 [卷](/docs/concepts/storage/volumes/) 和
 [持久卷](/docs/concepts/storage/persistent-volumes) 的概念。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -1246,4 +1246,4 @@ PersistentVolumeClaim.
 -->
 延迟卷绑定使得调度器在为 PersistentVolumeClaim 选择一个合适的 PersistentVolume 时能考虑到所有 pod 的调度限制。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/storage-limits.md b/content/zh/docs/concepts/storage/storage-limits.md
index 7b5f8e63be..14ffd377a6 100644
--- a/content/zh/docs/concepts/storage/storage-limits.md
+++ b/content/zh/docs/concepts/storage/storage-limits.md
@@ -1,6 +1,6 @@
 ---
 title: 特定于节点的卷数限制
-content_template: templates/concept
+content_type: concept
 ---
 
 <!-- ---
@@ -10,11 +10,11 @@ reviewers:
 - thockin
 - msau42
 title: Node-specific Volume Limits
-content_template: templates/concept
+content_type: concept
 ---
  -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- This page describes the maximum number of volumes that can be attached
 to a Node for various cloud providers. -->
@@ -30,9 +30,9 @@ Kubernetes 需要尊重这些限制。 否则，在节点上调度的 Pod 可能
 
 
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Kubernetes default limits
@@ -150,4 +150,4 @@ Kubernetes 允许 39 个卷关联至节点。
 
 * 对于由已迁移到 CSI 驱动程序的树内插件管理的卷，最大卷数将是 CSI 驱动程序报告的卷数。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/volume-pvc-datasource.md b/content/zh/docs/concepts/storage/volume-pvc-datasource.md
index 8ae41e5149..755fa2588d 100644
--- a/content/zh/docs/concepts/storage/volume-pvc-datasource.md
+++ b/content/zh/docs/concepts/storage/volume-pvc-datasource.md
@@ -1,6 +1,6 @@
 ---
 title: CSI 卷克隆
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
@@ -12,12 +12,12 @@ reviewers:
 - thockin
 - msau42
 title: CSI Volume Cloning
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This document describes the concept of cloning existing CSI Volumes in Kubernetes.  Familiarity with [Volumes](/docs/concepts/storage/volumes) is suggested.
@@ -25,10 +25,10 @@ This document describes the concept of cloning existing CSI Volumes in Kubernete
 
 本文档介绍 Kubernetes 中克隆现有 CSI 卷的概念。阅读前建议先熟悉[卷](/docs/concepts/storage/volumes)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -137,4 +137,4 @@ Upon availability of the new PVC, the cloned PVC is consumed the same as other P
 
 一旦新的 PVC 可用，被克隆的 PVC 项其他 PVC 一样被使用。可以预期的是，新创建的 PVC 是一个独立的对象。可以独立使用，克隆，快照或删除它，而不需要考虑它的原始数据源 PVC。这也意味着，源没有以任何方式链接到新创建的 PVC，它也可以被修改或删除，而不会影响到新创建的克隆。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/volume-snapshot-classes.md b/content/zh/docs/concepts/storage/volume-snapshot-classes.md
index 445c1b4eab..cbe8389fd1 100644
--- a/content/zh/docs/concepts/storage/volume-snapshot-classes.md
+++ b/content/zh/docs/concepts/storage/volume-snapshot-classes.md
@@ -1,10 +1,10 @@
 ---
 title: 卷快照类
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This document describes the concept of `VolumeSnapshotClass` in Kubernetes. Familiarity
@@ -13,10 +13,10 @@ with [volume snapshots](/docs/concepts/storage/volume-snapshots/) and
 -->
 本文档描述了 Kubernetes 中 `VolumeSnapshotClass` 的概念。 建议熟悉[卷快照（Volume Snapshots）](/docs/concepts/storage/volume-snapshots/)和[存储类（Storage Class）](/docs/concepts/storage/storage-classes)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -97,4 +97,4 @@ the volume snapshot class. Different parameters may be accepted depending on the
 
 卷快照类具有描述属于该卷快照类的卷快照的参数。 可根据 `driver` 接受不同的参数。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/volume-snapshots.md b/content/zh/docs/concepts/storage/volume-snapshots.md
index 3f3a6ad65b..f729f4b923 100644
--- a/content/zh/docs/concepts/storage/volume-snapshots.md
+++ b/content/zh/docs/concepts/storage/volume-snapshots.md
@@ -1,6 +1,6 @@
 ---
 title: 卷快照
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
@@ -14,12 +14,12 @@ reviewers:
 - xing-yang
 - yuxiangqian
 title: Volume Snapshots
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.17" state="beta" >}}
 
@@ -28,9 +28,9 @@ In Kubernetes, a _VolumeSnapshot_ represents a snapshot of a volume on a storage
 -->
 在 Kubernetes 中，卷快照是一个存储系统上卷的快照，本文假设你已经熟悉了 Kubernetes 的 [持久卷](/docs/concepts/storage/persistent-volumes/)。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Introduction
@@ -268,4 +268,4 @@ For more details, see
 -->
 更多详细信息，请参阅 [卷快照和从快照还原卷](/docs/concepts/storage/persistent-volumes/#volume-snapshot-and-restore-volume-from-snapshot-support)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/storage/volumes.md b/content/zh/docs/concepts/storage/volumes.md
index ab64093e3a..aaf0a48f74 100644
--- a/content/zh/docs/concepts/storage/volumes.md
+++ b/content/zh/docs/concepts/storage/volumes.md
@@ -5,11 +5,11 @@ reviewers:
 - thockin
 - msau42
 title: Volumes
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 On-disk files in a Container are ephemeral, which presents some problems for
@@ -31,10 +31,10 @@ Familiarity with [Pods](/docs/user-guide/pods) is suggested.
 
 阅读本文前建议您熟悉一下 [Pods](/docs/user-guide/pods)。 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Background
@@ -2401,9 +2401,10 @@ sudo systemctl daemon-reload
 sudo systemctl restart docker
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Follow an example of [deploying WordPress and MySQL with Persistent Volumes](/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/).
@@ -2411,4 +2412,4 @@ sudo systemctl restart docker
 
 * 参考[使用持久卷部署 WordPress 和 MySQL](/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/) 示例。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/controllers/cron-jobs.md b/content/zh/docs/concepts/workloads/controllers/cron-jobs.md
index 75053fdb08..bda7bb3dc1 100644
--- a/content/zh/docs/concepts/workloads/controllers/cron-jobs.md
+++ b/content/zh/docs/concepts/workloads/controllers/cron-jobs.md
@@ -1,6 +1,6 @@
 ---
 title: CronJob
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 
@@ -11,12 +11,12 @@ reviewers:
 - soltysh
 - janetkuo
 title: CronJob
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.8" state="beta" >}}
 
@@ -62,10 +62,10 @@ For instructions on creating and working with cron jobs, and for an example of a
 有关创建和使用 CronJob 的说明及规范文件的示例，请参见[使用 CronJob 运行自动化任务](/docs/tasks/job/automated-tasks-with-cron-jobs)。
 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Cron Job Limitations
@@ -133,4 +133,5 @@ the Job in turn is responsible for the management of the Pods it represents.
 -->
 CronJob 仅负责创建与其调度时间相匹配的 Job，而 Job 又负责管理其代表的 Pod。
 
-{{% /capture %}}
+
+ 
diff --git a/content/zh/docs/concepts/workloads/controllers/daemonset.md b/content/zh/docs/concepts/workloads/controllers/daemonset.md
index 308779134d..edcbc29399 100644
--- a/content/zh/docs/concepts/workloads/controllers/daemonset.md
+++ b/content/zh/docs/concepts/workloads/controllers/daemonset.md
@@ -1,6 +1,6 @@
 ---
 title: DaemonSet
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
@@ -13,12 +13,12 @@ reviewers:
 - janetkuo
 - kow3ns
 title: DaemonSet
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 A _DaemonSet_ ensures that all (or some) Nodes run a copy of a Pod.  As nodes are added to the
@@ -51,10 +51,10 @@ different flags and/or different memory and cpu requests for different hardware
 一个稍微复杂的用法是单独对每种 daemon 类型使用多个 DaemonSet，但具有不同的标志，
 并且对不同硬件类型具有不同的内存、CPU 要求。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Writing a DaemonSet Spec
@@ -391,4 +391,4 @@ DaemonSet 与 [Deployments](/docs/concepts/workloads/controllers/deployment/) 
 为无状态的 Service 使用 Deployments，比如前端 Frontend 服务，实现对副本的数量进行扩缩容、平滑升级，比基于精确控制 Pod 运行在某个主机上要重要得多。
 需要 Pod 副本总是运行在全部或特定主机上，并需要先于其他 Pod 启动，当这被认为非常重要时，应该使用 Daemon Controller。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/controllers/deployment.md b/content/zh/docs/concepts/workloads/controllers/deployment.md
index ecddfa645d..ffeb5c550a 100644
--- a/content/zh/docs/concepts/workloads/controllers/deployment.md
+++ b/content/zh/docs/concepts/workloads/controllers/deployment.md
@@ -9,11 +9,11 @@ feature:
     <!-- Kubernetes progressively rolls out changes to your application or its configuration, while monitoring application health to ensure it doesn't kill all your instances at the same time. If something goes wrong, Kubernetes will rollback the change for you. Take advantage of a growing ecosystem of deployment solutions. -->
     Kubernetes 会逐步推出针对应用或其配置的更改，确保在监视应用程序运行状况的同时，不会终止所有实例。如果出现问题，Kubernetes 会为您回滚更改。充分利用不断成长的部署解决方案生态系统。
 
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 
@@ -40,9 +40,9 @@ Do not manage ReplicaSets owned by a Deployment. Consider opening an issue in th
 
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 You describe a _desired state_ in a Deployment, and the Deployment controller changes the actual state to the desired state at a controlled rate. You can define Deployments to create new ReplicaSets, or to remove existing Deployments and adopt all their resources with new Deployments.
 
@@ -2197,4 +2197,4 @@ additional features, such as rolling back to any previous revision even after th
 -->
 [`kubectl rolling update`](/docs/reference/generated/kubectl/kubectl-commands#rolling-update)更新 Pods 和副本控制器的方式类似。但是，建议采取 Deployments 的方式来更新，因为它们是声明性的，在服务器端，并且具有其他功能，例如，即使在滚动更新完成后，也会回滚到以前的任何修改版本。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/controllers/garbage-collection.md b/content/zh/docs/concepts/workloads/controllers/garbage-collection.md
index 9d6f98dc9f..7e7802999e 100644
--- a/content/zh/docs/concepts/workloads/controllers/garbage-collection.md
+++ b/content/zh/docs/concepts/workloads/controllers/garbage-collection.md
@@ -1,18 +1,18 @@
 ---
 title: 垃圾收集
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
 <!--
 ---
 title: Garbage Collection
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The role of the Kubernetes garbage collector is to delete certain objects
@@ -21,10 +21,10 @@ that once had an owner, but no longer have an owner.
 
 Kubernetes 垃圾收集器的作用是删除某些曾经拥有所有者（owner）但现在不再拥有所有者的对象。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Owners and dependents
@@ -288,10 +288,11 @@ Tracked at [#26120](https://github.com/kubernetes/kubernetes/issues/26120)
 
 跟踪 [#26120](https://github.com/kubernetes/kubernetes/issues/26120)
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 <!--
@@ -303,7 +304,7 @@ Tracked at [#26120](https://github.com/kubernetes/kubernetes/issues/26120)
 
 [设计文档 2](https://git.k8s.io/community/contributors/design-proposals/api-machinery/synchronous-garbage-collection.md)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/concepts/workloads/controllers/replicaset.md b/content/zh/docs/concepts/workloads/controllers/replicaset.md
index a6c957d640..962b7dfc0b 100644
--- a/content/zh/docs/concepts/workloads/controllers/replicaset.md
+++ b/content/zh/docs/concepts/workloads/controllers/replicaset.md
@@ -4,11 +4,11 @@ reviewers:
 - bprashanth
 - madhusudancs
 title: ReplicaSet
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 ReplicaSet is the next-generation Replication Controller. The only difference
@@ -21,9 +21,9 @@ whereas a Replication Controller only supports equality-based selector requireme
 
 ReplicaSet 是下一代的 Replication Controller。 _ReplicaSet_ 和 [_Replication Controller_](/docs/concepts/workloads/controllers/replicationcontroller/) 的唯一区别是选择器的支持。ReplicaSet 支持新的基于集合的选择器需求，这在[标签用户指南](/docs/concepts/overview/working-with-objects/labels/#label-selectors)中有描述。而 Replication Controller 仅支持基于相等选择器的需求。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## How to use a ReplicaSet
@@ -412,5 +412,5 @@ safe to terminate when the machine is otherwise ready to be rebooted/shutdown.
 对于管理那些提供主机级别功能（如主机监控和主机日志）的容器，就要用[`DaemonSet`](/docs/concepts/workloads/controllers/daemonset/) 而不用 ReplicaSet。
 这些 Pod 的寿命与主机寿命有关：这些 Pod 需要先于主机上的其他 Pod 运行，并且在机器准备重新启动/关闭时安全地终止。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/workloads/controllers/replicationcontroller.md b/content/zh/docs/concepts/workloads/controllers/replicationcontroller.md
index da8ead07f6..e5b8b0941a 100644
--- a/content/zh/docs/concepts/workloads/controllers/replicationcontroller.md
+++ b/content/zh/docs/concepts/workloads/controllers/replicationcontroller.md
@@ -6,7 +6,7 @@ feature:
   description: >
     重新启动失败的容器，在节点死亡时替换并重新调度容器，杀死不响应用户定义的健康检查的容器，并且在它们准备好服务之前不会将它们公布给客户端。
 
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---     
 
@@ -21,11 +21,11 @@ feature:
   description: >
     Restarts containers that fail, replaces and reschedules containers when nodes die, kills containers that don't respond to your user-defined health check, and doesn't advertise them to clients until they are ready to serve.
 
-content_template: templates/concept
+content_type: concept
 weight: 20
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 A [`Deployment`](/docs/concepts/workloads/controllers/deployment/) that configures a [`ReplicaSet`](/docs/concepts/workloads/controllers/replicaset/) is now the recommended way to set up replication.
@@ -41,10 +41,10 @@ always up and available.
 -->
 _ReplicationController_ 确保在任何时候都有特定数量的 pod 副本处于运行状态。
 换句话说，ReplicationController 确保一个 pod 或一组同类的 pod 总是可用的。
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## How a ReplicationController Works
@@ -560,4 +560,4 @@ Read [Run Stateless AP Replication Controller](/docs/tutorials/stateless-applica
 
 请阅读[运行无状态的 Replication Controller](/docs/tutorials/stateless-application/run-stateless-ap-replication-controller/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/controllers/statefulset.md b/content/zh/docs/concepts/workloads/controllers/statefulset.md
index 9fc134f487..3a27b68dd8 100644
--- a/content/zh/docs/concepts/workloads/controllers/statefulset.md
+++ b/content/zh/docs/concepts/workloads/controllers/statefulset.md
@@ -1,6 +1,6 @@
 ---
 title: StatefulSets
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
@@ -14,12 +14,12 @@ reviewers:
 - kow3ns
 - smarterclayton
 title: StatefulSets
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 StatefulSet is the workload API object used to manage stateful applications.
@@ -28,9 +28,9 @@ StatefulSet is the workload API object used to manage stateful applications.
 StatefulSet 是用来管理有状态应用的工作负载 API 对象。
 
 {{< glossary_definition term_id="statefulset" length="all" >}}
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Using StatefulSets
@@ -433,8 +433,9 @@ StatefulSet will then begin to recreate the Pods using the reverted template.
 
 恢复模板后，还必须删除 StatefulSet 尝试使用错误的配置来运行的 Pod。这样，StatefulSet 才会开始使用被还原的模板来重新创建 Pod。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Follow an example of [deploying a stateful application](/docs/tutorials/stateful-application/basic-stateful-set/).
@@ -446,5 +447,5 @@ StatefulSet will then begin to recreate the Pods using the reverted template.
 * 示例二：[使用 StatefulSet 部署 Cassandra](/docs/tutorials/stateful-application/cassandra/)。
 * 示例三：[运行多副本的有状态应用程序](/docs/tasks/run-application/run-replicated-stateful-application/)。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/concepts/workloads/controllers/ttlafterfinished.md b/content/zh/docs/concepts/workloads/controllers/ttlafterfinished.md
index 1de8c2367d..344363c5dd 100644
--- a/content/zh/docs/concepts/workloads/controllers/ttlafterfinished.md
+++ b/content/zh/docs/concepts/workloads/controllers/ttlafterfinished.md
@@ -1,6 +1,6 @@
 ---
 title: 已完成资源的 TTL 控制器
-content_template: templates/concept
+content_type: concept
 weight: 65
 ---
 <!--
@@ -8,12 +8,12 @@ weight: 65
 reviewers:
 - janetkuo
 title: TTL Controller for Finished Resources
-content_template: templates/concept
+content_type: concept
 weight: 65
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.12" state="alpha" >}}
 
@@ -33,10 +33,10 @@ Alpha Disclaimer: this feature is currently alpha, and can be enabled with both
 -->
 Alpha 免责声明：此功能目前是 alpha 版，并且可以通过 kube-apiserver 和 kube-controller-manager [特性开关](/docs/reference/command-line-tools-reference/feature-gates/) `TTLAfterFinished` 启用。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## TTL Controller
@@ -124,9 +124,10 @@ very small. Please be aware of this risk when setting a non-zero TTL.
 -->
 在 Kubernetes 中，需要在所有节点上运行 NTP（参见 [#6159](https://github.com/kubernetes/kubernetes/issues/6159#issuecomment-93844058)）以避免时间偏差。时钟并不总是如此正确，但差异应该很小。设置非零 TTL 时请注意避免这种风险。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 [Clean up Jobs automatically](/docs/concepts/workloads/controllers/jobs-run-to-completion/#clean-up-finished-jobs-automatically)
@@ -138,4 +139,4 @@ very small. Please be aware of this risk when setting a non-zero TTL.
 -->
 [设计文档](https://github.com/kubernetes/enhancements/blob/master/keps/sig-apps/0026-ttl-after-finish.md)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/disruptions.md b/content/zh/docs/concepts/workloads/pods/disruptions.md
index 1dba6de60c..7c53f556bd 100644
--- a/content/zh/docs/concepts/workloads/pods/disruptions.md
+++ b/content/zh/docs/concepts/workloads/pods/disruptions.md
@@ -1,6 +1,6 @@
 ---
 title: 干扰
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
@@ -11,12 +11,12 @@ reviewers:
 - foxish
 - davidopp
 title: Disruptions
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This guide is for application owners who want to build
 highly available applications, and thus need to understand
@@ -32,10 +32,10 @@ cluster actions, like upgrading and autoscaling clusters.
 
 文档同样适用于想要执行自动化集群操作（例如升级和自动扩展集群）的集群管理员。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Voluntary and Involuntary Disruptions
@@ -511,10 +511,11 @@ the nodes in your cluster, such as a node or system software upgrade, here are s
    - 编写可容忍干扰的应用程序是棘手的，但对于支持容忍自愿干扰所做的工作，和支持自动扩缩和容忍非
    愿干扰所做工作相比，有大量的重叠
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Follow steps to protect your application by [configuring a Pod Disruption Budget](/docs/tasks/run-application/configure-pdb/).
@@ -529,4 +530,4 @@ the nodes in your cluster, such as a node or system software upgrade, here are s
 
 * 了解更多关于[排空节点](/docs/tasks/administer-cluster/safely-drain-node/)的信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/ephemeral-containers.md b/content/zh/docs/concepts/workloads/pods/ephemeral-containers.md
index fec1c986bf..7e9a894d8d 100644
--- a/content/zh/docs/concepts/workloads/pods/ephemeral-containers.md
+++ b/content/zh/docs/concepts/workloads/pods/ephemeral-containers.md
@@ -1,6 +1,6 @@
 ---
 title: 临时容器
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 
@@ -10,12 +10,12 @@ reviewers:
 - verb
 - yujuhong
 title: Ephemeral Containers
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="alpha" for_k8s_version="v1.16" >}}
 
@@ -40,9 +40,9 @@ feature could change significantly in the future or be removed entirely.
 临时容器处于早期的 alpha 阶段，不适用于生产环境集群。应该预料到临时容器在某些情况下不起作用，例如在定位容器的命名空间时。根据 [Kubernetes 弃用政策](/docs/reference/using-api/deprecation-policy/)，该 alpha 功能将来可能发生重大变化或完全删除。
 {{< /warning >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Understanding ephemeral containers
@@ -321,4 +321,4 @@ PID   USER     TIME  COMMAND
    29 root      0:00 ps auxww
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/init-containers.md b/content/zh/docs/concepts/workloads/pods/init-containers.md
index 9228d9b2b0..0600c36b30 100644
--- a/content/zh/docs/concepts/workloads/pods/init-containers.md
+++ b/content/zh/docs/concepts/workloads/pods/init-containers.md
@@ -2,10 +2,10 @@
 approvers:
 - erictune
 title: Init 容器
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page provides an overview of init containers: specialized containers that run before app containers in a {{< glossary_tooltip text="Pod" term_id="pod" >}}.
@@ -13,14 +13,14 @@ Init containers can contain utilities or setup scripts not present in an app ima
 -->
 
 本页提供了 Init 容器的概览，它是一种专用的容器，在{{< glossary_tooltip text="Pod" term_id="pod" >}}内的应用容器启动之前运行，并包括一些应用镜像中不存在的实用工具和安装脚本。
-{{% /capture %}}
+
 
 
 <!--
   You can specify init containers in the Pod specification alongside the `containers` array (which describes app containers).
 -->
 你可以在Pod的规格信息中与containers数组同级的位置指定 Init 容器。
-{{% capture body %}}
+<!-- body -->
 
 
 <!--
@@ -432,10 +432,11 @@ Pod重启导致 Init 容器重新执行，主要有如下几个原因：
 * 当 `restartPolicy` 设置为 Always，Pod 中所有容器会终止而强制重启，由于垃圾收集导致 Init 容器的完成记录丢失。
 
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read about [creating a Pod that has an init container](/docs/tasks/configure-pod-container/configure-pod-initialization/#create-a-pod-that-has-an-init-container)
@@ -444,4 +445,4 @@ Pod重启导致 Init 容器重新执行，主要有如下几个原因：
 
 * 阅读[创建包含 Init 容器的 Pod](/docs/tasks/configure-pod-container/configure-pod-initialization/#create-a-pod-that-has-an-init-container)
 * 学习如何[调测 Init 容器](/docs/tasks/debug-application-cluster/debug-init-containers/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/pod-lifecycle.md b/content/zh/docs/concepts/workloads/pods/pod-lifecycle.md
index 679fc29cd5..767c18bdd2 100644
--- a/content/zh/docs/concepts/workloads/pods/pod-lifecycle.md
+++ b/content/zh/docs/concepts/workloads/pods/pod-lifecycle.md
@@ -1,18 +1,18 @@
 ---
 title: Pod 的生命周期
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< comment >}}Updated: 4/14/2015{{< /comment >}}
 {{< comment >}}Edited and moved to Concepts section: 2/2/17{{< /comment >}}
 
 该页面将描述 Pod 的生命周期。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## Pod phase
 
@@ -174,7 +174,7 @@ spec:
   - 节点控制器将 Pod `phase` 设置为 Failed。
   - 如果是用控制器来运行，Pod 将在别处重建。
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/concepts/workloads/pods/pod-overview.md b/content/zh/docs/concepts/workloads/pods/pod-overview.md
index adccc41e94..d9c8423450 100644
--- a/content/zh/docs/concepts/workloads/pods/pod-overview.md
+++ b/content/zh/docs/concepts/workloads/pods/pod-overview.md
@@ -1,6 +1,6 @@
 ---
 title: Pod 概览
-content_template: templates/concept
+content_type: concept
 weight: 10
 card: 
   name: 概念
@@ -12,7 +12,7 @@ card:
 reviewers:
 - erictune
 title: Pod Overview
-content_template: templates/concept
+content_type: concept
 weight: 10
 card: 
   name: concepts
@@ -23,12 +23,12 @@ card:
 <!--
 This page provides an overview of `Pod`, the smallest deployable object in the Kubernetes object model.
 -->
-{{% capture overview %}}
+<!-- overview -->
 本节提供了 `Pod` 的概览信息，`Pod` 是最小可部署的 Kubernetes 对象模型。
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Understanding Pods
@@ -248,7 +248,7 @@ Pod 模板就像饼干切割器，而不是指定所有副本的当前期望状
 这与 Pod 形成有意的对比，Pod 指定了属于 Pod 的所有容器的当前期望状态。
 这种方法从根本上简化了系统语义，增加了原语的灵活性。
 
-{{% /capture %}}
+
 
 <!--
 * Learn more about [Pods](/docs/concepts/workloads/pods/pod/)
@@ -256,9 +256,10 @@ Pod 模板就像饼干切割器，而不是指定所有副本的当前期望状
   * [Pod Termination](/docs/concepts/workloads/pods/pod/#termination-of-pods)
   * [Pod Lifecycle](/docs/concepts/workloads/pods/pod-lifecycle/)
 -->
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
+
 * 详细了解 [Pod](/docs/concepts/workloads/pods/pod/)
 * 了解有关 Pod 行为的更多信息：
   * [Pod 的终止](/docs/concepts/workloads/pods/pod/#termination-of-pods)
   * [Pod 的生命周期](/docs/concepts/workloads/pods/pod-lifecycle/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/pod-topology-spread-constraints.md b/content/zh/docs/concepts/workloads/pods/pod-topology-spread-constraints.md
index 96200f706e..826ca5bd78 100644
--- a/content/zh/docs/concepts/workloads/pods/pod-topology-spread-constraints.md
+++ b/content/zh/docs/concepts/workloads/pods/pod-topology-spread-constraints.md
@@ -1,20 +1,20 @@
 ---
 title: Pod 拓扑扩展约束
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
 <!--
 
 title: Pod Topology Spread Constraints
-content_template: templates/concept
+content_type: concept
 weight: 50
 
 ---
 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.16" state="alpha" >}}
 
@@ -24,9 +24,9 @@ You can use _topology spread constraints_ to control how {{< glossary_tooltip te
 
 可以使用*拓扑扩展约束*来控制 {{< glossary_tooltip text="Pods" term_id="Pod" >}} 在集群内故障域（例如地区，区域，节点和其他用户自定义拓扑域）之间的分布。这可以帮助实现高可用以及提升资源利用率。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Prerequisites
@@ -399,4 +399,4 @@ As of 1.16, at which this feature is Alpha, there are some known limitations:
 - `Deployment` 的缩容可能导致 pod 分布不平衡。
 - pod 匹配到污点节点是允许的。参考 [Issue 80921](https://github.com/kubernetes/kubernetes/issues/80921)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/pod.md b/content/zh/docs/concepts/workloads/pods/pod.md
index bd1f67ba77..b0a0486280 100644
--- a/content/zh/docs/concepts/workloads/pods/pod.md
+++ b/content/zh/docs/concepts/workloads/pods/pod.md
@@ -1,17 +1,17 @@
 ---
 title: Pods
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
 <!--
 reviewers:
 title: Pods
-content_template: templates/concept
+content_type: concept
 weight: 20
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 _Pods_ are the smallest deployable units of computing that can be created and
@@ -20,10 +20,10 @@ managed in Kubernetes.
 
 _Pod_ 是可以在 Kubernetes 中创建和管理的、最小的可部署的计算单元。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## What is a Pod?
@@ -384,4 +384,4 @@ describes the object in detail.
 Pod 是 Kubernetes REST API 中的顶级资源。
 [Pod API 对象](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#pod-v1-core)定义详细描述了该 Pod 对象。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/concepts/workloads/pods/podpreset.md b/content/zh/docs/concepts/workloads/pods/podpreset.md
index 9ce37abae4..69b052b868 100644
--- a/content/zh/docs/concepts/workloads/pods/podpreset.md
+++ b/content/zh/docs/concepts/workloads/pods/podpreset.md
@@ -1,6 +1,6 @@
 ---
 title: Pod Preset
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
@@ -9,7 +9,7 @@ weight: 50
 reviewers:
 - jessfraz
 title: Pod Preset
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 -->
@@ -19,12 +19,12 @@ This page provides an overview of PodPresets, which are objects for injecting
 certain information into pods at creation time. The information can include
 secrets, volumes, volume mounts, and environment variables.
 -->
-{{% capture overview %}}
+<!-- overview -->
 本文提供了 PodPreset 的概述。 在 Pod 创建时，用户可以使用 PodPreset 对象将特定信息注入 Pod 中，这些信息可以包括 secret、 卷、卷挂载和环境变量。
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Understanding Pod Presets
@@ -164,12 +164,13 @@ In order to use Pod Presets in your cluster you must ensure the following:
 1.  已经通过在相应的命名空间中创建 `PodPreset` 对象，定义了 Pod Preset。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * [Injecting data into a Pod using PodPreset](/docs/tasks/inject-data-application/podpreset/)
 -->
 * [使用 PodPreset 将信息注入 Pod](/docs/tasks/inject-data-application/podpreset/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/_index.md b/content/zh/docs/contribute/_index.md
index 426e6a773a..d826160593 100644
--- a/content/zh/docs/contribute/_index.md
+++ b/content/zh/docs/contribute/_index.md
@@ -1,5 +1,5 @@
 ---
-content_template: templates/concept
+content_type: concept
 title: 为 Kubernetes 文档做贡献
 linktitle: 贡献
 main_menu: true
@@ -8,7 +8,7 @@ weight: 80
 
 <!--
 ---
-content_template: templates/concept
+content_type: concept
 title: Contribute to Kubernetes docs
 linktitle: Contribute
 main_menu: true
@@ -16,7 +16,7 @@ weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 If you would like to help contribute to the Kubernetes documentation or website,
@@ -42,9 +42,9 @@ Looking for the [style guide](/docs/contribute/style/style-guide/) or the
 
 查找 [样式指南](/docs/contribute/style/style-guide/) 或者 [Kubernetes 社区网站](/community/)？
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Types of contributor
@@ -188,4 +188,4 @@ documentation, but it should help you get started.
 
 - 如果您要开发新的特性，请阅读 [contributor cheatsheet](https://github.com/kubernetes/community/tree/master/contributors/guide/contributor-cheatsheet).
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/advanced.md b/content/zh/docs/contribute/advanced.md
index 743e07171c..a01c6c632d 100644
--- a/content/zh/docs/contribute/advanced.md
+++ b/content/zh/docs/contribute/advanced.md
@@ -1,19 +1,19 @@
 ---
 title: 高级贡献
 slug: advanced
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 <!--
 ---
 title: Advanced contributing
 slug: advanced
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page assumes that you've read and mastered the
@@ -24,9 +24,9 @@ client and other tools for some of these tasks.
 -->
 如果你已经阅读并掌握[开始贡献](/docs/contribute/start/)和[中级贡献](/docs/contribute/intermediate/)，并准备了解更多贡献的途径，请阅读此文。您需要使用 Git 命令行工具和其他工具做这些工作。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Be the PR Wrangler for a week
@@ -470,4 +470,4 @@ The video uploads automatically to YouTube.
 
 视频会自动上传到 YouTube。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/generate-ref-docs/contribute-upstream.md b/content/zh/docs/contribute/generate-ref-docs/contribute-upstream.md
index 0e4863e31b..f71871b296 100644
--- a/content/zh/docs/contribute/generate-ref-docs/contribute-upstream.md
+++ b/content/zh/docs/contribute/generate-ref-docs/contribute-upstream.md
@@ -1,15 +1,15 @@
 ---
 title: 为上游 Kubernetes 代码库做出贡献
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Contributing to the Upstream Kubernetes Code
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to contribute to the upstream kubernetes/kubernetes project
@@ -31,10 +31,11 @@ API or the `kube-*` components from the upstream code, see the following instruc
 - [生成 Kubernetes API 的参考文档](/docs/contribute/generate-ref-docs/kubernetes-api/)
 - [生成 Kubernetes 组件和工具的参考文档](/docs/contribute/generate-ref-docs/kubernetes-components/)
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 You need to have these tools installed:
@@ -70,10 +71,10 @@ information, see
 [GitHub 标准 Fork 和 PR 工作流程](https://gist.github.com/Chaser324/ce0505fbed06b947d962)。
 
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## The big picture
@@ -388,9 +389,10 @@ You are now ready to follow the [Generating Reference Documentation for the Kube
 现在，您可以按照[生成 Kubernetes API 的参考文档](/docs/contribute/generate-ref-docs/kubernetes-api/)指南来生成
 [已发布的 Kubernetes API 参考文档](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Generating Reference Documentation for the Kubernetes API](/docs/contribute/generate-ref-docs/kubernetes-api/)
@@ -401,5 +403,5 @@ You are now ready to follow the [Generating Reference Documentation for the Kube
 * [为 Kubernetes 组件和工具生成参考文档](/docs/home/contribute/generated-reference/kubernetes-components/)
 * [生成 kubectl 命令的参考文档](/docs/home/contribute/generated-reference/kubectl/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/contribute/generate-ref-docs/kubectl.md b/content/zh/docs/contribute/generate-ref-docs/kubectl.md
index 897a301d37..c482111747 100644
--- a/content/zh/docs/contribute/generate-ref-docs/kubectl.md
+++ b/content/zh/docs/contribute/generate-ref-docs/kubectl.md
@@ -1,16 +1,16 @@
 ---
 title: 为 kubectl 命令集生成参考文档
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Generating Reference Documentation for kubectl Commands
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to automatically generate reference pages for the
@@ -38,10 +38,11 @@ reference page, see
 本主题没有展示如何生成 [kubectl](/docs/reference/generated/kubectl/kubectl/) 组件的参考页面。相关说明请参见[为 Kubernetes 组件和工具生成参考页面](/docs/home/contribute/generated-reference/kubernetes-components/)。
 {{< /note >}}
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * You need to have
@@ -76,10 +77,10 @@ information, see
 
 * 你需要知道如何在一个 GitHub 项目仓库中创建一个 PR。一般来说，这涉及到创建仓库的一个分支。想了解更多信息，请参见[创建一个文档 PR](/docs/home/contribute/create-pull-request/) 和 [GitHub 标准 Fork & PR 工作流](https://gist.github.com/Chaser324/ce0505fbed06b947d962)。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Setting up the local repositories
@@ -470,9 +471,10 @@ topics will be visible in the
 在 PR 合入的几分钟后，你更新的参考主题将出现在[已发布文档](/docs/home/)中。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Generating Reference Documentation for Kubernetes Components and Tools](/docs/home/contribute/generated-reference/kubernetes-components/)
@@ -484,4 +486,3 @@ topics will be visible in the
 * [为 Kubernetes API 生成参考文档](/docs/home/contribute/generated-reference/kubernetes-api/)
 * [为 Kubernetes 联邦 API 生成参考文档](/docs/home/contribute/generated-reference/federation-api/)
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/contribute/generate-ref-docs/kubernetes-api.md b/content/zh/docs/contribute/generate-ref-docs/kubernetes-api.md
index f8b05a6aca..c31b9a2909 100644
--- a/content/zh/docs/contribute/generate-ref-docs/kubernetes-api.md
+++ b/content/zh/docs/contribute/generate-ref-docs/kubernetes-api.md
@@ -1,15 +1,15 @@
 ---
 title: 为 Kubernetes API 生成参考文档
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Generating Reference Documentation for the Kubernetes API
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to update the generated reference docs for the Kubernetes API.
@@ -30,10 +30,11 @@ Kubernetes API 参考文档是从 [Kubernetes OpenAPI 规范](https://github.com
 
 如果您只需要从 [OpenAPI](https://github.com/OAI/OpenAPI-Specification) 规范中重新生成参考文档，请继续阅读此页面。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 You need to have these tools installed:
@@ -58,10 +59,10 @@ information, see
 -->
 你需要知道如何在一个 GitHub 项目仓库中创建一个 PR。一般来说，这涉及到创建仓库的 fork 分支。想了解更多信息，请参见[创建一个文档 PR](/docs/contribute/start/) 和 [GitHub 标准 Fork & PR 工作流](https://gist.github.com/Chaser324/ce0505fbed06b947d962)。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- 
 ## Setting up the local repositories
@@ -348,9 +349,10 @@ to monitor your pull request until it has been merged.
 -->
 将您的更改[创建 PR](/docs/contribute/start/) 提交到 [kubernetes/website](https://github.com/kubernetes/website) 仓库。监视您提交的 PR，并根据需要回复 reviewer 的评论。继续监视您的 PR，直到合并为止。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Generating Reference Docs for Kubernetes Components and Tools](/docs/home/contribute/generated-reference/kubernetes-components/)
@@ -361,4 +363,3 @@ to monitor your pull request until it has been merged.
 * [为 kubectl 命令集生成参考文档](/docs/home/contribute/generated-reference/kubectl/)
 * [为 Kubernetes 联邦 API 生成参考文档](/docs/home/contribute/generated-reference/federation-api/)
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/contribute/generate-ref-docs/kubernetes-components.md b/content/zh/docs/contribute/generate-ref-docs/kubernetes-components.md
index 1bd7b2fe22..676575d2cc 100644
--- a/content/zh/docs/contribute/generate-ref-docs/kubernetes-components.md
+++ b/content/zh/docs/contribute/generate-ref-docs/kubernetes-components.md
@@ -1,16 +1,16 @@
 ---
 title: 为 Kubernetes 组件和工具生成参考页面
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Generating Reference Pages for Kubernetes Components and Tools
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to use the `update-imported-docs` tool to generate
@@ -21,9 +21,10 @@ reference documentation for tools and components in the
 
 本页面展示了如何使用 `update-imported-docs` 工具来为 [Kubernetes](https://github.com/kubernetes/kubernetes) 和 [Federation](https://github.com/kubernetes/federation) 仓库中的工具和组件生成参考文档。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * You need a machine that is running Linux or macOS.
@@ -68,9 +69,9 @@ information, see
 
 * 你需要知道如何在一个 GitHub 项目仓库中创建一个 PR。一般来说，这涉及到创建仓库的一个分支。想了解更多信息，请参见[创建一个文档 PR](/docs/home/contribute/create-pull-request/)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Getting two repositories
@@ -395,9 +396,10 @@ topics will be visible in the
 
 在 PR 合入的几分钟后，你更新的参考主题将出现在[已发布文档](/docs/home/)中。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Generating Reference Documentation for kubectl Commands](/docs/home/contribute/generated-reference/kubectl/) 
@@ -409,4 +411,3 @@ topics will be visible in the
 * [为 Kubernetes API 生成参考文档](/docs/home/contribute/generated-reference/kubernetes-api/)
 * [为 Kubernetes 联邦 API 生成参考文档](/docs/home/contribute/generated-reference/federation-api/)
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/contribute/intermediate.md b/content/zh/docs/contribute/intermediate.md
index b7ae9e36f7..882904ffcb 100644
--- a/content/zh/docs/contribute/intermediate.md
+++ b/content/zh/docs/contribute/intermediate.md
@@ -1,7 +1,7 @@
 ---
 title: 中级贡献
 slug: intermediate
-content_template: templates/concept
+content_type: concept
 weight: 20
 card:
   name: contribute
@@ -11,7 +11,7 @@ card:
 ---
 title: Intermediate contributing
 slug: intermediate
-content_template: templates/concept
+content_type: concept
 weight: 20
 card:
   name: contribute
@@ -19,7 +19,7 @@ card:
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page assumes that you've read and mastered the tasks in the
@@ -36,9 +36,9 @@ Some tasks require you to use the Git command line client and other tools.
 有些任务需要使用 Git 命令行客户端和其他工具。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 Now that you've gotten your feet wet and helped out with the Kubernetes docs in
@@ -1436,9 +1436,10 @@ Follow these guidelines for working with localized content:
   
     如果 PR 包含对一种以上源语言的更改，请 PR 贡献者为每种语言打开单独的 PR。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 When you are comfortable with all of the tasks discussed in this topic and you
@@ -1447,4 +1448,4 @@ want to engage with the Kubernetes docs team in even deeper ways, read the
 -->
 如果您熟悉本主题中讨论的所有任务，并且想与 Kubernetes 文档小组进行更深入的接触，
 请阅读[文档高级贡献者](/docs/contribute/advanced/)主题。
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/localization.md b/content/zh/docs/contribute/localization.md
index ed6181e989..bad833c974 100644
--- a/content/zh/docs/contribute/localization.md
+++ b/content/zh/docs/contribute/localization.md
@@ -1,6 +1,6 @@
 ---
 title: 本地化 Kubernetes 文档
-content_template: templates/concept
+content_type: concept
 card:
   name: contribute
   weight: 30
@@ -9,7 +9,7 @@ card:
 <!-- 
 ---
 title: Localizing Kubernetes Documentation
-content_template: templates/concept
+content_type: concept
 approvers:
 - remyleone
 - rlenferink
@@ -21,16 +21,16 @@ card:
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- 
 This page shows you how to [localize](https://blog.mozilla.org/l10n/2011/12/14/i18n-vs-l10n-whats-the-diff/) the docs for a different language. 
 -->
 此页面显示了如何为其他语言的文档提供[本地化](https://blog.mozilla.org/l10n/2011/12/14/i18n-vs-l10n-whats-the-diff/)。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- 
 ## Getting started
@@ -540,9 +540,10 @@ You can also help add or improve content to an existing localization. Join the [
 -->
 您还可以向现有本地化添加或改进内容提供帮助。加入 [Slack 频道](https://kubernetes.slack.com/messages/C1J0BPD2M/)进行本地化，然后开始新建 PR 来提供帮助。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- 
 Once a localization meets requirements for workflow and minimum output, SIG docs will: 
@@ -556,4 +557,4 @@ Once a localization meets requirements for workflow and minimum output, SIG docs
 - 在网站上启用语言选择
 - 通过[Cloud Native Computing Foundation](https://www.cncf.io/about/) (CNCF) 频道, 包括[ Kubernetes 博客](https://kubernetes.io/blog/)公开本地化的可用性。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/participating.md b/content/zh/docs/contribute/participating.md
index 3d0fed1229..5be3a872c8 100644
--- a/content/zh/docs/contribute/participating.md
+++ b/content/zh/docs/contribute/participating.md
@@ -1,12 +1,12 @@
 ---
 title: 参与 SIG Docs
-content_template: templates/concept
+content_type: concept
 card:
   name: contribute
   weight: 40
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 SIG Docs is one of the
@@ -42,9 +42,9 @@ aspects of Kubernetes -- the Kubernetes website and documentation.
 有关 Kubernetes 社区中的成员如何工作的更多信息，请参见 [community-membership](https://github.com/kubernetes/community/blob/master/community-membership.md)。
 本文档的其余部分概述了这些角色在 SIG Docs 中发挥作用的一些独特方式，
 SIG Docs 负责维护 Kubernetes 最面向公众的方面之一 —— Kubernetes 网站和文档。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Roles and responsibilities
@@ -515,9 +515,10 @@ and editorial review of their PR.
 -->
 结合 OWNERS 文件及扉页可以给 PR 作者提供向谁请求检视的建议。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 For more information about contributing to the Kubernetes documentation, see:
@@ -527,6 +528,6 @@ For more information about contributing to the Kubernetes documentation, see:
 - [Start contributing](/docs/contribute/start/)
 - [Documentation style](/docs/contribute/style/)
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/contribute/start.md b/content/zh/docs/contribute/start.md
index f3735e83e0..40da4e7e4a 100644
--- a/content/zh/docs/contribute/start.md
+++ b/content/zh/docs/contribute/start.md
@@ -1,7 +1,7 @@
 ---
 title: 开始贡献
 slug: start
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: contribute
@@ -11,7 +11,7 @@ card:
 ---
 title: Start contributing
 slug: start
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: contribute
@@ -19,7 +19,7 @@ card:
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- 
 If you want to get started contributing to the Kubernetes documentation, this
@@ -36,10 +36,10 @@ code repositories, refer to
 
 如果您在寻找有关如何开始向 Kubernetes 仓库贡献代码的信息，请参考 [Kubernetes 社区指南](https://github.com/kubernetes/community/blob/master/governance.md)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- 
 ## The basics about our docs 
@@ -620,9 +620,10 @@ to submit your proposal.
 看一下[现有案例研究](https://github.com/kubernetes/website/tree/master/content/en/case-studies)的源码。
 使用 [Kubernetes 案例研究提交表](https://www.cncf.io/people/end-user-community/)提交您的提案。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- 
 When you are comfortable with all of the tasks discussed in this topic and you
@@ -631,4 +632,4 @@ want to engage with the Kubernetes docs team in deeper ways, read the
 -->
 当您对本主题中讨论的所有任务感到满意，并且您希望以更深入的方式与 Kubernetes 文档团队合作，请阅读[中级贡献者指南](/docs/contribute/intermediate/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/style/content-organization.md b/content/zh/docs/contribute/style/content-organization.md
index 3ce7964655..b8976252fc 100644
--- a/content/zh/docs/contribute/style/content-organization.md
+++ b/content/zh/docs/contribute/style/content-organization.md
@@ -1,19 +1,19 @@
 ---
 title: 内容组织
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
 <!--
 ---
 title: Content organization
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This site uses Hugo. In Hugo, [content organization](https://gohugo.io/content-management/organization/) is a core concept.
@@ -21,9 +21,9 @@ This site uses Hugo. In Hugo, [content organization](https://gohugo.io/content-m
 
 本网站使用了 Hugo。在 Hugo 中，[内容组织](https://gohugo.io/content-management/organization/) 是一个核心概念。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 {{% note %}}
 <!--
@@ -255,9 +255,10 @@ The `SASS` source of the stylesheets for this site is stored below `src/sass` an
 
 本网站的样式表的 `SASS` 源存储在 `src/sass` 下面，可以用 `make sass` 构建（Hugo很快就会得到 `SASS` 的支持，参见https://github.com/gohugoio/hugo/issues/4243）。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Custom Hugo shortcodes](/docs/contribute/style/hugo-shortcodes/)
@@ -267,4 +268,4 @@ The `SASS` source of the stylesheets for this site is stored below `src/sass` an
 * [定制 Hugo 短代码](/docs/contribute/style/hugo-shortcodes/)
 * [样式指南](/docs/contribute/style/style-guide)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/style/hugo-shortcodes/index.md b/content/zh/docs/contribute/style/hugo-shortcodes/index.md
index b3d06b93be..8f9a3a260b 100644
--- a/content/zh/docs/contribute/style/hugo-shortcodes/index.md
+++ b/content/zh/docs/contribute/style/hugo-shortcodes/index.md
@@ -2,25 +2,25 @@
 approvers:
 - chenopis
 title: 定制 Hugo 短代码
-content_template: templates/concept
+content_type: concept
 ---
 
 <!-- ---
 approvers:
 - chenopis
 title: Custom Hugo Shortcodes
-content_template: templates/concept
+content_type: concept
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page explains the custom Hugo shortcodes that can be used in Kubernetes markdown documentation. -->
 本页面将介绍定制 Hugo 短代码，可以用于 Kubernetes markdown 文档书写。
 
 <!-- Read more about shortcodes in the [Hugo documentation](https://gohugo.io/content-management/shortcodes). -->
 更多关于短代码参见 [Hugo 文档](https://gohugo.io/content-management/shortcodes)。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!-- ## Feature state -->
 ## 功能状态
 
@@ -256,9 +256,10 @@ println "This is tab 2."
 {{< /tabs >}}
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- * Learn about [Hugo](https://gohugo.io/).
 * Learn about [writing a new topic](/docs/home/contribute/write-new-topic/).
 * Learn about [using page templates](/docs/home/contribute/page-templates/).
@@ -270,4 +271,4 @@ println "This is tab 2."
 * 了解 [使用页面模板](/docs/home/contribute/page-templates/)。
 * 了解 [暂存修改](/docs/home/contribute/stage-documentation-changes/)。
 * 了解 [创建 pull request](/docs/home/contribute/create-pull-request/)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/style/page-templates.md b/content/zh/docs/contribute/style/page-templates.md
index 6eb1d5f9bd..fc427417a8 100644
--- a/content/zh/docs/contribute/style/page-templates.md
+++ b/content/zh/docs/contribute/style/page-templates.md
@@ -1,18 +1,18 @@
 ---
 title: 使用页面模板
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 <!--
 ---
 title: Using Page Templates
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 When contributing new topics, apply one of the following templates to them.
@@ -42,10 +42,10 @@ template to use for a new topic, start with the
 {{< /note >}}
 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Concept template
@@ -72,12 +72,12 @@ To write a new concept page, create a Markdown file in a subdirectory of the
 要编写新的概念页面，请在 `/content/en/docs/concepts` 目录的子目录中创建一个 Markdown 文件，其特点如下：
 
 <!--
-- In the page's YAML front-matter, set `content_template: templates/concept`.
+- In the page's YAML front-matter, set `content_type: concept`.
 - In the page's body, set the required `capture` variables and any optional
   ones you want to include:
 -->
 
-- 在页面的 YAML 头部，设置 `content_template: templates/concept`。
+- 在页面的 YAML 头部，设置 `content_type: concept`。
 - 在页面的 body 中，设置所需的 `capture` 变量和所有想要包含的变量：
 
     | 变量          | 必需?     |
@@ -153,12 +153,12 @@ To write a new task page, create a Markdown file in a subdirectory of the
 要编写新的任务页面，请在 `/content/en/docs/tasks` 目录的子目录中创建一个 Markdown 文件，其特点如下：
 
 <!--
-- In the page's YAML front-matter, set `content_template: templates/task`.
+- In the page's YAML front-matter, set `content_type: task`.
 - In the page's body, set the required `capture` variables and any optional
   ones you want to include:
 -->
 
-- 在页面的 YAML 头部，设置 `content_template: templates/task`。
+- 在页面的 YAML 头部，设置 `content_type: task`。
 - 在页面的 body 中，设置所需的 `capture` 变量和所有想要包含的变量：
 
     | 变量          | 必需?     |
@@ -253,12 +253,12 @@ To write a new tutorial page, create a Markdown file in a subdirectory of the
 要编写新的教程页面，请在 `/content/en/docs/tutorials` 目录的子目录中创建一个 Markdown 文件，其特点如下：
 
 <!--
-- In the page's YAML front-matter, set `content_template: templates/tutorial`.
+- In the page's YAML front-matter, set `content_type: tutorial`.
 - In the page's body, set the required `capture` variables and any optional
   ones you want to include:
 -->
 
-- 在页面的 YAML 头部，设置 `content_template: templates/tutorial`。
+- 在页面的 YAML 头部，设置 `content_type: tutorial`。
 - 在页面的 body 中，设置所需的 `capture` 变量和所有想要包含的变量：
 
     | 变量          | 必需?     |
@@ -337,9 +337,10 @@ An example of a published topic that uses the tutorial template is
 
 使用教程模板的已发布主题的一个示例是[使用部署运行无状态应用程序](/docs/tutorials/stateless-application/run-stateless-application-deployment/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - Learn about the [style guide](/docs/contribute/style/style-guide/)
@@ -349,4 +350,4 @@ An example of a published topic that uses the tutorial template is
 - 学习[样式指南](/docs/contribute/style/style-guide/)
 - 学习[内容组织](/docs/contribute/style/content-organization/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/contribute/style/write-new-topic.md b/content/zh/docs/contribute/style/write-new-topic.md
index bfe1ac919f..671b110881 100644
--- a/content/zh/docs/contribute/style/write-new-topic.md
+++ b/content/zh/docs/contribute/style/write-new-topic.md
@@ -1,34 +1,35 @@
 ---
 title: 撰写新主题
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 
 <!--
 ---
 title: Writing a new topic
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to create a new topic for the Kubernetes docs.
 -->
 本页面展示如何为 Kubernetes 文档库创建新主题。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 Create a fork of the Kubernetes documentation repository as described in
 [Start contributing](/docs/contribute/start/).
 -->
 
 如[开始贡献](/docs/contribute/start/)中所述，创建 Kubernetes 文档库的分支。
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Choosing a page type
@@ -305,15 +306,16 @@ image format is SVG.
 
 将镜像文件放入 `/images` 目录。首选的镜像格式是 SVG。
 
-{{% /capture %}}
+
 
 <!--
 * Learn about [using page templates](/docs/home/contribute/page-templates/).
 * Learn about [staging your changes](/docs/home/contribute/stage-documentation-changes/).
 * Learn about [creating a pull request](/docs/home/contribute/create-pull-request/).
 -->
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
+
 * 学习[使用页面模板](/docs/home/contribute/page-templates/)。
 * 学习[展示你的修改](/docs/home/contribute/stage-documentation-changes/)。
 * 学习[创建一个拉取请求](/docs/home/contribute/create-pull-request/)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/home/supported-doc-versions.md b/content/zh/docs/home/supported-doc-versions.md
index 986155dc0f..31c3831690 100644
--- a/content/zh/docs/home/supported-doc-versions.md
+++ b/content/zh/docs/home/supported-doc-versions.md
@@ -1,19 +1,19 @@
 ---
 title: Kubernetes 文档支持的版本
-content_template: templates/concept
+content_type: concept
 card:
   name: about
   weight: 10
   title: Kubernetes 文档支持的版本
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本网站包含当前版本和之前四个版本的 Kubernetes 文档。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 当前版本
 
@@ -24,6 +24,6 @@ card:
 
 {{< versions-other >}}
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/reference/_index.md b/content/zh/docs/reference/_index.md
index d6e4af5a77..2c49c689d1 100644
--- a/content/zh/docs/reference/_index.md
+++ b/content/zh/docs/reference/_index.md
@@ -3,7 +3,7 @@ title: 参考
 linkTitle: "参考"
 main_menu: true
 weight: 70
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -14,20 +14,20 @@ approvers:
 linkTitle: "Reference"
 main_menu: true
 weight: 70
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This section of the Kubernetes documentation contains references.
 -->
 这是 Kubernetes 文档的参考部分。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## API 参考
 
@@ -122,4 +122,4 @@ Kubernetes 功能的设计文档归档，不妨考虑从 [Kubernetes 架构](htt
 An archive of the design docs for Kubernetes functionality. Good starting points are [Kubernetes Architecture](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md) and [Kubernetes Design Overview](https://git.k8s.io/community/contributors/design-proposals).
 
 -->
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/access-authn-authz/abac.md b/content/zh/docs/reference/access-authn-authz/abac.md
index b39aa418f3..7274053412 100644
--- a/content/zh/docs/reference/access-authn-authz/abac.md
+++ b/content/zh/docs/reference/access-authn-authz/abac.md
@@ -5,7 +5,7 @@ approvers:
 - deads2k
 - liggitt
 title: 使用 ABAC 鉴权
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -16,21 +16,21 @@ reviewers:
 - deads2k
 - liggitt
 title: Using ABAC Authorization
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Attribute-based access control (ABAC) defines an access control paradigm whereby access rights are granted to users through the use of policies which combine attributes together.
 -->
 基于属性的访问控制（Attribute-based access control - ABAC）定义了访问控制范例，其中通过使用将属性组合在一起的策略来向用户授予访问权限。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Policy File Format
@@ -311,5 +311,5 @@ system:serviceaccount:<namespace>:default
 
 需要重新启动 apiserver 以获取新的策略行。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/reference/access-authn-authz/admission-controllers.md b/content/zh/docs/reference/access-authn-authz/admission-controllers.md
index 86ae3f8e3c..339b3af53d 100755
--- a/content/zh/docs/reference/access-authn-authz/admission-controllers.md
+++ b/content/zh/docs/reference/access-authn-authz/admission-controllers.md
@@ -1,6 +1,6 @@
 ---
 title: 使用准入控制器
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
@@ -14,20 +14,20 @@ reviewers:
 - janetkuo
 - thockin
 title: Using Admission Controllers
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page provides an overview of Admission Controllers.
 -->
 此页面概述了准入控制器。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## What are they?
@@ -1218,4 +1218,4 @@ admission controllers ran in the exact order specified.
 -->
     对于更早期版本，没有验证和变更的概念，并且准入控制器按照指定的确切顺序运行。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/access-authn-authz/authorization.md b/content/zh/docs/reference/access-authn-authz/authorization.md
index a7366e92d5..3c2a08a817 100644
--- a/content/zh/docs/reference/access-authn-authz/authorization.md
+++ b/content/zh/docs/reference/access-authn-authz/authorization.md
@@ -8,17 +8,17 @@ cnapprove:
 - fatalc
 <!-- title: Authorization Overview -->
 title: 授权概述
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- Learn more about Kubernetes authorization, including details about creating
 policies using the supported authorization modules. -->
 了解有关 Kubernetes 授权的更多信息，包括使用支持的授权模块创建策略的详细信息。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!-- In Kubernetes, you must be authenticated (logged in) before your request can be
 authorized (granted permission to access). For information about authentication,
 see [Accessing Control Overview](/docs/reference/access-authn-authz/controlling-access/).
@@ -292,13 +292,13 @@ mode.
 并模拟命名空间中的任何服务帐户并执行帐户可以执行的任何操作。
 无论采用何种授权方式，这都适用。
 {{< /caution >}}
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * To learn more about Authentication, see **Authentication** in [Controlling Access to the Kubernetes API](/docs/reference/access-authn-authz/controlling-access/).
 * To learn more about Admission Control, see [Using Admission Controllers](/docs/reference/access-authn-authz/admission-controllers/).
 -->
 * 要了解有关身份验证的更多信息，请参阅 **身份验证** [控制对 Kubernetes API 的访问](/docs/reference/access-authn-authz/controlling-access/)。
 * 要了解有关准入控制的更多信息，请参阅 [使用准入控制器](/docs/reference/access-authn-authz/admission-controllers/)。
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/reference/access-authn-authz/extensible-admission-controllers.md b/content/zh/docs/reference/access-authn-authz/extensible-admission-controllers.md
index 9f0df8dd7a..e1782b0419 100644
--- a/content/zh/docs/reference/access-authn-authz/extensible-admission-controllers.md
+++ b/content/zh/docs/reference/access-authn-authz/extensible-admission-controllers.md
@@ -1,18 +1,18 @@
 ---
 title: 动态准入控制
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
 <!--
 ---
 title: Dynamic Admission Control
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 In addition to [compiled-in admission plugins](/docs/reference/access-authn-authz/admission-controllers/),
 admission plugins can be developed as extensions and run as webhooks configured at runtime.
@@ -20,9 +20,9 @@ This page describes how to build, configure, use, and monitor admission webhooks
 -->
 除了[内置的 admission 插件](/docs/reference/access-authn-authz/admission-controllers/)，admission 插件可以作为扩展独立开发，并以运行时所配置的 webhook 的形式运行。
 此页面描述了如何构建、配置、使用和监视 admission webhook。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## What are admission webhooks?
 -->
@@ -2174,4 +2174,4 @@ plane, exclude the `kube-system` namespace from being intercepted using a
 意外更改或拒绝 `kube-system` 命名空间中的请求可能会导致控制平面组件停止运行或者导致未知行为发生。
 如果您的 admission webhook 不想修改 Kubernetes 控制平面的行为，请使用 [`namespaceSelector`](#matching-requests-namespaceselector) 避免拦截 `kube-system` 命名空间。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/access-authn-authz/node.md b/content/zh/docs/reference/access-authn-authz/node.md
index c3d149f61e..2f0654dd00 100644
--- a/content/zh/docs/reference/access-authn-authz/node.md
+++ b/content/zh/docs/reference/access-authn-authz/node.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 Node 鉴权
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
 <!-- 
@@ -11,19 +11,19 @@ reviewers:
 - liggitt
 - ericchiang
 title: Using Node Authorization
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 节点鉴权是一种特殊用途的鉴权模式，专门对 kubelet 发出的 API 请求进行鉴权。
 <!-- 
 Node authorization is a special-purpose authorization mode that specifically authorizes API requests made by kubelets.
 -->
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## 概述
 <!-- 
 ## Overview 
@@ -201,4 +201,4 @@ In 1.8, the binding will not be created at all.
 When using RBAC, the `system:node` cluster role will continue to be created,
 for compatibility with deployment methods that bind other users or groups to that role. 
 -->
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/access-authn-authz/rbac.md b/content/zh/docs/reference/access-authn-authz/rbac.md
index 5f3adb0190..3d35e4e8bb 100644
--- a/content/zh/docs/reference/access-authn-authz/rbac.md
+++ b/content/zh/docs/reference/access-authn-authz/rbac.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 RBAC 鉴权
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 
@@ -11,19 +11,19 @@ reviewers:
 - deads2k
 - liggitt
 title: Using RBAC Authorization
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Role-based access control (RBAC) is a method of regulating access to computer or network resources based on the roles of individual users within an enterprise.
 -->
 基于角色（Role）的访问控制（RBAC）是一种基于企业中用户的角色来调节控制对计算机或网络资源的访问方法。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 `RBAC` uses the `rbac.authorization.k8s.io` {{< glossary_tooltip text="API Group" term_id="api-group" >}}
 to drive authorization decisions, allowing admins to dynamically configure policies
@@ -2135,4 +2135,4 @@ kubectl create clusterrolebinding permissive-binding \
 ```
 {{< /warning >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/access-authn-authz/webhook.md b/content/zh/docs/reference/access-authn-authz/webhook.md
index 0078ea15d5..a77f9df2b5 100644
--- a/content/zh/docs/reference/access-authn-authz/webhook.md
+++ b/content/zh/docs/reference/access-authn-authz/webhook.md
@@ -5,7 +5,7 @@ reviewers:
 - deads2k
 - liggitt
 title: Webhook 模式
-content_template: templates/concept
+content_type: concept
 weight: 95
 ---
 <!-- 
@@ -16,19 +16,19 @@ reviewers:
 - deads2k
 - liggitt
 title: Webhook Mode
-content_template: templates/concept
+content_type: concept
 weight: 95
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- 
 A WebHook is an HTTP callback: an HTTP POST that occurs when something happens; a simple event-notification via HTTP POST. A web application implementing WebHooks will POST a message to a URL when certain things happen. 
 -->
 WebHook 是一种 HTTP 回调：某些条件下触发的 HTTP POST 请求；通过 HTTP POST 发送的简单事件通知。一个基于 web 应用实现的 WebHook 会在特定事件发生时把消息发送给特定的 URL。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!-- 
 When specified, mode `Webhook` causes Kubernetes to query an outside REST
 service when determining user privileges. 
@@ -270,6 +270,6 @@ For further documentation refer to the authorization.v1beta1 API objects and
 -->
 更多信息可以参考 authorization.v1beta1 API 对象和[webhook.go](https://github.com/kubernetes/kubernetes/blob/{{< param "githubbranch" >}}/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/reference/command-line-tools-reference/feature-gates.md b/content/zh/docs/reference/command-line-tools-reference/feature-gates.md
index ff51d2549c..b91c41bc79 100644
--- a/content/zh/docs/reference/command-line-tools-reference/feature-gates.md
+++ b/content/zh/docs/reference/command-line-tools-reference/feature-gates.md
@@ -1,18 +1,18 @@
 ---
 weight: 10
 title: 特性门控
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
 ---
 weight: 10
 title: Feature Gates
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page contains an overview of the various feature gates an administrator
 can specify on different Kubernetes components.
@@ -24,9 +24,9 @@ See [feature stages](#feature-stages) for an explanation of the stages for a fea
 
 关于特性各个阶段的说明，请参见[特性阶段](#feature-stages)。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Overview
@@ -776,8 +776,9 @@ Each feature gate is designed for enabling/disabling a specific feature:
 - `WinDSR`：允许 kube-proxy 为 Windows 创建 DSR 负载均衡。
 - `WinOverlay`：允许 kube-proxy 在 Windows 的 overlay 模式下运行。
 
-{{% /capture %}}
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * The [deprecation policy](/docs/reference/using-api/deprecation-policy/) for Kubernetes explains
@@ -786,4 +787,4 @@ Each feature gate is designed for enabling/disabling a specific feature:
 
 * Kubernetes 的 [弃用策略](/docs/reference/using-api/deprecation-policy/) 介绍了项目已移除的特性部件和组件的方法。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/command-line-tools-reference/kube-proxy.md b/content/zh/docs/reference/command-line-tools-reference/kube-proxy.md
index 9d54dbc978..e74d615fa4 100644
--- a/content/zh/docs/reference/command-line-tools-reference/kube-proxy.md
+++ b/content/zh/docs/reference/command-line-tools-reference/kube-proxy.md
@@ -11,7 +11,8 @@ weight: 28
 --- 
 -->
 
-{{% capture synopsis %}}
+## {{% heading "synopsis" %}}
+
 
 
 <!--
@@ -29,9 +30,10 @@ Kubernetes 网络代理在每个节点上运行。网络代理反映了每个节
 kube-proxy [flags]
 ```
 
-{{% /capture %}}
 
-{{% capture options %}}
+
+## {{% heading "options" %}}
+
 
    <table style="width: 100%; table-layout: fixed;">
 <colgroup>
@@ -637,4 +639,4 @@ If set, write the default configuration values to this file and exit.
 
 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/command-line-tools-reference/kube-scheduler.md b/content/zh/docs/reference/command-line-tools-reference/kube-scheduler.md
index 15d47e651b..183bdf46d9 100644
--- a/content/zh/docs/reference/command-line-tools-reference/kube-scheduler.md
+++ b/content/zh/docs/reference/command-line-tools-reference/kube-scheduler.md
@@ -11,7 +11,8 @@ weight: 28
 --- 
 -->
 
-{{% capture synopsis %}}
+## {{% heading "synopsis" %}}
+
 
 
 <!-- 
@@ -29,9 +30,10 @@ Kubernetes 调度器是一个策略丰富、拓扑感知、工作负载特定的
 kube-scheduler [flags]
 ```
 
-{{% /capture %}}
 
-{{% capture options %}}
+
+## {{% heading "options" %}}
+
 
 <table style="width: 100%; table-layout: fixed;">
   <colgroup>
@@ -1013,5 +1015,5 @@ kube-scheduler [flags]
 
 
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/reference/command-line-tools-reference/kubelet.md b/content/zh/docs/reference/command-line-tools-reference/kubelet.md
index 1f53d66045..024c1cece4 100644
--- a/content/zh/docs/reference/command-line-tools-reference/kubelet.md
+++ b/content/zh/docs/reference/command-line-tools-reference/kubelet.md
@@ -4,7 +4,8 @@ content_template: templates/tool-reference
 weight: 28
 ---
 
-{{% capture synopsis %}}
+## {{% heading "synopsis" %}}
+
 
 <!--
 The kubelet is the primary "node agent" that runs on each node. It can register the node with the apiserver using one of: the hostname; a flag to override the hostname; or specific logic for a cloud provider.
@@ -41,10 +42,11 @@ HTTP server（HTTP 服务器）：kubelet 还可以侦听 HTTP 并响应简单
 kubelet [flags]
 ```
 
-{{% /capture %}}
 
 
-{{% capture options %}}
+
+## {{% heading "options" %}}
+
 
    <table style="width: 100%; table-layout: fixed;">
 <colgroup>
@@ -2158,4 +2160,4 @@ Specifies interval for kubelet to calculate and cache the volume disk usage for
 </tbody>
 </table>
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/issues-security/security.md b/content/zh/docs/reference/issues-security/security.md
index 3d773ab822..e188a53abc 100644
--- a/content/zh/docs/reference/issues-security/security.md
+++ b/content/zh/docs/reference/issues-security/security.md
@@ -1,7 +1,7 @@
 ---
 title: Kubernetes 安全和信息披露
 aliases: [security/]
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
@@ -13,18 +13,18 @@ reviewers:
 - erictune
 - philips
 - jessfraz
-content_template: templates/concept
+content_type: concept
 weight: 20
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page describes Kubernetes security and disclosure information.
 -->
 本页面介绍 Kubernetes 安全和信息披露相关的内容。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ## Security Announcements
 -->
@@ -135,4 +135,4 @@ It is reasonable to delay disclosure when the bug or the fix is not yet fully un
 The timeframe for disclosure is from immediate (especially if it's already publicly known) to a few weeks. As a basic default, we expect report date to disclosure date to be on the order of 7 days. The Kubernetes product security team holds the final say when setting a disclosure date.
 -->
 信息披露的时间范围从即时（尤其是已经公开的）到几周。作为一个基本的约定，我们希望报告日期到披露日期的间隔是 7 天。在设置披露日期时，Kubernetes 产品安全团队拥有最终决定权。
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubectl/cheatsheet.md b/content/zh/docs/reference/kubectl/cheatsheet.md
index 43ded7f976..4ef61cac63 100644
--- a/content/zh/docs/reference/kubectl/cheatsheet.md
+++ b/content/zh/docs/reference/kubectl/cheatsheet.md
@@ -4,7 +4,7 @@ reviewers:
 - erictune
 - krousey
 - clove
-content_template: templates/concept
+content_type: concept
 card:
   name: reference
   weight: 30
@@ -15,13 +15,13 @@ reviewers:
 - erictune
 - krousey
 - clove
-content_template: templates/concept
+content_type: concept
 card:
   name: reference
   weight: 30
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- See also: [Kubectl Overview](/docs/reference/kubectl/overview/) and [JsonPath Guide](/docs/reference/kubectl/jsonpath). -->
 也可以看下: [Kubectl 概述](/docs/reference/kubectl/overview/) 和 [JsonPath 指南](/docs/reference/kubectl/jsonpath)。
@@ -29,9 +29,9 @@ card:
 <!-- This page is an overview of the `kubectl` command. -->
 本页面是 `kubectl` 命令的概述。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- # kubectl - Cheat Sheet -->
 ## kubectl - 备忘单
@@ -657,9 +657,10 @@ Kubectl 日志输出详细程度是通过 `-v` 或者 `--v` 来控制的，参
 `--v=8` | 显示 HTTP 请求内容。
 `--v=9` | 显示 HTTP 请求内容而不截断内容。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- * Learn more about [Overview of kubectl](/docs/reference/kubectl/overview/).
 
@@ -676,4 +677,4 @@ Kubectl 日志输出详细程度是通过 `-v` 或者 `--v` 来控制的，参
 
 * 查看更多社区 [kubectl 备忘单](https://github.com/dennyzhang/cheatsheet-kubernetes-A4)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubectl/conventions.md b/content/zh/docs/reference/kubectl/conventions.md
index 6773eecd24..2667f9f6e3 100644
--- a/content/zh/docs/reference/kubectl/conventions.md
+++ b/content/zh/docs/reference/kubectl/conventions.md
@@ -2,7 +2,7 @@
 title: kubectl 的用法约定
 reviewers:
 - janetkuo
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -10,18 +10,18 @@ content_template: templates/concept
 title: kubectl Usage Conventions
 reviewers:
 - janetkuo
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Recommended usage conventions for `kubectl`.
 -->
 `kubectl` 的推荐用法约定
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Using `kubectl` in Reusable Scripts
@@ -157,4 +157,4 @@ You can use the `--dry-run` flag to preview the object that would be sent to you
 
 * 您可以使用 `kubectl apply` 命令创建或更新资源。有关使用 kubectl apply 更新资源的详细信息，请参阅 [Kubectl 文档](https://kubectl.docs.kubernetes.io)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubectl/docker-cli-to-kubectl.md b/content/zh/docs/reference/kubectl/docker-cli-to-kubectl.md
index 633ec6426d..c589dfafee 100644
--- a/content/zh/docs/reference/kubectl/docker-cli-to-kubectl.md
+++ b/content/zh/docs/reference/kubectl/docker-cli-to-kubectl.md
@@ -1,6 +1,6 @@
 ---
 title: 适用于 Docker 用户的 kubectl
-content_template: templates/concept
+content_type: concept
 reviewers:
 - brendandburns
 - thockin
@@ -8,21 +8,21 @@ reviewers:
 <!-- 
 ---
 title: kubectl for Docker Users
-content_template: templates/concept
+content_type: concept
 reviewers:
 - brendandburns
 - thockin
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- 
 You can use the Kubernetes command line tool kubectl to interact with the API Server. Using kubectl is straightforward if you are familiar with the Docker command line tool. However, there are a few differences between the docker commands and the kubectl commands. The following sections show a docker sub-command and describe the equivalent kubectl command. 
 -->
 您可以使用 Kubernetes 命令行工具 kubectl 与 API 服务器进行交互。如果您熟悉 Docker 命令行工具，则使用 kubectl 非常简单。但是，docker 命令和 kubectl 命令之间有一些区别。以下显示了 docker 子命令，并描述了等效的 kubectl 命令。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## docker run
 
 <!-- 
@@ -487,4 +487,4 @@ Grafana is running at https://108.59.85.141/api/v1/namespaces/kube-system/servic
 Heapster is running at https://108.59.85.141/api/v1/namespaces/kube-system/services/monitoring-heapster/proxy
 InfluxDB is running at https://108.59.85.141/api/v1/namespaces/kube-system/services/monitoring-influxdb/proxy
 ```
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubectl/jsonpath.md b/content/zh/docs/reference/kubectl/jsonpath.md
index 7d8797d622..900251c09d 100644
--- a/content/zh/docs/reference/kubectl/jsonpath.md
+++ b/content/zh/docs/reference/kubectl/jsonpath.md
@@ -1,24 +1,24 @@
 ---
 title: JSONPath 支持
-content_template: templates/concept
+content_type: concept
 weight: 25
 ---
 <!-- 
 ---
 title: JSONPath Support
-content_template: templates/concept
+content_type: concept
 weight: 25
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Kubectl supports JSONPath template. 
 -->
 Kubectl 支持 JSONPath 模板。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!-- 
 JSONPath template is composed of JSONPath expressions enclosed by curly braces {}.
@@ -140,4 +140,4 @@ C:\> kubectl get pods -o=jsonpath="{range .items[*]}{.metadata.name}{'\t'}{.stat
 C:\> kubectl get pods -o=jsonpath="{range .items[*]}{.metadata.name}{\"\t\"}{.status.startTime}{\"\n\"}{end}"
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubectl/kubectl.md b/content/zh/docs/reference/kubectl/kubectl.md
index e5ad5f4a10..299f7f8fd9 100644
--- a/content/zh/docs/reference/kubectl/kubectl.md
+++ b/content/zh/docs/reference/kubectl/kubectl.md
@@ -11,7 +11,8 @@ weight: 28
 ---
 -->
 
-{{% capture synopsis %}}
+## {{% heading "synopsis" %}}
+
 
 
 <!--
@@ -29,9 +30,10 @@ Find more information at: https://kubernetes.io/docs/reference/kubectl/overview/
 kubectl [flags]
 ```
 
-{{% /capture %}}
 
-{{% capture options %}}
+
+## {{% heading "options" %}}
+
 
 <table style="width: 100%; table-layout: fixed;">
   <colgroup>
@@ -513,9 +515,10 @@ kubectl [flags]
 
 
 
-{{% /capture %}}
 
-{{% capture seealso %}}
+
+## {{% heading "seealso" %}}
+
 
 <!--
 * [kubectl annotate](/docs/reference/generated/kubectl/kubectl-commands#annotate)	 - Update the annotations on a resource
@@ -622,5 +625,5 @@ kubectl [flags]
 * [kubectl version](/docs/reference/generated/kubectl/kubectl-commands#version)	 - 打印客户端和服务器的版本信息
 * [kubectl wait](/docs/reference/generated/kubectl/kubectl-commands#wait)	 - 实验性：等待一个或多个资源达到某种状态
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/reference/kubectl/overview.md b/content/zh/docs/reference/kubectl/overview.md
index f0ea83a731..b06c66f95a 100644
--- a/content/zh/docs/reference/kubectl/overview.md
+++ b/content/zh/docs/reference/kubectl/overview.md
@@ -2,7 +2,7 @@
 reviewers:
 - hw-qiaolei
 title: kubectl 概述
-content_template: templates/concept
+content_type: concept
 weight: 20
 card:
   name: reference
@@ -14,7 +14,7 @@ reviewers:
 - bgrant0607
 - hw-qiaolei
 title: Overview of kubectl
-content_template: templates/concept
+content_type: concept
 weight: 20
 card:
   name: reference
@@ -22,7 +22,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubectl is a command line interface for running commands against Kubernetes clusters. `kubectl` looks for a file named config in the $HOME/.kube directory. You can specify other [kubeconfig](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/) files by setting the KUBECONFIG environment variable or by setting the [`--kubeconfig`](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/) flag.
@@ -34,9 +34,9 @@ This overview covers `kubectl` syntax, describes the command operations, and pro
 -->
 本文概述了 `kubectl` 语法和命令操作描述，并提供了常见的示例。有关每个命令的详细信息，包括所有受支持的参数和子命令，请参阅 [kubectl](/docs/reference/generated/kubectl/kubectl-commands/) 参考文档。有关安装说明，请参见 [安装 kubectl](/docs/tasks/kubectl/install/) 。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Syntax
@@ -909,13 +909,14 @@ To find out more about plugins, take a look at the [example cli plugin](https://
 -->
 要了解关于插件的更多信息，请查看[示例 cli 插件](https://github.com/kubernetes/sample-cli-plugin)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Start using the [kubectl](/docs/reference/generated/kubectl/kubectl-commands/) commands.
 -->
 开始使用 [kubectl](/docs/reference/generated/kubectl/kubectl-commands/) 命令。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/kubernetes-api/labels-annotations-taints.md b/content/zh/docs/reference/kubernetes-api/labels-annotations-taints.md
index 4ed29847fd..e271e1885e 100644
--- a/content/zh/docs/reference/kubernetes-api/labels-annotations-taints.md
+++ b/content/zh/docs/reference/kubernetes-api/labels-annotations-taints.md
@@ -1,10 +1,10 @@
 ---
 title: 知名标签（Label）、注解（Annotation）和 Taints
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes reserves all labels and annotations in the kubernetes.io namespace.
@@ -16,9 +16,9 @@ Kubernetes 保留了 kubernetes.io 命名空间下的所有标签和注解。
 
 本文既作为这些标签和注解的参考，也就这些标签和注解的赋值进行了说明。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## kubernetes.io/arch
 
@@ -272,4 +272,4 @@ adding the labels manually (or adding support for `PersistentVolumeLabel`). With
 如果 `PersistentVolumeLabel` 准入控制器不支持自动为 PersistentVolume 打标签，且用户希望防止 pod 跨区域进行卷的挂载，
 应考虑手动打标签 (或对 `PersistentVolumeLabel` 增加支持）。如果用户的基础设施没有这种约束，则不需要为卷添加区域标签。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md
index 7d04b8d5c8..d36201165e 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md
@@ -1,10 +1,10 @@
 ---
 title: kubeadm config
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Beginning with v1.8.0, kubeadm uploads the configuration of your cluster to a ConfigMap called
 `kubeadm-config` in the `kube-system` namespace, and later reads the ConfigMap when upgrading.
@@ -33,9 +33,9 @@ to list and pull the images that kubeadm requires.
 打印默认配置，可以用 kubeadm config migrate 来将旧的配置文件转换到较新的版本，还可以使用 kubeadm config images list 和 kubeadm config images pull
 列出并拉取 kubeadm 所需的镜像。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## kubeadm config upload from-file {#cmd-config-from-file}
 
 ## kubeadm config view {#cmd-config-view}
@@ -56,14 +56,15 @@ to list and pull the images that kubeadm requires.
 ## kubeadm config images pull {#cmd-config-images-pull}
 {{< include "generated/kubeadm_config_images_pull.md" >}}
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 -->
 
 *  [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) 将 Kubernetes 集群升级到更新版本 [kubeadm upgrade]
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md
index 4a0e252414..b975d3df60 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md
@@ -1,6 +1,6 @@
 ---
 title: kubeadm init
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
@@ -11,18 +11,18 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm init
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This command initializes a Kubernetes control-plane node.
 -->
 此命令初始化一个 Kubernetes 控制平面节点。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 {{< include "generated/kubeadm_init.md" >}}
 
@@ -461,9 +461,10 @@ provisioned). For details, see the [kubeadm join](/docs/reference/setup-tools/ku
 -->
 注意这种搭建集群的方式在安全保证上会有一些宽松，因为这种方式不允许使用 `--discovery-token-ca-cert-hash` 来验证根 CA 的哈希值（因为当配置节点的时候，它还没有被生成）。获取需更多信息请参阅[kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/)文档。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * [kubeadm init phase](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/) to understand more about
 `kubeadm init` phases
@@ -475,4 +476,4 @@ provisioned). For details, see the [kubeadm join](/docs/reference/setup-tools/ku
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/)启动一个 Kubernetes 工作节点并且将其加入到集群
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/)将 Kubernetes 集群升级到新版本
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/)使用 `kubeadm init` 或 `kubeadm join` 来恢复对节点的变更
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-join.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-join.md
index 6e6fd76fa4..00e024ecdd 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-join.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-join.md
@@ -4,17 +4,17 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm join
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This command initializes a Kubernetes worker node and joins it to the cluster.
 -->
 此命令用来初始化 Kubernetes 工作节点并将其加入集群。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 {{< include "generated/kubeadm_join.md" >}}
 
 <!--
@@ -385,9 +385,10 @@ For details on individual fields in `JoinConfiguration` see [the godoc](https://
 -->
 
 要了解 `JoinConfiguration` 中各个字段的详细信息请参考 [godoc](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#JoinConfiguration)。
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes master node
 * [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token/) to manage tokens for `kubeadm join`
@@ -396,4 +397,4 @@ For details on individual fields in `JoinConfiguration` see [the godoc](https://
 * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) 初始化 Kubernetes 主节点
 * [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token/) 管理 `kubeadm join` 的令牌
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 将 `kubeadm init` 或 `kubeadm join` 对主机的更改恢复到之前状态
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md
index fba31116f8..ca87f78ba8 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset.md
@@ -1,6 +1,6 @@
 ---
 title: kubeadm reset
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 <!-- ---
@@ -9,16 +9,16 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm reset
-content_template: templates/concept
+content_type: concept
 weight: 60
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- Performs a best effort revert of changes made by `kubeadm init` or `kubeadm join`. -->
 该命令尽力还原由 `kubeadm init` 或 `kubeadm join` 所做的更改。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 {{< include "generated/kubeadm_reset.md" >}}
 
 <!-- ### Reset workflow {#reset-workflow} -->
@@ -52,11 +52,12 @@ etcdctl del "" --prefix
 
 <!-- See the [etcd documentation](https://github.com/coreos/etcd/tree/master/etcdctl) for more information. -->
 更多详情请参考 [etcd 文档](https://github.com/coreos/etcd/tree/master/etcdctl)。
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes control-plane node
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster -->
 * 参考 [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) 来初始化 Kubernetes 主节点。
 * 参考 [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) 来初始化 Kubernetes 工作节点并加入集群。
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-token.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-token.md
index 37e4cbcfca..ba49bc9834 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-token.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-token.md
@@ -1,6 +1,6 @@
 ---
 title: kubeadm 令牌
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 
@@ -11,12 +11,12 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm token
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Bootstrap tokens are used for establishing bidirectional trust between a node joining
 the cluster and a master node, as described in [authenticating with bootstrap tokens](/docs/reference/access-authn-authz/bootstrap-tokens/).
@@ -31,9 +31,9 @@ such a token and also to create and manage new ones.
 
 `kubeadm init` 创建了一个有效期为 24 小时的令牌，下面的命令允许您管理令牌，也可以创建和管理新的令牌。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## kubeadm token create {#cmd-token-create}
 {{< include "generated/kubeadm_token_create.md" >}}
 
@@ -45,11 +45,12 @@ such a token and also to create and manage new ones.
 
 ## kubeadm token list {#cmd-token-list}
 {{< include "generated/kubeadm_token_list.md" >}}
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) 引导 Kubernetes 工作节点并将其加入群集
-{{% /capture %}}
+
 <!--
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster
 -->
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
index 6fb5d8828e..f387963503 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
@@ -1,6 +1,6 @@
 ---
 title: kubeadm upgrade
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!-- ---
@@ -9,18 +9,18 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm upgrade
-content_template: templates/concept
+content_type: concept
 weight: 40
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 `kubeadm upgrade` is a user-friendly command that wraps complex upgrading logic
 behind one command, with support for both planning an upgrade and actually performing it. -->
 `kubeadm upgrade` 是一个对用户友好的命令，它将复杂的升级逻辑包装在一个命令后面，支持升级的规划和实际执行。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## kubeadm upgrade guidance
@@ -66,10 +66,11 @@ renewal see the [certificate management documentation](/docs/tasks/administer-cl
 ## kubeadm upgrade node {#cmd-upgrade-node}
 {{< include "generated/kubeadm_upgrade_node.md" >}}
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config/) if you initialized your cluster using kubeadm v1.7.x or lower, to configure your cluster for `kubeadm upgrade` -->
 * 如果您使用 kubeadm v1.7.x 或更低版本初始化集群，则可以参考[kubeadm 配置](/docs/reference/setup-tools/kubeadm/kubeadm-config/)配置集群用于 `kubeadm upgrade`。
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md
index d139966055..b2afa2124b 100644
--- a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-version.md
@@ -4,19 +4,19 @@ reviewers:
 - luxas
 - jbeda
 title: kubeadm version
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This command prints the version of kubeadm.
 -->
 
 此命令用来查询 kubeadm 的版本。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 {{< include "generated/kubeadm_version.md" >}}
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/tools.md b/content/zh/docs/reference/tools.md
index ae97a3ea74..fa41dcaf8c 100644
--- a/content/zh/docs/reference/tools.md
+++ b/content/zh/docs/reference/tools.md
@@ -2,7 +2,7 @@
 reviewers:
 - janetkuo
 title: 工具
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -10,7 +10,7 @@ content_template: templates/concept
 reviewers:
 - janetkuo
 title: Tools
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
@@ -19,11 +19,11 @@ content_template: templates/concept
 <!--
 Kubernetes contains several built-in tools to help you work with the Kubernetes system.
 -->
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes 包含一些内置工具，可以帮助用户更好的使用 Kubernetes 系统。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## Kubectl
 
 <!--
@@ -109,4 +109,4 @@ Use Kompose to:
 * 将一个 Docker Compose 文件解释成 Kubernetes 对象
 * 将本地 Docker 开发 转变成通过 Kubernetes 来管理
 * 转换 v1 或 v2 Docker Compose `yaml` 文件 或 [分布式应用程序包](https://docs.docker.com/compose/bundles/)
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/using-api/api-overview.md b/content/zh/docs/reference/using-api/api-overview.md
index 978cccf609..4c08851654 100644
--- a/content/zh/docs/reference/using-api/api-overview.md
+++ b/content/zh/docs/reference/using-api/api-overview.md
@@ -1,6 +1,6 @@
 ---
 title: Kubernetes API 总览
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: reference
@@ -15,7 +15,7 @@ reviewers:
 - erictune
 - lavalamp
 - jbeda
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: reference
@@ -24,16 +24,16 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page provides an overview of the Kubernetes API.
 -->
 此页提供 Kubernetes API 的总览
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 The REST API is the fundamental fabric of Kubernetes. All operations and communications between components, and external user commands are REST API calls that the API Server handles. Consequently, everything in the Kubernetes
@@ -229,4 +229,4 @@ Individual resource enablement/disablement is only supported in the `extensions/
 
 {{< /note >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/reference/using-api/client-libraries.md b/content/zh/docs/reference/using-api/client-libraries.md
index 07c63436d0..20855fbe48 100644
--- a/content/zh/docs/reference/using-api/client-libraries.md
+++ b/content/zh/docs/reference/using-api/client-libraries.md
@@ -1,6 +1,6 @@
 ---
 title: 客户端库
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
@@ -9,20 +9,20 @@ weight: 30
 title: Client Libraries
 reviewers:
 - ahmetb
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page contains an overview of the client libraries for using the Kubernetes
 API from various programming languages.
 -->
 本页面包含基于各种编程语言使用 Kubernetes API 的客户端库概述。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 To write applications using the [Kubernetes REST API](/docs/reference/using-api/api-overview/),
 you do not need to implement the API calls and request/response types yourself.
@@ -144,6 +144,6 @@ their authors, not the Kubernetes team.
 | DotNet (RestSharp)   | [github.com/masroorhasan/Kubernetes.DotNet](https://github.com/masroorhasan/Kubernetes.DotNet) |
 | Elixir               | [github.com/obmarg/kazan](https://github.com/obmarg/kazan/) |
 | Haskell              | [github.com/soundcloud/haskell-kubernetes](https://github.com/soundcloud/haskell-kubernetes) |
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/setup/_index.md b/content/zh/docs/setup/_index.md
index fba9ba5d28..08ce8ca8de 100644
--- a/content/zh/docs/setup/_index.md
+++ b/content/zh/docs/setup/_index.md
@@ -3,7 +3,7 @@ no_issue: true
 title: 入门
 main_menu: true
 weight: 20
-content_template: templates/concept
+content_type: concept
 card:
   name: 设置
   weight: 20
@@ -24,7 +24,7 @@ no_issue: true
 title: Getting started
 main_menu: true
 weight: 20
-content_template: templates/concept
+content_type: concept
 card:
   name: setup
   weight: 20
@@ -36,7 +36,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This section covers different options to set up and run Kubernetes.
@@ -58,9 +58,9 @@ More simply, you can create a Kubernetes cluster in learning and production envi
 -->
 更简单地说，可以在学习和生产环境中创建一个 Kubernetes 集群。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Learning environment
@@ -104,4 +104,4 @@ When evaluating a solution for a production environment, consider which aspects
 -->
 [Kubernetes 合作伙伴](https://kubernetes.io/partners/#conformance) 包括一个 [已认证的 Kubernetes](https://github.com/cncf/k8s-conformance/#certified-kubernetes) 提供商列表。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/best-practices/certificates.md b/content/zh/docs/setup/best-practices/certificates.md
index 6ea5228ba2..40a9da84a1 100644
--- a/content/zh/docs/setup/best-practices/certificates.md
+++ b/content/zh/docs/setup/best-practices/certificates.md
@@ -2,7 +2,7 @@
 title: PKI 证书和要求
 reviewers:
 - sig-cluster-lifecycle
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 40
 title: PKI certificates and requirements
 reviewers:
 - sig-cluster-lifecycle
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes requires PKI certificates for authentication over TLS.
@@ -25,9 +25,9 @@ This page explains the certificates that your cluster requires.
 -->
 Kubernetes 需要 PKI 证书才能进行基于 TLS 的身份验证。如果您是使用 [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) 安装的 Kubernetes，则会自动生成集群所需的证书。您还可以生成自己的证书。例如，不将私钥存储在 API 服务器上，可以让私钥更加安全。此页面说明了集群必需的证书。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## How certificates are used by your cluster
@@ -282,4 +282,4 @@ These files are used as follows:
 [kubeadm]: /docs/reference/setup-tools/kubeadm/kubeadm/
 [proxy]: /docs/tasks/access-kubernetes-api/configure-aggregation-layer/
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/independent/create-cluster-kubeadm.md b/content/zh/docs/setup/independent/create-cluster-kubeadm.md
index a7a92ef155..c00f723631 100644
--- a/content/zh/docs/setup/independent/create-cluster-kubeadm.md
+++ b/content/zh/docs/setup/independent/create-cluster-kubeadm.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 kubeadm 创建一个单主集群
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 
@@ -8,12 +8,12 @@ weight: 30
 reviewers:
 - sig-cluster-lifecycle
 title: Creating a single master cluster with kubeadm
-content_template: templates/task
+content_type: task
 weight: 30
 --- -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 <img src="https://raw.githubusercontent.com/cncf/artwork/master/projects/kubernetes/certified-kubernetes/versionless/color/certified-kubernetes-color.png" align="right" width="150px">**kubeadm** helps you bootstrap a minimum viable Kubernetes cluster that conforms to best practices.  With kubeadm, your cluster should pass [Kubernetes Conformance tests](https://kubernetes.io/blog/2017/10/software-conformance-certification). Kubeadm also supports other cluster
 lifecycle functions, such as upgrades, downgrade, and managing [bootstrap tokens](/docs/reference/access-authn-authz/bootstrap-tokens/).  -->
@@ -126,9 +126,10 @@ Kubernetes 发布的版本通常只维护支持九个月，在维护周期内，
 | v1.11.x            | 2018 年 6 月    | 2019 年 3 月      |
 | v1.12.x            | 2018 年 9 月    | 2019 年 6 月      |
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 
 - One or more machines running a deb/rpm-compatible OS, for example Ubuntu or CentOS
@@ -144,8 +145,8 @@ Kubernetes 发布的版本通常只维护支持九个月，在维护周期内，
 - 主节点上 2 CPU 以上
 - 集群里所有的机器有完全的网络连接，公有网络或者私有网络都可以
 
-{{% /capture %}}
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Objectives
 
diff --git a/content/zh/docs/setup/learning-environment/minikube.md b/content/zh/docs/setup/learning-environment/minikube.md
index 4db504f57e..d33e8cf66a 100644
--- a/content/zh/docs/setup/learning-environment/minikube.md
+++ b/content/zh/docs/setup/learning-environment/minikube.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 Minikube 安装 Kubernetes
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
@@ -9,20 +9,20 @@ reviewers:
 - balopat
 - aaron-prindle
 title: Installing Kubernetes with Minikube
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Minikube is a tool that makes it easy to run Kubernetes locally. Minikube runs a single-node Kubernetes cluster inside a Virtual Machine (VM) on your laptop for users looking to try out Kubernetes or develop with it day-to-day.
 -->
 Minikube 是一种可以让您在本地轻松运行 Kubernetes 的工具。Minikube 在笔记本电脑上的虚拟机（VM）中运行单节点 Kubernetes 集群，供那些希望尝试 Kubernetes 或进行日常开发的用户使用。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Minikube Features
@@ -928,4 +928,4 @@ Contributions, questions, and comments are all welcomed and encouraged! Minikube
 -->
 我们欢迎您向社区提交贡献、提出问题以及参与评论！Minikube 开发人员可以在 [Slack](https://kubernetes.slack.com) 的 #minikube 频道上互动交流（点击[这里](http://slack.kubernetes.io/)获得邀请）。我们还有 [kubernetes-dev Google Groups 邮件列表](https://groups.google.com/forum/#!forum/kubernetes-dev)。如果您要发信到列表中，请在主题前加上 "minikube: "。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/container-runtimes.md b/content/zh/docs/setup/production-environment/container-runtimes.md
index a9a7c4fbd5..fb3dde5428 100644
--- a/content/zh/docs/setup/production-environment/container-runtimes.md
+++ b/content/zh/docs/setup/production-environment/container-runtimes.md
@@ -3,7 +3,7 @@ reviewers:
 - vincepri
 - bart0sh
 title: 容器运行时
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 <!--
@@ -12,11 +12,11 @@ reviewers:
 - vincepri
 - bart0sh
 title: Container runtimes
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.6" state="stable" >}}
 <!--
 To run containers in Pods, Kubernetes uses a container runtime. Here are
@@ -25,9 +25,9 @@ the installation instructions for various runtimes.
 Kubernetes 使用容器运行时来实现在 pod 中运行容器。
 这是各种运行时的安装说明。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 {{< caution >}}
 <!--
@@ -588,4 +588,4 @@ Refer to the [Frakti QuickStart guide](https://github.com/kubernetes/frakti#quic
 
 请参阅 [Frakti 快速开始指南](https://github.com/kubernetes/frakti#quickstart) 来获取更多的信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/on-premises-vm/dcos.md b/content/zh/docs/setup/production-environment/on-premises-vm/dcos.md
index 8e3e8775d2..563701695c 100644
--- a/content/zh/docs/setup/production-environment/on-premises-vm/dcos.md
+++ b/content/zh/docs/setup/production-environment/on-premises-vm/dcos.md
@@ -2,18 +2,18 @@
 reviewers:
 - smugcloud
 title: DC/OS 上的 Kubernetes
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
 reviewers:
 - smugcloud
 title: Kubernetes on DC/OS
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Mesosphere provides an easy option to provision Kubernetes onto [DC/OS](https://mesosphere.com/product/), offering:
@@ -31,9 +31,9 @@ Mesosphere 提供了一个简单的选项来将 Kubernetes 设置到[DC/OS](http
 * 默认情况下高度可用且安全
 * 与快速数据平台 (例如 Akka、Cassandra、Kafka、Spark) 一起运行的 Kubernetes
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Official Mesosphere Guide
@@ -45,4 +45,4 @@ The canonical source of getting started on DC/OS is located in the [quickstart r
 -->
 DC/OS 入门的正式来源位于[quickstart 仓库](https://github.com/mesosphere/dcos-kubernetes-quickstart)中。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/on-premises-vm/ovirt.md b/content/zh/docs/setup/production-environment/on-premises-vm/ovirt.md
index 8be64713e9..ea8790f452 100644
--- a/content/zh/docs/setup/production-environment/on-premises-vm/ovirt.md
+++ b/content/zh/docs/setup/production-environment/on-premises-vm/ovirt.md
@@ -1,6 +1,6 @@
 ---
 title: oVirt
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
@@ -8,11 +8,11 @@ reviewers:
 - caesarxuchao
 - erictune
 title: oVirt
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 oVirt is a virtual datacenter manager that delivers powerful management of multiple virtual machines on multiple hosts. Using KVM and libvirt, oVirt can be installed on Fedora, CentOS, or Red Hat Enterprise Linux hosts to set up and manage your virtual data center.
@@ -20,9 +20,9 @@ oVirt is a virtual datacenter manager that delivers powerful management of multi
 oVirt 是一个虚拟数据中心管理器，可以对多个主机上的多个虚拟机进行强大的管理。
 使用 KVM 和 libvirt ，可以将 oVirt 安装在 Fedora、CentOS 或者 Red Hat Enterprise Linux 主机上，以部署和管理您的虚拟数据中心。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## oVirt Cloud Provider Deployment
@@ -131,5 +131,5 @@ IaaS 提供商        | 配置管理 | OS     | 联网  | 文件
 oVirt | | | | [文件](/docs/setup/production-environment/on-premises-vm/ovirt/) | | 社区 ([@simon3z](https://github.com/simon3z))
 
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/setup/production-environment/tools/kops.md b/content/zh/docs/setup/production-environment/tools/kops.md
index ef51a75d4e..99c05d2fbf 100644
--- a/content/zh/docs/setup/production-environment/tools/kops.md
+++ b/content/zh/docs/setup/production-environment/tools/kops.md
@@ -1,17 +1,17 @@
 ---
 title: 使用 Kops 安装 Kubernetes
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 <!--
 ---
 title: Installing Kubernetes with kops
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This quickstart shows you how to easily install a Kubernetes cluster on AWS.
@@ -46,9 +46,9 @@ a building block.  kops builds on the kubeadm work.
 -->
 如果您有不同的观点，您可能更喜欢使用 [kubeadm](/docs/admin/kubeadm/) 作为构建工具来构建自己的集群。kops 建立在 kubeadm 工作的基础上。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Creating a cluster
@@ -335,9 +335,10 @@ See the [list of add-ons](/docs/concepts/cluster-administration/addons/) to expl
 * Slack Channel: [#kops-users](https://kubernetes.slack.com/messages/kops-users/)
 * [GitHub Issues](https://github.com/kubernetes/kops/issues)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about Kubernetes [concepts](/docs/concepts/) and [`kubectl`](/docs/user-guide/kubectl-overview/).
@@ -348,4 +349,4 @@ See the [list of add-ons](/docs/concepts/cluster-administration/addons/) to expl
 * 了解 `kops` [高级用法](https://github.com/kubernetes/kops)。
 * 请参阅 `kops` [文档](https://github.com/kubernetes/kops) 获取教程、最佳做法和高级配置选项。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md b/content/zh/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md
index 95e16b29c6..57bf6aa21d 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 kubeadm 定制控制平面配置
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 <!--
@@ -8,12 +8,12 @@ weight: 40
 reviewers:
 - sig-cluster-lifecycle
 title: Customizing control plane configuration with kubeadm
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.12" state="stable" >}}
 
@@ -55,9 +55,9 @@ You can generate a `ClusterConfiguration` object with default values by running
 您可以通过运行 `kubeadm config print init-defaults` 并将输出保存到您选择的文件中，以默认值形式生成 `ClusterConfiguration` 对象。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## APIServer flags
@@ -135,4 +135,4 @@ scheduler:
     kubeconfig: /home/johndoe/kubeconfig.yaml
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/ha-topology.md b/content/zh/docs/setup/production-environment/tools/kubeadm/ha-topology.md
index f8a106ca86..e6b7e4d3d5 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/ha-topology.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/ha-topology.md
@@ -2,7 +2,7 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 高可用拓扑选项
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 50
 reviewers:
 - sig-cluster-lifecycle
 title: Options for Highly Available topology
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page explains the two options for configuring the topology of your highly available (HA) Kubernetes clusters.
@@ -48,9 +48,9 @@ for more details.
 kubeadm 静态引导 etcd 集群。 阅读 etcd [集群指南](https://github.com/etcd-io/etcd/blob/release-3.4/Documentation/op-guide/clustering.md#static)以获得更多详细信息。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Stacked etcd topology
@@ -138,13 +138,14 @@ A minimum of three hosts for control plane nodes and three hosts for etcd nodes
 -->
 ！[外部 etcd 拓扑](/images/kubeadm/kubeadm-ha-topology-external-etcd.svg)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - [Set up a highly available cluster with kubeadm](/docs/setup/production-environment/tools/kubeadm/high-availability/)
 -->
  -  [使用 kubeadm 设置高可用集群](/docs/setup/production-environment/tools/kubeadm/high-availability/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md b/content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md
index 7b6fd2fd2d..3703563d4b 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/high-availability.md
@@ -2,7 +2,7 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 利用 kubeadm 创建高可用集群
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 
@@ -11,12 +11,12 @@ weight: 60
 reviewers:
 - sig-cluster-lifecycle
 title: Creating Highly Available clusters with kubeadm
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page explains two different approaches to setting up a highly available Kubernetes
@@ -57,9 +57,10 @@ LoadBalancer, or with dynamic PersistentVolumes.
 这篇文档没有讲述在云提供商上运行集群的问题。在云环境中，此处记录的方法不适用于类型为 LoadBalancer 的服务对象，或者具有动态的 PersistentVolumes。
 {{< /caution >}}
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 For both methods you need this infrastructure:
@@ -92,9 +93,9 @@ For the external etcd cluster only, you also need:
 
 - 给 etcd 成员使用的另外三台机器
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## First steps for both methods -->
 ## 这两种方法的第一步
@@ -731,4 +732,4 @@ the creation of additional nodes could fail due to a lack of required SANs.
     mv /home/${USER}/etcd-ca.key /etc/kubernetes/pki/etcd/ca.key
     ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md
index 9b2a62318a..accb3a5b43 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md
@@ -1,6 +1,6 @@
 ---
 title: 安装 kubeadm
-content_template: templates/task
+content_type: task
 weight: 10
 card:
   name: setup
@@ -10,7 +10,7 @@ card:
 <!--
 ---
 title: Installing kubeadm
-content_template: templates/task
+content_type: task
 weight: 10
 card:
   name: setup
@@ -19,7 +19,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 <img src="https://raw.githubusercontent.com/kubernetes/kubeadm/master/logos/stacked/color/kubeadm-stacked-color.png" align="right" width="150px">This page shows how to install the `kubeadm` toolbox.
@@ -28,9 +28,10 @@ For information how to create a cluster with kubeadm once you have performed thi
 <img src="https://raw.githubusercontent.com/kubernetes/kubeadm/master/logos/stacked/color/kubeadm-stacked-color.png" align="right" width="150px">本页面显示如何安装 `kubeadm` 工具箱。
 有关在执行此安装过程后如何使用 kubeadm 创建集群的信息，请参见[使用 kubeadm 创建集群](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/) 页面。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * One or more machines running one of:
@@ -63,9 +64,9 @@ For information how to create a cluster with kubeadm once you have performed thi
 * 开启机器上的某些端口。请参见[这里](#check-required-ports) 了解更多详细信息。
 * 禁用交换分区。为了保证 kubelet 正常工作，您 **必须** 禁用交换分区。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Verify the MAC address and product_uuid are unique for every node
@@ -507,11 +508,12 @@ If you are running into difficulties with kubeadm, please consult our [troublesh
 
 如果您在使用 kubeadm 时遇到困难，请参阅我们的[故障排查文档](/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/)。
 
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Using kubeadm to Create a Cluster](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/)
 -->
 * [使用 kubeadm 创建集群](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md
index 6618de8e48..e10bafa969 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md
@@ -2,7 +2,7 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 使用 kubeadm 配置集群中的每个 kubelet
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 80
 reviewers:
 - sig-cluster-lifecycle
 title: Configuring each kubelet in your cluster using kubeadm
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.11" state="stable" >}}
 
@@ -46,9 +46,9 @@ kubeadm CLI 工具的生命周期与 [kubelet](/docs/reference/command-line-tool
 集群中涉及的所有 kubelet 的一些配置细节都必须相同，而其他配置方面则需要基于每个 kubelet 进行设置，以适应给定机器的不同特性，例如操作系统、存储和网络。
 您可以手动地管理 kubelet 的配置，但是 [kubeadm 现在提供一种 `KubeletConfiguration` API 类型，用于集中管理 kubelet 的配置](#configure-kubelets-using-kubeadm)。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Kubelet configuration patterns
@@ -378,4 +378,4 @@ Kubernetes 版本对应的 DEB 和 RPM 软件包是：
 | `kubernetes-cni` | 将官方的 CNI 二进制文件安装到 `/opt/cni/bin` 目录中 |
 | `cri-tools` | 从 [cri-tools git 仓库](https://github.com/kubernetes-incubator/cri-tools)中安装 `/usr/bin/crictl` 二进制文件。 |
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/self-hosting.md b/content/zh/docs/setup/production-environment/tools/kubeadm/self-hosting.md
index 752a1d9c96..66444b3101 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/self-hosting.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/self-hosting.md
@@ -2,7 +2,7 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 配置您的 kubernetes 集群以自托管控制平台
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 <!--
@@ -10,12 +10,12 @@ weight: 100
 reviewers:
 - sig-cluster-lifecycle
 title: Configuring your kubernetes cluster to self-host the control plane
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 ### Self-hosting the Kubernetes control plane {#self-hosting}
@@ -38,9 +38,9 @@ To create a self-hosted cluster see the
 -->
 要创建自托管集群，请参见 [kubeadm alpha 自托管枢纽](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/#cmd-selfhosting) 命令。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 #### Caveats
@@ -130,5 +130,5 @@ In summary, `kubeadm alpha selfhosting` works as follows:
 -->
   1. 当原始静态控制平面停止时，新的自托管控制平面能够绑定到侦听端口并变为活动状态。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md
index a3e4420e35..e79718b204 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 kubeadm 创建一个高可用 etcd 集群
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 
@@ -9,12 +9,12 @@ weight: 70
 reviewers:
 - sig-cluster-lifecycle
 title: Set up a High Availability etcd cluster with kubeadm
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< note >}}
 <!--
@@ -37,9 +37,10 @@ when using kubeadm to set up a kubernetes cluster.
 -->
 默认情况下，kubeadm 运行单成员的 etcd 集群，该集群由控制面节点上的 kubelet 以静态 Pod 的方式进行管理。由于 etcd 集群只包含一个成员且不能在任一成员不可用时保持运行，所以这不是一种高可用设置。本任务，将告诉您如何在使用 kubeadm 创建一个 kubernetes 集群时创建一个外部 etcd：有三个成员的高可用 etcd 集群。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * Three hosts that can talk to each other over ports 2379 and 2380. This document assumes these default ports. However, they are configurable through the kubeadm config file.
@@ -61,9 +62,9 @@ when using kubeadm to set up a kubernetes cluster.
 -->
 [工具箱]: /docs/setup/production-environment/tools/kubeadm/install-kubeadm/
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Setting up the cluster
@@ -413,9 +414,10 @@ kubeadm 包含生成下述证书所需的所有必要的密码学工具；在这
     -->
     - 将 `${HOST0}` 设置为要测试的主机的 IP 地址
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Once your have a working 3 member etcd cluster, you can continue setting up a
@@ -424,5 +426,5 @@ kubeadm](/docs/setup/independent/high-availability/).
 -->
 一旦拥有了一个正常工作的 3 成员的 etcd 集群，你就可以基于[使用 kubeadm 的外部 etcd 方法](/docs/setup/independent/high-availability/)，继续部署一个高可用的控制平面。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md b/content/zh/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md
index 1e3ab441b4..e00a71127c 100644
--- a/content/zh/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md
+++ b/content/zh/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md
@@ -1,17 +1,17 @@
 ---
 title: 对 kubeadm 进行故障排查
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
 <!--
 ---
 title: Troubleshooting kubeadm
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 As with any program, you might run into an error installing or running kubeadm.
@@ -39,9 +39,9 @@ If your problem is not listed below, please follow the following steps:
 或者在 [StackOverflow](https://stackoverflow.com/questions/tagged/kubernetes) 上提问。
 请加入相关标签，例如 `#kubernetes` 和 `#kubeadm`，这样其他人可以帮助您。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## `ebtables` or some similar executable not found during installation
@@ -647,4 +647,4 @@ kubectl taint nodes NODE_NAME node-role.kubernetes.io/master:NoSchedule-
 kubectl taint nodes NODE_NAME node-role.kubernetes.io/master:NoSchedule-
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/turnkey/aws.md b/content/zh/docs/setup/production-environment/turnkey/aws.md
index 2f54b71bdc..e67a0a4c99 100644
--- a/content/zh/docs/setup/production-environment/turnkey/aws.md
+++ b/content/zh/docs/setup/production-environment/turnkey/aws.md
@@ -3,7 +3,7 @@ reviewers:
 - justinsb
 - clove
 title: 在 AWS EC2 上运行 Kubernetes
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -11,21 +11,22 @@ reviewers:
 - justinsb
 - clove
 title: Running Kubernetes on AWS EC2
-content_template: templates/task
+content_type: task
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page describes how to install a Kubernetes cluster on AWS.
 -->
 本页面介绍了如何在 AWS 上安装 Kubernetes 集群。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 To create a Kubernetes cluster on AWS, you will need an Access Key ID and a Secret Access Key from AWS.
 -->
@@ -61,9 +62,9 @@ To create a Kubernetes cluster on AWS, you will need an Access Key ID and a Secr
 -->
 * [KubeOne](https://github.com/kubermatic/kubeone) 是一个开源集群生命周期管理工具，它可用于创建，升级和管理高可用 Kubernetes 集群。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Getting started with your cluster
@@ -174,4 +175,4 @@ and using a Kubernetes cluster.
 
 请参阅 [Kubernetes 文档](/docs/)了解有关管理和使用 Kubernetes 集群的更多详细信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md b/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md
index aeec416870..314b0de627 100644
--- a/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md
+++ b/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md
@@ -3,7 +3,7 @@ reviewers:
 - michmike
 - patricklang
 title: Kubernetes 中调度 Windows 容器的指南
-content_template: templates/concept
+content_type: concept
 weight: 75
 ---
 <!--
@@ -12,21 +12,21 @@ reviewers:
 - michmike
 - patricklang
 title: Guide for scheduling Windows containers in Kubernetes
-content_template: templates/concept
+content_type: concept
 weight: 75
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Windows applications constitute a large portion of the services and applications that run in many organizations. This guide walks you through the steps to configure and deploy a Windows container in Kubernetes.
 -->
 Windows 应用程序构成了许多组织中运行的服务和应用程序的很大一部分。本指南将引导您完成在 Kubernetes 中配置和部署 Windows 容器的步骤。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Objectives
@@ -363,6 +363,6 @@ spec:
 ```
 
 
-{{% /capture %}}
+
 
 [RuntimeClass]: https://kubernetes.io/docs/concepts/containers/runtime-class/
diff --git a/content/zh/docs/setup/release/version-skew-policy.md b/content/zh/docs/setup/release/version-skew-policy.md
index 9d65e00b3c..25bfbb8cf6 100644
--- a/content/zh/docs/setup/release/version-skew-policy.md
+++ b/content/zh/docs/setup/release/version-skew-policy.md
@@ -7,20 +7,20 @@ reviewers:
 - sig-node
 - sig-release
 title: Kubernetes 版本及版本倾斜支持策略
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This document describes the maximum version skew supported between various Kubernetes components.
 Specific cluster deployment tools may place additional restrictions on version skew.
 -->
 本文描述 Kubernetes 各组件之间版本倾斜支持策略。
 特定的集群部署工具可能会有额外的限制。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## Supported versions
 
diff --git a/content/zh/docs/tasks/_index.md b/content/zh/docs/tasks/_index.md
index 0be5747945..892ea33b1e 100644
--- a/content/zh/docs/tasks/_index.md
+++ b/content/zh/docs/tasks/_index.md
@@ -2,20 +2,20 @@
 title: 任务
 main_menu: true
 weight: 50
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
 title: Tasks
 main_menu: true
 weight: 50
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
 {{< toc >}}
 
-{{% capture overview %}}
+<!-- overview -->
 
 Kubernetes 文档这一部分包含的一些页面展示如何去做单个任务。一个任务页面展示了如何执行操作单一的项目，通常是通过给出若干步骤。
 <!--
@@ -24,9 +24,9 @@ show how to do individual tasks. A task page shows how to do a
 single thing, typically by giving a short sequence of steps.
 -->
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## Web 用户界面 (Dashboard)
 
@@ -178,9 +178,10 @@ Configure and schedule NVIDIA GPUs for use as a resource by nodes in a cluster.
 Configure and schedule huge pages as a schedulable resource in a cluster.
 -->
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 如果您想编写任务页面，请参阅[创建文档提取请求](/docs/home/contribute/create-pull-request/)。
 <!--
@@ -188,4 +189,4 @@ If you would like to write a task page, see
 [Creating a Documentation Pull Request](/docs/home/contribute/create-pull-request/).
 -->
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/access-cluster.md b/content/zh/docs/tasks/access-application-cluster/access-cluster.md
index d0b41d4a6f..c839c2951f 100644
--- a/content/zh/docs/tasks/access-application-cluster/access-cluster.md
+++ b/content/zh/docs/tasks/access-application-cluster/access-cluster.md
@@ -1,29 +1,29 @@
 ---
 title: 访问集群
 weight: 20
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
 ---
 title: Accessing Clusters
 weight: 20
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This topic discusses multiple ways to interact with clusters.
 -->
 本文阐述多种与集群交互的方法。
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture body %}}
+<!-- body -->
 
 <!--
 ## Accessing for the first time with kubectl
@@ -600,4 +600,4 @@ will typically ensure that the latter types are setup correctly.
 
 除了前两种类型之外，Kubernetes 用户通常不需要担心任何其他问题。集群管理员通常会确保后者的正确配置。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md b/content/zh/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
index a858c266c5..18f2b1d44a 100644
--- a/content/zh/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
+++ b/content/zh/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
@@ -1,23 +1,24 @@
 ---
 title: 同 Pod 内的容器使用共享卷通信
-content_template: templates/task
+content_type: task
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文旨在说明如何让一个 Pod 内的两个容器使用一个卷（Volume）进行通信。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 ## 创建一个包含两个容器的 Pod
@@ -111,10 +112,10 @@ Pod 的配置文件如下：
 
     Hello from the debian container
 
-{{% /capture %}}
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 
 ## 讨论
@@ -137,10 +138,11 @@ Pod 能有多个容器的主要原因是为了支持辅助应用（helper applic
 在本练习中的卷为 Pod 生命周期中的容器相互通信提供了一种方法。如果 Pod 被删除或者重建了，
 任何共享卷中的数据都会丢失。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 
@@ -161,7 +163,7 @@ Pod 能有多个容器的主要原因是为了支持辅助应用（helper applic
 
 * 参见 [Pod](/docs/api-reference/{{< param "version" >}}/#pod-v1-core).
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md b/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
index 219e1b4ee8..d577256a6e 100644
--- a/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
+++ b/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
@@ -1,10 +1,10 @@
 ---
 title: 配置对多集群的访问
-content_template: templates/task
+content_type: task
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文展示如何使用配置文件来配置对多个集群的访问。 在将集群、用户和上下文定义在一个或多个配置文件中之后，用户可以使用 `kubectl config use-context` 命令快速地在集群之间进行切换。
 
@@ -13,15 +13,16 @@ content_template: templates/task
 这是一种引用配置文件的通用方式，并不意味着存在一个名为 `kubeconfig` 的文件。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 需要安装 [`kubectl`](/docs/tasks/tools/install-kubectl/) 命令行工具。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 定义集群、用户和上下文
 
@@ -305,14 +306,15 @@ kubectl config view
 export KUBECONFIG=$KUBECONFIG_SAVED
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * [使用 kubeconfig 文件组织集群访问](/docs/concepts/configuration/organize-cluster-access-kubeconfig/)
 * [kubectl 配置](/docs/user-guide/kubectl/{{< param "version" >}}/)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md b/content/zh/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
index a23cea7633..a6cee8c2d0 100644
--- a/content/zh/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
+++ b/content/zh/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
@@ -3,11 +3,11 @@ reviewers:
 - bprashanth
 - davidopp
 title: 配置你的云平台防火墙
-content_template: templates/task
+content_type: task
 weight: 90
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Many cloud providers (e.g. Google Compute Engine) define firewalls that help prevent inadvertent
@@ -18,16 +18,17 @@ well as any provider specific details that may be necessary.
 许多云服务提供商（比如 谷歌计算引擎）定义防火墙以防止服务无意间暴露到互联网上。
 当暴露服务给外网时，你可能需要在防火墙上开启一个或者更多的端口来支持服务。
 本文描述了这个过程，以及其他云服务商的具体信息。
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Restrict Access For LoadBalancer Service
 -->
@@ -159,4 +160,4 @@ the wilds of the internet.
 
 {{< /note >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/configure-dns-cluster.md b/content/zh/docs/tasks/access-application-cluster/configure-dns-cluster.md
index 0142302759..8d8520cb18 100644
--- a/content/zh/docs/tasks/access-application-cluster/configure-dns-cluster.md
+++ b/content/zh/docs/tasks/access-application-cluster/configure-dns-cluster.md
@@ -1,27 +1,27 @@
 ---
 title: 为集群配置 DNS
 weight: 120
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
 ---
 title: Configure DNS for a Cluster
 weight: 120
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Kubernetes offers a DNS cluster addon, which most of the supported environments enable by default.
 -->
 Kubernetes 提供 DNS 集群插件，大多数支持的环境默认情况下都会启用。
-{{% /capture %}}
-{{% capture body %}}
+
+<!-- body -->
 <!--
 For more information on how to configure DNS for a Kubernetes cluster, see the [Kubernetes DNS sample plugin.](https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns)
 -->
 有关如何为 Kubernetes 集群配置 DNS 的详细信息，请参阅 [Kubernetes DNS 插件示例.](https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/connecting-frontend-backend.md b/content/zh/docs/tasks/access-application-cluster/connecting-frontend-backend.md
index 9833f284d8..2c91610128 100644
--- a/content/zh/docs/tasks/access-application-cluster/connecting-frontend-backend.md
+++ b/content/zh/docs/tasks/access-application-cluster/connecting-frontend-backend.md
@@ -1,10 +1,10 @@
 ---
 title: 使用 Service 把前端连接到后端
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 
 
@@ -12,10 +12,11 @@ content_template: templates/tutorial
 本任务会描述如何创建前端微服务和后端微服务。后端微服务是一个 hello 欢迎程序。
 前端和后端的连接是通过 Kubernetes 服务对象（Service object）完成的。
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 
 
@@ -24,10 +25,11 @@ content_template: templates/tutorial
 * 从后端将流量路由到前端
 * 使用服务对象把前端应用连接到后端应用
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -36,10 +38,10 @@ content_template: templates/tutorial
   所以需要对应的可支持此功能的环境。如果你的环境不能支持，你可以使用
   [NodePort](/docs/user-guide/services/#type-nodeport) 类型的服务代替。
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 
 ### 使用部署对象（Deployment）创建后端
@@ -180,16 +182,17 @@ curl http://<EXTERNAL-IP>
 {"message":"Hello"}
 ```
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 
 * 了解更多 [Services](/docs/concepts/services-networking/service/)
 * 了解更多 [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/access-application-cluster/create-external-load-balancer.md b/content/zh/docs/tasks/access-application-cluster/create-external-load-balancer.md
index ab0cd5ace6..86d83cd34b 100644
--- a/content/zh/docs/tasks/access-application-cluster/create-external-load-balancer.md
+++ b/content/zh/docs/tasks/access-application-cluster/create-external-load-balancer.md
@@ -1,18 +1,18 @@
 ---
 title: 创建一个外部负载均衡器
-content_template: templates/task
+content_type: task
 weight: 80
 ---
 
 <!--
 ---
 title: Create an External Load Balancer
-content_template: templates/task
+content_type: task
 weight: 80
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to create an External Load Balancer.
@@ -43,15 +43,16 @@ documentation.
 -->
 有关如何配置和使用 Ingress 资源为服务提供外部可访问的 URL、负载均衡流量、终止 SSL 等功能，请查看 [Ingress](/docs/concepts/services-networking/ingress/) 文档。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Configuration file
@@ -305,4 +306,4 @@ Internal pod to pod traffic should behave similar to ClusterIP services, with eq
 
 内部 pod 到 pod 的流量应该与 ClusterIP 服务类似，所有 pod 的概率相同。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/list-all-running-container-images.md b/content/zh/docs/tasks/access-application-cluster/list-all-running-container-images.md
index 6e1b8ffde7..ebc5dfdc9c 100644
--- a/content/zh/docs/tasks/access-application-cluster/list-all-running-container-images.md
+++ b/content/zh/docs/tasks/access-application-cluster/list-all-running-container-images.md
@@ -1,18 +1,18 @@
 ---
 title: 列出集群中所有运行容器的镜像
-content_template: templates/task
+content_type: task
 weight: 100
 ---
 
 <!--
 ---
 title: List All Container Images Running in a Cluster
-content_template: templates/task
+content_type: task
 weight: 100
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to use kubectl to list all of the Container images
@@ -20,15 +20,16 @@ for Pods running in a cluster.
 -->
 本文展示如何使用 kubectl 来列出集群中所有运行 pod 的容器的镜像
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 In this exercise you will use kubectl to fetch all of the Pods
@@ -170,13 +171,14 @@ kubectl get pods --all-namespaces -o go-template --template="{{range .items}}{{r
 
 
 
-{{% /capture %}}
 
-{{% capture discussion %}}
 
-{{% /capture %}}
+<!-- discussion -->
+
+
+
+## {{% heading "whatsnext" %}}
 
-{{% capture whatsnext %}}
 
 <!--
 ### Reference
@@ -189,6 +191,6 @@ kubectl get pods --all-namespaces -o go-template --template="{{range .items}}{{r
 * [Jsonpath](/docs/user-guide/jsonpath/) 参考指南
 * [Go template](https://golang.org/pkg/text/template/) 参考指南
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md b/content/zh/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
index 00cb1a89da..fd4904ca80 100644
--- a/content/zh/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
+++ b/content/zh/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
@@ -1,18 +1,18 @@
 ---
 title: 使用端口转发来访问集群中的应用
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
 <!--
 ---
 title: Use Port Forwarding to Access Applications in a Cluster
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to use `kubectl port-forward` to connect to a Redis
@@ -20,10 +20,11 @@ server running in a Kubernetes cluster. This type of connection can be useful
 for database debugging.
 -->
 本文展示如何使用 `kubectl port-forward` 连接到在 Kubernetes 集群中运行的 Redis 服务。这种类型的连接对数据库调试很有用。
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -32,10 +33,10 @@ for database debugging.
 -->
 * 安装 [redis-cli](http://redis.io/topics/rediscli)。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating Redis deployment and service
@@ -210,10 +211,10 @@ for database debugging.
 -->
     成功的 ping 请求应该返回 PONG。
 
-{{% /capture %}}
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Discussion
@@ -236,15 +237,16 @@ The support to UDP protocol is being tracked in
 在 [issue 47862](https://github.com/kubernetes/kubernetes/issues/47862) 中正在跟踪对 UDP 协议的支持。
 {{< /warning >}}
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 Learn more about [kubectl port-forward](/docs/reference/generated/kubectl/kubectl-commands/#port-forward).
 -->
 学习更多关于 [kubectl port-forward](/docs/reference/generated/kubectl/kubectl-commands/#port-forward)。
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/access-application-cluster/service-access-application-cluster.md b/content/zh/docs/tasks/access-application-cluster/service-access-application-cluster.md
index 56dc9ec216..454773b100 100644
--- a/content/zh/docs/tasks/access-application-cluster/service-access-application-cluster.md
+++ b/content/zh/docs/tasks/access-application-cluster/service-access-application-cluster.md
@@ -1,18 +1,18 @@
 ---
 title: 使用服务来访问集群中的应用
-content_template: templates/tutorial
+content_type: tutorial
 weight: 60
 ---
 
 <!--
 ---
 title: Use a Service to Access an Application in a Cluster
-content_template: templates/tutorial
+content_type: tutorial
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to create a Kubernetes Service object that external
@@ -21,17 +21,19 @@ provides load balancing for an application that has two running instances.
 -->
 本文展示如何创建一个 Kubernetes 服务对象，能让外部客户端访问在集群中运行的应用。该服务为一个应用的两个运行实例提供负载均衡。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * Run two instances of a Hello World application.
@@ -42,10 +44,10 @@ provides load balancing for an application that has two running instances.
 * 创建一个服务对象来暴露 node port。
 * 使用服务对象来访问正在运行的应用。
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Creating a service for an application running in two pods
@@ -203,10 +205,11 @@ to create a Service.
 
 作为 `kubectl expose` 的替代方法，您可以使用 [服务配置文件](/docs/concepts/services-networking/service/) 来创建服务。
 
-{{% /capture %}}
 
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 <!--
 To delete the Service, enter this command:
@@ -223,14 +226,15 @@ the Hello World application, enter this command:
 
     kubectl delete deployment hello-world
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Learn more about
 [connecting applications with services](/docs/concepts/services-networking/connect-applications-service/).
 -->
 学习更多关于如何 [通过服务连接应用](/docs/concepts/services-networking/connect-applications-service/)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-application-cluster/web-ui-dashboard.md b/content/zh/docs/tasks/access-application-cluster/web-ui-dashboard.md
index d9b2638c01..6096d7febe 100644
--- a/content/zh/docs/tasks/access-application-cluster/web-ui-dashboard.md
+++ b/content/zh/docs/tasks/access-application-cluster/web-ui-dashboard.md
@@ -4,7 +4,7 @@ reviewers:
 - mikedanese
 - rf232
 title: 网页界面 (Dashboard)
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: tasks
@@ -18,7 +18,7 @@ reviewers:
 - mikedanese
 - rf232
 title: Web UI (Dashboard)
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
   name: tasks
@@ -27,7 +27,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Dashboard is a web-based Kubernetes user interface. You can use Dashboard to deploy containerized applications to a Kubernetes cluster, troubleshoot your containerized application, and manage the cluster resources. You can use Dashboard to get an overview of applications running on your cluster, as well as for creating or modifying individual Kubernetes resources (such as Deployments, Jobs, DaemonSets, etc). For example, you can scale a Deployment, initiate a rolling update, restart a pod or deploy new applications using a deploy wizard.
@@ -40,10 +40,10 @@ Dashboard 同时展示了 Kubernetes 集群中的资源状态信息和所有报
 
 ![Kubernetes Dashboard UI](/images/docs/ui-dashboard.png)
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Deploying the Dashboard UI
@@ -369,9 +369,10 @@ Pod 列表和详细信息页面可以链接到 Dashboard 内置的日志查看
  -->
 ![日志浏览](/images/docs/ui-dashboard-logs-view.png)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 For more information, see the
@@ -380,4 +381,4 @@ For more information, see the
 更多信息，参见
 [Kubernetes Dashboard 项目页面](https://github.com/kubernetes/dashboard).
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-kubernetes-api/configure-aggregation-layer.md b/content/zh/docs/tasks/access-kubernetes-api/configure-aggregation-layer.md
index 24eb4e3542..11035e4e07 100644
--- a/content/zh/docs/tasks/access-kubernetes-api/configure-aggregation-layer.md
+++ b/content/zh/docs/tasks/access-kubernetes-api/configure-aggregation-layer.md
@@ -4,7 +4,7 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 <!--
@@ -14,12 +14,12 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Configuring the [aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/) allows the Kubernetes apiserver to be extended with additional APIs, which are not part of the core Kubernetes APIs. 
@@ -27,9 +27,10 @@ Configuring the [aggregation layer](/docs/concepts/extend-kubernetes/api-extensi
 
 配置 [聚合层](/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/) 允许 Kubernetes apiserver 使用其它 API 扩展，这些 API 不是核心 Kubernetes API 的一部分。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -51,9 +52,9 @@ Reusing the same CA for different client types can negatively impact the cluster
 {{< /caution >}}
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Authentication Flow
@@ -455,7 +456,7 @@ If you are not running kube-proxy on a host running the API server, then you mus
 如果您未在运行 API 服务器的主机上运行 kube-proxy，则必须确保使用以下 `kube-apiserver` 标志启用系统：
     --enable-aggregator-routing=true
 
-{{% /capture %}}
+
 
 <!--
 ### Register APIService objects
@@ -527,7 +528,8 @@ spec:
 ...
 ```
 
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
+
 <!--
 * [Setup an extension api-server](/docs/tasks/access-kubernetes-api/setup-extension-api-server/) to work with the aggregation layer.
 * For a high level overview, see [Extending the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/).
@@ -538,4 +540,4 @@ spec:
 * 有关高级概述，请参阅 [使用聚合层扩展 Kubernetes API](/zh/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)。
 * 了解如何 [使用自定义资源扩展 Kubernetes API](/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning.md b/content/zh/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning.md
index 66e5421e6b..11ec974476 100644
--- a/content/zh/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning.md
+++ b/content/zh/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning.md
@@ -4,7 +4,7 @@ reviewers:
 - mbohlool
 - sttts
 - liggitt
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 <!--
@@ -13,12 +13,12 @@ title: Versions in CustomResourceDefinitions
 reviewers:
 - sttts
 - liggitt
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page explains how to add versioning information to
 [CustomResourceDefinitions](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#customresourcedefinition-v1beta1-apiextensions), to indicate the stability
@@ -27,9 +27,10 @@ level of your CustomResourceDefinitions or advance your API to a new version wit
 
 本页介绍了如何添加版本信息到 [CustomResourceDefinitions](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#customresourcedefinition-v1beta1-apiextensions)，如何表示 CustomResourceDefinitions 的稳定水平或者用 API 之间的表征的转换提高您的 API 到一个新的版本。它还描述了如何将对象从一个版本升级到另一个版本。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -44,9 +45,9 @@ level of your CustomResourceDefinitions or advance your API to a new version wit
 
 * 阅读 [custom resources](/docs/concepts/api-extension/custom-resources/)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Overview
@@ -1256,4 +1257,4 @@ to `v1`.
     这会强制后端在当前存储版本中写入对象，即`v1`。
 3.  通过从`storedVersions`字段中删除`v1beta1`来更新 CustomResourceDefinition`Status`。 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/access-kubernetes-api/http-proxy-access-api.md b/content/zh/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
index 76a8ea6024..a186e78a44 100644
--- a/content/zh/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
+++ b/content/zh/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
@@ -1,25 +1,26 @@
 ---
 title: 使用 HTTP 代理访问 Kubernetes API
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
 <!--
 ---
 title: Use an HTTP Proxy to Access the Kubernetes API
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to use an HTTP proxy to access the Kubernetes API.
 -->
 本文说明如何使用 HTTP 代理访问 Kubernetes API。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -33,9 +34,9 @@ This page shows how to use an HTTP proxy to access the Kubernetes API.
 kubectl run node-hello --image=gcr.io/google-samples/node-hello:1.0 --port=8080
 ```
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Using kubectl to start a proxy server
@@ -109,13 +110,14 @@ Get a list of pods:
             ...
     }
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 Learn more about [kubectl proxy](/docs/reference/generated/kubectl/kubectl-commands#proxy).
 -->
 想了解更多信息，请参阅 [kubectl 代理](/docs/reference/generated/kubectl/kubectl-commands#proxy)。
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/access-kubernetes-api/setup-extension-api-server.md b/content/zh/docs/tasks/access-kubernetes-api/setup-extension-api-server.md
index d6dca73746..bd3c600296 100644
--- a/content/zh/docs/tasks/access-kubernetes-api/setup-extension-api-server.md
+++ b/content/zh/docs/tasks/access-kubernetes-api/setup-extension-api-server.md
@@ -4,7 +4,7 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/task
+content_type: task
 weight: 15
 ---
 
@@ -15,21 +15,22 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/task
+content_type: task
 weight: 15
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Setting up an extension API server to work the aggregation layer allows the Kubernetes apiserver to be extended with additional APIs, which are not part of the core Kubernetes APIs.
 -->
 设置一个扩展的 API server 来使用聚合层以让 Kubernetes apiserver 使用其它 API 进行扩展，这些 API 不是核心 Kubernetes API 的一部分。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * You need to have a Kubernetes cluster running.
@@ -38,15 +39,16 @@ Setting up an extension API server to work the aggregation layer allows the Kube
 * 您需要拥有一个运行的 Kubernetes 集群。
 * 您必须 [配置聚合层](/docs/tasks/access-kubernetes-api/configure-aggregation-layer/) 并且启用 apiserver 的相关参数。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Setup an extension api-server to work with the aggregation layer
@@ -94,9 +96,10 @@ Alternatively, you can use an existing 3rd party solution, such as [apiserver-bu
 1. 创建一个 Kubernetes apiservice。上述的 CA 证书应该使用 base64 编码，剥离新行并用作 apiservice 中的 spec.caBundle。这不应该是命名空间化的。如果使用了 [kube-aggregator API](https://github.com/kubernetes/kube-aggregator/)，那么只需要传入 PEM 编码的 CA 绑定，因为 base 64 编码已经完成了。
 1. 使用 kubectl 来获得您的资源。它应该返回 "找不到资源"。这意味着一切正常，但您目前还没有创建该资源类型的对象。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * If you haven't already, [configure the aggregation layer](/docs/tasks/access-kubernetes-api/configure-aggregation-layer/) and enable the apiserver flags.
@@ -107,7 +110,7 @@ Alternatively, you can use an existing 3rd party solution, such as [apiserver-bu
 * 高级概述，请参阅 [使用聚合层扩展 Kubernetes API](/docs/concepts/api-extension/apiserver-aggregation)。
 * 了解如何 [使用 Custom Resource Definition 扩展 Kubernetes API](/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/)。
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/access-cluster-api.md b/content/zh/docs/tasks/administer-cluster/access-cluster-api.md
index e281aad13a..29631fb3c4 100644
--- a/content/zh/docs/tasks/administer-cluster/access-cluster-api.md
+++ b/content/zh/docs/tasks/administer-cluster/access-cluster-api.md
@@ -1,22 +1,23 @@
 ---
 title: 使用 Kubernetes API 访问集群
-content_template: templates/task
+content_type: task
 ---
 <!-- ---
 title: Access Clusters Using the Kubernetes API
-content_template: templates/task
+content_type: task
 --- -->
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows how to access clusters using the Kubernetes API. -->
 本页展示了如何使用 Kubernetes API 访问集群
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Accessing the cluster API -->
 
@@ -349,4 +350,4 @@ securely with the API server. -->
 
 在每种情况下，Pod 的服务账号凭证被用于与 API 服务器的安全通信。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/access-cluster-services.md b/content/zh/docs/tasks/administer-cluster/access-cluster-services.md
index 82253e0c32..cb03264553 100644
--- a/content/zh/docs/tasks/administer-cluster/access-cluster-services.md
+++ b/content/zh/docs/tasks/administer-cluster/access-cluster-services.md
@@ -1,20 +1,21 @@
 ---
 
 title: 访问集群上运行的服务
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文展示了如何连接 Kubernetes 集群上运行的服务。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 访问集群上运行的服务
 
@@ -103,6 +104,6 @@ $ kubectl cluster-info
   - Web 服务器不总是能够传递令牌，所以你可能需要使用基本（密码）认证。 Apiserver 可以配置为接受基本认证，但你的集群可能并没有这样配置。
   - 某些 web 应用可能不能工作，特别是那些使用客户端侧 javascript 的应用，它们构造 url 的方式可能不能理解代理路径前缀。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/change-default-storage-class.md b/content/zh/docs/tasks/administer-cluster/change-default-storage-class.md
index 0dbfb7c8ee..8685c3ca12 100644
--- a/content/zh/docs/tasks/administer-cluster/change-default-storage-class.md
+++ b/content/zh/docs/tasks/administer-cluster/change-default-storage-class.md
@@ -1,22 +1,23 @@
 ---
 
 title: 改变默认 StorageClass
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文展示了如何改变默认的 Storage Class，它用于为没有特殊需求的 PersistentVolumeClaims 配置 volumes。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 ## 为什么要改变默认 storage class？
@@ -92,11 +93,12 @@ content_template: templates/task
       gold (default)   kubernetes.io/gce-pd      1d
       ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 了解更多关于  [StorageClasses](/docs/concepts/storage/persistent-volumes/)。
-  {{% /capture %}}
+  
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md b/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md
index 428845923c..d36686c38a 100644
--- a/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/change-pv-reclaim-policy.md
@@ -1,21 +1,22 @@
 ---
 title: 更改 PersistentVolume 的回收策略
-content_template: templates/task
+content_type: task
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文展示了如何更改 Kubernetes PersistentVolume 的回收策略。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 ## 为什么要更改 PersistentVolume 的回收策略
@@ -66,9 +67,10 @@ content_template: templates/task
 
     在前面的输出中，你可以看到绑定到 claim `default/claim3` 的 volume 拥有的回收策略为 `Retain`。当用户删除 claim `default/claim3` 时，它不会被自动删除。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 了解更多关于 [PersistentVolumes](/docs/concepts/storage/persistent-volumes/)的信息。
 * 了解更多关于 [PersistentVolumeClaims](/docs/user-guide/persistent-volumes/#persistentvolumeclaims) 的信息。
@@ -80,6 +82,6 @@ content_template: templates/task
 * [PersistentVolumeClaim](/docs/api-reference/{{< param "version" >}}/#persistentvolumeclaim-v1-core)
 
 * 查阅  [PersistentVolumeSpec](/docs/api-reference/{{< param "version" >}}/#persistentvolumeclaim-v1-core) 的 `persistentVolumeReclaimPolicy` 字段。
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/configure-multiple-schedulers.md b/content/zh/docs/tasks/administer-cluster/configure-multiple-schedulers.md
index 479151b213..7f2b41da33 100644
--- a/content/zh/docs/tasks/administer-cluster/configure-multiple-schedulers.md
+++ b/content/zh/docs/tasks/administer-cluster/configure-multiple-schedulers.md
@@ -1,6 +1,6 @@
 ---
 title: 配置多个调度器
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -8,11 +8,11 @@ reviewers:
 - davidopp
 - madhusudancs
 title: Configure Multiple Schedulers
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes ships with a default scheduler that is described [here](/docs/admin/kube-scheduler/).
@@ -34,16 +34,17 @@ A detailed description of how to implement a scheduler is outside the scope of t
 关于实现调度器的具体细节描述超出了本文范围。
 请参考 kube-scheduler 的实现，规范示例代码位于 [pkg/scheduler](https://github.com/kubernetes/kubernetes/tree/{{< param "githubbranch" >}}/pkg/scheduler)。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Package the scheduler
@@ -281,9 +282,9 @@ kubectl create -f pod3.yaml
 kubectl get pods
 ```
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ### Verifying that the pods were scheduled using the desired schedulers
@@ -307,4 +308,4 @@ Alternatively, one could just look at the "Scheduled" entries in the event logs
 kubectl get events
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md
index 0087cd46e9..9d88d93518 100644
--- a/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md
+++ b/content/zh/docs/tasks/administer-cluster/configure-upgrade-etcd.md
@@ -3,7 +3,7 @@ reviewers:
 - mml
 - wojtek-t
 title: 为 Kubernetes 运行 etcd 集群
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -11,27 +11,28 @@ reviewers:
 - mml
 - wojtek-t
 title: Operating etcd clusters for Kubernetes
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 {{< glossary_definition term_id="etcd" length="all" prepend="etcd is a ">}}
 -->
 {{< glossary_definition term_id="etcd" length="all" prepend="etcd 是一个">}}
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Prerequisites
@@ -477,4 +478,4 @@ See ["kube-apiserver 1.13.x refuses to work when first etcd-server is not availa
 
 请看  ["kube-apiserver 1.13.x refuses to work when first etcd-server is not available"](https://github.com/kubernetes/kubernetes/issues/72102). 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/coredns.md b/content/zh/docs/tasks/administer-cluster/coredns.md
index f40f6405cc..23e881485f 100644
--- a/content/zh/docs/tasks/administer-cluster/coredns.md
+++ b/content/zh/docs/tasks/administer-cluster/coredns.md
@@ -3,7 +3,7 @@ reviewers:
 - johnbelamaric
 title: 使用 CoreDNS 进行服务发现
 min-kubernetes-server-version: v1.9
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -12,24 +12,25 @@ reviewers:
 - johnbelamaric
 title: Using CoreDNS for Service Discovery
 min-kubernetes-server-version: v1.9
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page describes the CoreDNS upgrade process and how to install CoreDNS instead of kube-dns.
 -->
 此页面介绍了 CoreDNS 升级过程以及如何安装 CoreDNS 而不是 kube-dns。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## About CoreDNS
@@ -174,9 +175,10 @@ When resource utilisation is a concern, it may be useful to tune the configurati
 -->
 当涉及到资源利用时，优化内核的配置可能是有用的。有关详细信息，请参阅 [关于扩展 CoreDNS 的文档](https://github.com/coredns/deployment/blob/master/kubernetes/Scaling_CoreDNS.md)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 You can configure [CoreDNS](https://coredns.io) to support many more use cases than
@@ -185,6 +187,6 @@ kube-dns by modifying the `Corefile`. For more information, see the
 -->
 您可以通过修改 `Corefile` 来配置 [CoreDNS](https://coredns.io)，以支持比 ku-dns 更多的用例。有关更多信息，请参考 [CoreDNS 网站](https://coredns.io/2017/05/08/custom-dns-entries-for-kubernetes/)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md
index 964121940a..c3960f1c28 100644
--- a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md
+++ b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md
@@ -4,7 +4,7 @@ reviewers:
 - sjenning
 - ConnorDoyle
 - balajismaniam
-content_template: templates/task
+content_type: task
 ---
 <!--
 
@@ -13,10 +13,10 @@ reviewers:
 - sjenning
 - ConnorDoyle
 - balajismaniam
-content_template: templates/task
+content_type: task
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.12" state="beta" >}}
 
@@ -31,15 +31,16 @@ directives.
 按照设计，Kubernetes 对 pod 执行相关的很多方面进行了抽象，使得用户不必关心。然
 而，为了正常运行，有些工作负载要求在延迟和/或性能方面有更强的保证。 为此，kubelet 提供方法来实现更复杂的负载放置策略，同时保持抽象，避免显式的放置指令。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## CPU Management Policies
@@ -311,4 +312,4 @@ equal to one. The `nginx` container is granted 2 exclusive CPUs.
 --->
 该 pod 属于 `Guaranteed` QoS 类型，因其指定了 `limits` 值，同时当未显式指定时，`requests` 值被设置为与 `limits` 值相等。同时，容器对 CPU 资源的限制值是一个大于或等于 1 的整数值。所以，该 `nginx` 容器被赋予 2 个独占 CPU。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/declare-network-policy.md b/content/zh/docs/tasks/administer-cluster/declare-network-policy.md
index 30798bb20b..594162909b 100644
--- a/content/zh/docs/tasks/administer-cluster/declare-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/declare-network-policy.md
@@ -3,17 +3,18 @@ approvers:
 - caseydavenport
 - danwinship
 title: 声明网络策略
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 
 本文可以帮助您开始使用 Kubernetes 的 [NetworkPolicy API](/docs/concepts/services-networking/network-policies/) 声明网络策略去管理 Pod 之间的通信
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 
 您首先需要有一个支持网络策略的 Kubernetes 集群。已经有许多支持 NetworkPolicy 的网络提供商，包括：
@@ -25,9 +26,9 @@ content_template: templates/task
 
 **注意**：以上列表是根据产品名称按字母顺序排序，而不是按推荐或偏好排序。下面示例对于使用了上面任何提供商的 Kubernetes 集群都是有效的
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 ## 创建一个`nginx` deployment 并且通过服务将其暴露
@@ -143,6 +144,6 @@ Hit enter for command prompt
 Connecting to nginx (10.100.0.16:80)
 / #
 ```
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/developing-cloud-controller-manager.md b/content/zh/docs/tasks/administer-cluster/developing-cloud-controller-manager.md
index 09dc35a528..82710c17d8 100644
--- a/content/zh/docs/tasks/administer-cluster/developing-cloud-controller-manager.md
+++ b/content/zh/docs/tasks/administer-cluster/developing-cloud-controller-manager.md
@@ -4,7 +4,7 @@ reviewers:
 - thockin
 - wlan0
 title: 开发云控制器管理器
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -14,13 +14,13 @@ reviewers:
 - thockin
 - wlan0
 title: Developing Cloud Controller Manager
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.11" state="beta" >}}
 <!--
@@ -42,10 +42,10 @@ To dive a little deeper into implementation details, all cloud controller manage
 -->
 为了深入了解实施细节，所有云控制器管理器都将从 Kubernetes 核心导入依赖包，唯一的区别是每个项目都会通过调用 [cloudprovider.RegisterCloudProvider](https://github.com/kubernetes/cloud-provider/blob/master/plugins.go#L56-L66) 来注册自己的驱动，更新可用驱动的全局变量。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Developing
@@ -81,4 +81,4 @@ For in-tree cloud providers, you can run the in-tree cloud controller manager as
 -->
 对于 in-tree 驱动，您可以将 in-tree 云控制器管理器作为群集中的 [Daemonset](/examples/admin/cloud/ccm-example.yaml) 运行。有关详细信息，请参阅 [运行的云控制器管理器文档](/docs/tasks/administer-cluster/running-cloud-controller.md)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/dns-custom-nameservers.md b/content/zh/docs/tasks/administer-cluster/dns-custom-nameservers.md
index 4795bface2..5667dc1a41 100644
--- a/content/zh/docs/tasks/administer-cluster/dns-custom-nameservers.md
+++ b/content/zh/docs/tasks/administer-cluster/dns-custom-nameservers.md
@@ -3,7 +3,7 @@ reviewers:
 - bowei
 - zihongz
 title: 自定义 DNS 服务
-content_template: templates/task
+content_type: task
 ---
 <!-- 
 ---
@@ -11,11 +11,11 @@ reviewers:
 - bowei
 - zihongz
 title: Customizing DNS Service
-content_template: templates/task
+content_type: task
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- 
 This page explains how to configure your DNS Pod and customize the
 DNS resolution process. In Kubernetes version 1.11 and later, CoreDNS is at GA
@@ -25,9 +25,10 @@ and [Using CoreDNS for Service Discovery](/docs/tasks/administer-cluster/coredns
 本页说明如何配置 DNS Pod 和自定义 DNS 解析过程。 在 Kubernetes 1.11 和更高版本中，CoreDNS 位于 GA
 并且默认情况下与 kubeadm 一起安装。 请参见[CoreDNS 的 ConfigMap 选项](#coredns-configmap-options) 
 and [使用 CoreDNS 进行服务发现](/docs/tasks/administer-cluster/coredns/)。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!-- 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 * Kubernetes version 1.6 or later. To work with CoreDNS, version 1.9 or later.
@@ -37,9 +38,9 @@ see [the kubeadm reference documentation](/docs/reference/setup-tools/kubeadm/ku
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 * Kubernetes 版本 1.6 或更新。如果与 CoreDNS 匹配，版本 1.9 或更新。
 * 合适的 add-on 插件: kube-dns 或 CoreDNS. 使用 kubeadm 安装，请参见 [kubeadm 帮助文档](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/#cmd-phase-addon). 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- 
 ## Introduction 
@@ -351,9 +352,9 @@ details about the configuration option format.
 
 请参见 [ConfigMap options](#configmap-options) 有关配置选项格式的详细信息。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- 
 #### Effects on Pods
@@ -498,7 +499,7 @@ data:
     ["172.16.0.1"]
 ```
 
-{{% /capture %}}
+
 
 <!-- 
 ## CoreDNS configuration equivalent to kube-dns
diff --git a/content/zh/docs/tasks/administer-cluster/dns-debugging-resolution.md b/content/zh/docs/tasks/administer-cluster/dns-debugging-resolution.md
index 11555af231..011cf99550 100644
--- a/content/zh/docs/tasks/administer-cluster/dns-debugging-resolution.md
+++ b/content/zh/docs/tasks/administer-cluster/dns-debugging-resolution.md
@@ -5,42 +5,44 @@ reviewers:
 - bowei
 - zihongz
 title:  Debug DNS 方案
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 
-{{% capture overview %}}
+<!-- overview -->
 This page provides hints on diagnosing DNS problems.
-{{% /capture %}}
+
 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 这篇文章提供了一些关于 DNS 问题诊断的方法。
-{{% /capture %}}
+
 
 <!--
 
-{{% capture prerequisites %}}
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 * Kubernetes version 1.6 and above.
 * The cluster must be configured to use the `coredns` (or `kube-dns`) addons.
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 -->
 
-{{% capture prerequisites %}}
+## {{% heading "prerequisites" %}}
+
 
 - {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 - Kubernetes 1.6 或者以上版本。
 - 集群必须使用了 `coredns` (或者 `kube-dns`)插件。
-  {{% /capture %}}
+  
 
-{{% capture steps %}}
+<!-- steps -->
 
 <!--
 
@@ -582,7 +584,7 @@ for more details on Cluster Federation and multi-site support.
 ## What's next
 - [Autoscaling the DNS Service in a Cluster](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/).
 
-{{% /capture %}}
+
 
 ## -->
 
@@ -595,7 +597,7 @@ for more details on Cluster Federation and multi-site support.
 
 - [集群里自动伸缩 DNS Service](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/).
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md b/content/zh/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
index 8fc387c92e..698a58bf7e 100644
--- a/content/zh/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
+++ b/content/zh/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
@@ -1,23 +1,24 @@
 ---
 title: 集群 DNS 服务自动伸缩
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Autoscale the DNS Service in a Cluster
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to enable and configure autoscaling of the DNS service in a
 Kubernetes cluster.
 -->
 本页展示了如何在集群中启用和配置 DNS 服务的自动伸缩功能。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -34,9 +35,9 @@ Kubernetes cluster.
 
 * 建议使用 Kubernetes 1.4.0 或更高版本。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Determining whether DNS horizontal autoscaling is already enabled
@@ -414,9 +415,9 @@ dns-autoscaler 的路径一般为：
 
 当 manifest 文件删除后，插件管理器将删除 dns-autoscaler Deployment。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Understanding how DNS horizontal autoscaling works
@@ -476,12 +477,13 @@ is under consideration as a future development.
 
 支持自定义 metric，类似于 [Horizontal Pod 自动伸缩](/docs/tasks/run-application/horizontal-pod-autoscale/) 所提供的，考虑未来进行开发。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * Learn more about the
 [implementation of cluster-proportional-autoscaler](https://github.com/kubernetes-incubator/cluster-proportional-autoscaler).
 -->
 * 了解更多关于 [cluster-proportional-autoscaler 实现](https://github.com/kubernetes-incubator/cluster-proportional-autoscaler)的相关信息。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/enabling-endpointslices.md b/content/zh/docs/tasks/administer-cluster/enabling-endpointslices.md
index 671ee47032..4e6bd67307 100644
--- a/content/zh/docs/tasks/administer-cluster/enabling-endpointslices.md
+++ b/content/zh/docs/tasks/administer-cluster/enabling-endpointslices.md
@@ -3,7 +3,7 @@ reviewers:
 - bowei
 - freehan
 title: 启用端点切片
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -12,28 +12,29 @@ reviewers:
 - bowei
 - freehan
 title: Enabling Endpoint Slices
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page provides an overview of enabling Endpoint Slices in Kubernetes.
 -->
 本页提供启用 Kubernetes 端点切片的总览
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
   {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Introduction
diff --git a/content/zh/docs/tasks/administer-cluster/encrypt-data.md b/content/zh/docs/tasks/administer-cluster/encrypt-data.md
index 7784389bd9..5db9e194ab 100644
--- a/content/zh/docs/tasks/administer-cluster/encrypt-data.md
+++ b/content/zh/docs/tasks/administer-cluster/encrypt-data.md
@@ -2,7 +2,7 @@
 reviewers:
 - smarterclayton
 title: 静态加密 Secret 数据
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -10,18 +10,19 @@ content_template: templates/task
 reviewers:
 - smarterclayton
 title: Encrypting Secret Data at Rest
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to enable and configure encryption of secret data at rest.
 -->
 本文展示如何启用和配置静态 Secret 数据的加密
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -38,17 +39,18 @@ This page shows how to enable and configure encryption of secret data at rest.
 
 * 静态数据加密在 1.7.0 中仍然是 alpha 版本，这意味着它可能会在没有通知的情况下进行更改。在升级到 1.8.0 之前，用户可能需要解密他们的数据。
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture prerequisites %}}
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Configuration and determining whether encryption at rest is already enabled
@@ -319,6 +321,6 @@ to force all secrets to be decrypted.
 -->
 并重新启动所有 `kube-apiserver` 进程。然后运行命令 `kubectl get secrets --all-namespaces -o json | kubectl replace -f -` 强制解密所有 secret。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/extended-resource-node.md b/content/zh/docs/tasks/administer-cluster/extended-resource-node.md
index 0418e4065c..9a73d35278 100644
--- a/content/zh/docs/tasks/administer-cluster/extended-resource-node.md
+++ b/content/zh/docs/tasks/administer-cluster/extended-resource-node.md
@@ -1,15 +1,15 @@
 ---
 title: 为节点发布扩展资源
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Advertise Extended Resources for a Node
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to specify extended resources for a Node.
@@ -19,17 +19,18 @@ resources that would otherwise be unknown to Kubernetes.
 本文展示了如何为节点指定扩展资源。 扩展资源允许集群管理员发布节点级别的资源，这些资源在不进行发布的情况下无法被 Kubernetes 感知。
 
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Get the names of your Nodes
@@ -342,10 +343,11 @@ http://localhost:8001/api/v1/nodes/<your-node-name>/status
 kubectl describe node <your-node-name> | grep dongle
 ```
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 (你不应该看到任何输出)
 
@@ -368,4 +370,4 @@ kubectl describe node <your-node-name> | grep dongle
 * [为 Namespace 配置最小和最大内存约束](/docs/tasks/administer-cluster/memory-constraint-namespace/)
 * [为 Namespace 配置最小和最大 CPU 约束](/docs/tasks/administer-cluster/cpu-constraint-namespace/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md b/content/zh/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
index fea250a56c..0f6d8d1312 100644
--- a/content/zh/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
+++ b/content/zh/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
@@ -1,9 +1,9 @@
 ---
 title: 关键插件 Pod 的调度保证
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- 
 In addition to Kubernetes core components like api-server, scheduler, controller-manager running on a master machine
@@ -19,9 +19,9 @@ vacated by the evicted critical add-on pod or the amount of resources available
 如果关键插件被逐出（手动或作为升级等其他操作的副作用）或者变成挂起状态，群集可能会停止正常工作。
 关键插件进入挂起状态的例子有：集群利用率过高；被逐出的关键插件 Pod 释放了空间，但该空间被之前悬决的 Pod 占用；由于其它原因导致节点上可用资源的总量发生变化。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ### Marking pod as critical
@@ -37,4 +37,4 @@ To be considered critical, the pod has to run in the `kube-system` namespace (co
 或者，也可以为 Pod 添加名为 `scheduler.alpha.kubernetes.io/critical-pod`、值为空字符串的注解。
 不过，这一注解从 1.13 版本开始不再推荐使用，并将在 1.14 中删除。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/highly-available-master.md b/content/zh/docs/tasks/administer-cluster/highly-available-master.md
index e926b6f7e3..2c8e9f2dc6 100644
--- a/content/zh/docs/tasks/administer-cluster/highly-available-master.md
+++ b/content/zh/docs/tasks/administer-cluster/highly-available-master.md
@@ -4,7 +4,7 @@ reviewers:
 translaters:
 - Coffey Gao
 title: 搭建高可用的 Kubernetes Masters
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -12,12 +12,12 @@ content_template: templates/task
 reviewers:
 - jszczepkowski
 title: Set up High-Availability Kubernetes Masters
-content_template: templates/task
+content_type: task
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="1.5" state="alpha" >}}
 <!--
@@ -28,16 +28,17 @@ This document describes how to use kube-up/down scripts to manage highly availab
 您可以在谷歌计算引擎（GCE）的 `kubeup` 或 `kube-down` 脚本中复制 Kubernetes Master。
 本文描述了如何使用 kube-up/down 脚本来管理高可用（HA）的 Master，以及如何使用 GCE 实现高可用 Master。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Starting an HA-compatible cluster
 
@@ -225,9 +226,9 @@ This operation may be sped up by migrating etcd data directory, as described [he
 （我们正在考虑在未来添加对迁移 etcd 数据存储的支持）。
 
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 <!--
 ## Implementation notes
 
@@ -342,4 +343,4 @@ To make such deployment secure, communication between etcd instances is authoriz
 
 [自动化高可用集群部署 - 设计文档](https://git.k8s.io/community/contributors/design-proposals/cluster-lifecycle/ha_master.md)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/ip-masq-agent.md b/content/zh/docs/tasks/administer-cluster/ip-masq-agent.md
index f3c5671a4b..5200659a66 100644
--- a/content/zh/docs/tasks/administer-cluster/ip-masq-agent.md
+++ b/content/zh/docs/tasks/administer-cluster/ip-masq-agent.md
@@ -1,28 +1,29 @@
 ---
 title: IP Masquerade Agent 用户指南
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: IP Masquerade Agent User Guide
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to configure and enable the ip-masq-agent.
 -->
 此页面展示如何配置和启用 ip-masq-agent。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 <!--
 ## IP Masquerade Agent User Guide
 -->
@@ -124,9 +125,9 @@ By default, in GCE/Google Kubernetes Engine starting with Kubernetes version 1.7
 -->
 默认情况下，从 Kubernetes 1.7.0 版本开始的 GCE/Google Kubernetes Engine 中，如果启用了网络策略，或者您使用的集群 CIDR 不在 10.0.0.0/8 范围内，则 ip-masq-agent 将在您的集群中运行。如果您在其他环境中运行，则可以将 ip-masq-agent [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) 添加到您的集群：
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create an ip-masq-agent
@@ -217,4 +218,4 @@ nonMasqueradeCIDRs:
 resyncInterval: 60s
 masqLinkLocal: true
 ```
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/kms-provider.md b/content/zh/docs/tasks/administer-cluster/kms-provider.md
index 8d4332d158..f456f639f3 100644
--- a/content/zh/docs/tasks/administer-cluster/kms-provider.md
+++ b/content/zh/docs/tasks/administer-cluster/kms-provider.md
@@ -2,22 +2,23 @@
 reviewers:
 - smarterclayton
 title: 使用 KMS 提供商进行数据加密
-content_template: templates/task
+content_type: task
 ---
 <!-- ---
 reviewers:
 - smarterclayton
 title: Using a KMS provider for data encryption
-content_template: templates/task
+content_type: task
 --- -->
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows how to configure a Key Management Service (KMS) provider and plugin to enable secret data encryption. -->
 
 本页展示了如何配置秘钥管理服务—— Key Management Service (KMS) 提供商和插件以启用数据加密。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -31,9 +32,9 @@ content_template: templates/task
 
 {{< feature-state for_k8s_version="v1.12" state="beta" >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- The KMS encryption provider uses an envelope encryption scheme to encrypt data in etcd. The data is encrypted using a data encryption key (DEK); a new DEK is generated for each encryption. The DEKs are encrypted with a key encryption key (KEK) that is stored and managed in a remote KMS. The KMS provider uses gRPC to communicate with a specific KMS 
 plugin. The KMS plugin, which is implemented as a gRPC server and deployed on the same host(s) as the Kubernetes master(s), is responsible for all communication with the remote KMS. -->
@@ -278,6 +279,6 @@ resources:
 kubectl get secrets --all-namespaces -o json | kubectl replace -f -
 ```
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md b/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md
index a3403ebe1b..664381d24b 100644
--- a/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md
+++ b/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md
@@ -2,18 +2,18 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 使用 kubeadm 进行证书管理
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 reviewers:
 - sig-cluster-lifecycle
 title: Certificate Management with kubeadm
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.15" state="stable" >}}
 
@@ -23,9 +23,10 @@ Client certificates generated by [kubeadm](/docs/reference/setup-tools/kubeadm/k
 
 由 [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) 生成的客户端证书在 1 年后到期。 本页说明如何使用 kubeadm 管理证书续订。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!-- 
 Be familiar with [PKI certificates and requirements in Kubernetes](/docs/setup/certificates/). 
@@ -38,9 +39,9 @@ You should be familiar with [PKI certificates and requirements in Kubernetes](/d
 -->
 您应该熟悉[Kubernetes 中的 PKI 证书和要求](/docs/setup/best-practices/certificates/)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- 
 ## Check certificate expiration 
@@ -387,4 +388,3 @@ After a certificate is signed using your preferred method, the certificate and t
 [cert-cas]: /docs/setup/best-practices/certificates/#single-root-ca
 [cert-table]: /docs/setup/best-practices/certificates/#all-certificates
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
index 0d66afcc97..ad176a8e5f 100644
--- a/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
+++ b/content/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
@@ -2,18 +2,18 @@
 reviewers:
 - sig-cluster-lifecycle
 title: 升级 kubeadm 集群
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 reviewers:
 - sig-cluster-lifecycle
 title: Upgrading kubeadm clusters
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page explains how to upgrade a Kubernetes cluster created with kubeadm from version
@@ -49,9 +49,10 @@ The upgrade workflow at high level is the following:
 1. 升级其他控制平面节点。
 1. 升级工作节点。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 - You need to have a kubeadm Kubernetes cluster running version 1.16.0 or later.
@@ -83,9 +84,9 @@ The upgrade workflow at high level is the following:
 - 您只能从一个次版本升级到下一个次版本，或者同样次版本的补丁版。也就是说，升级时无法跳过版本。
   例如，您只能从 1.y 升级到 1.y+1，而不能从 from 1.y 升级到 1.y+2。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Determine which version to upgrade to
@@ -612,7 +613,7 @@ The `STATUS` column should show `Ready` for all your nodes, and the version numb
 -->
 `STATUS` 应显示所有节点为 `Ready` 状态，并且版本号已经被更新。 
 
-{{% /capture %}}
+
 
 <!--
 ## Recovering from a failure state
diff --git a/content/zh/docs/tasks/administer-cluster/kubelet-config-file.md b/content/zh/docs/tasks/administer-cluster/kubelet-config-file.md
index db7ecc67c4..677bb4426c 100644
--- a/content/zh/docs/tasks/administer-cluster/kubelet-config-file.md
+++ b/content/zh/docs/tasks/administer-cluster/kubelet-config-file.md
@@ -3,7 +3,7 @@ reviewers:
 - mtaufen
 - dawnchen
 title: 通过配置文件设置 Kubelet 参数
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -11,11 +11,11 @@ reviewers:
 - mtaufen
 - dawnchen
 title: Set Kubelet parameters via a config file
-content_template: templates/task
+content_type: task
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="beta" >}}
 
 <!--
@@ -31,18 +31,19 @@ it simplifies node deployment and configuration management.
 --->
 建议通过配置文件的方式提供参数，因为这样可以简化节点部署和配置管理。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 - A v1.10 or higher Kubelet binary must be installed for beta functionality.
 --->
 - 需要安装 1.10 或更高版本的 Kubelet 二进制文件，才能实现 beta 功能。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create the config file
@@ -98,9 +99,9 @@ In the above example, this version is `kubelet.config.k8s.io/v1beta1`.
 --->
 请注意，命令行参数和 Kubelet 配置文件的某些默认值不同。如果设置了 `--config`，并且没有通过命令行指定值，则 `KubeletConfiguration` 版本的默认值生效。在上面的例子中，version 是 `kubelet.config.k8s.io/v1beta1`。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Relationship to Dynamic Kubelet Config
@@ -113,6 +114,6 @@ feature, the combination of configuration provided via `--config` and any flags
 is considered the default "last known good" configuration by the automatic rollback mechanism.
 --->
 如果您正在使用 [动态 Kubelet 配置](/docs/tasks/administer-cluster/reconfigure-kubelet) 特性，那么自动回滚机制将认为是 "最后已知正常（last known good）" 的配置，通过 `--config` 提供的配置与覆盖这些值的任何参数的结合。
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/limit-storage-consumption.md b/content/zh/docs/tasks/administer-cluster/limit-storage-consumption.md
index e8cadbd4b2..29070a748f 100644
--- a/content/zh/docs/tasks/administer-cluster/limit-storage-consumption.md
+++ b/content/zh/docs/tasks/administer-cluster/limit-storage-consumption.md
@@ -1,16 +1,16 @@
 ---
 title: 限制存储消耗
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Limit Storage Consumption
-content_template: templates/task
+content_type: task
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This example demonstrates an easy way to limit the amount of storage consumed in a namespace.
@@ -24,15 +24,16 @@ and [PersistentVolumeClaim](/docs/concepts/storage/persistent-volumes/).
 -->
 演示中用到了以下资源：[ResourceQuota](/docs/concepts/policy/resource-quotas/)，[LimitRange](/docs/tasks/administer-cluster/memory-default-namespace/) 和 [PersistentVolumeClaim](/docs/concepts/storage/persistent-volumes/)。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Scenario: Limiting Storage Consumption
@@ -123,9 +124,9 @@ spec:
     requests.storage: "5Gi"
 ```
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Summary
@@ -138,6 +139,6 @@ cluster's storage budget without risk of any one project going over their allotm
 -->
 限制范围对象可以用来设置可请求的存储量上限，而资源配额对象则可以通过申领计数和累计存储容量有效地限制命名空间耗用的存储量。这两种机制使得集群管理员能够规划其集群存储预算而不会发生任一项目超量分配的风险。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md
index 8607d283b6..de2cb0f12d 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md
@@ -1,18 +1,18 @@
 ---
 title: 为命名空间配置CPU最小和最大限制
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
 <!--
 ---
 title: Configure Minimum and Maximum CPU Constraints for a Namespace
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to set minimum and maximum values for the CPU resources used by Containers
@@ -24,10 +24,11 @@ in the namespace.
 
 本章介绍命名空间中可以被容器和Pod使用的CPU资源的最小和最大值。你可以通过 [LimitRange](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#limitrange-v1-core) 对象声明 CPU 的最小和最大值. 如果 Pod 不能满足 LimitRange 的限制，它就不能在命名空间中创建。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -37,10 +38,10 @@ Each node in your cluster must have at least 1 CPU.
 
 你的集群中每个节点至少要有1个CPU。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -401,9 +402,10 @@ Delete your namespace:
 kubectl delete namespace constraints-cpu-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -453,4 +455,4 @@ kubectl delete namespace constraints-cpu-example
 
 * [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace.md
index 837d07efdf..6aa7b7ac0e 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace.md
@@ -1,18 +1,18 @@
 ---
 title: 为命名空间配置默认的CPU请求和限制
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 
 <!--
 ---
 title: Configure Default CPU Requests and Limits for a Namespace
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to configure default CPU requests and limits for a namespace.
 A Kubernetes cluster can be divided into namespaces. If a Container is created in a namespace
@@ -23,14 +23,15 @@ under certain conditions that are explained later in this topic.
 
 本章介绍怎样为命名空间配置默认的 CPU 请求和限制。
 一个 Kubernetes 集群可被划分为多个命名空间。如果在配置了 CPU 限制的命名空间创建容器，并且该容器没有声明自己的 CPU 限制，那么这个容器会被指定默认的 CPU 限制。Kubernetes 在一些特定情况还会指定 CPU 请求，本文后续章节将会对其进行解释。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -256,9 +257,10 @@ it can be allowed to run in a namespace that is restricted by a quota.
 
 如果容器没有声明自己的 CPU 限制，将会给它一个默认限制，这样它就能被允许运行在一个有配额限制的命名空间中。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -312,4 +314,4 @@ it can be allowed to run in a namespace that is restricted by a quota.
 
 * [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md
index 0fd7481edc..48cfd64b47 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md
@@ -1,18 +1,18 @@
 ---
 title: 配置命名空间的最小和最大内存约束
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 
 <!--
 ---
 title: Configure Minimum and Maximum Memory Constraints for a Namespace
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to set minimum and maximum values for memory used by Containers
@@ -24,10 +24,11 @@ it cannot be created in the namespace.
 
 此页面介绍如何设置在命名空间中运行的容器使用的内存的最小值和最大值。 您可以在 [LimitRange](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#limitrange-v1-core)对象中指定最小和最大内存值。 如果 Pod 不满足 LimitRange 施加的约束，则无法在命名空间中创建它。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -37,10 +38,10 @@ Each node in your cluster must have at least 1 GiB of memory.
 
 集群中每个节点必须至少要有1 GiB 的内存。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -387,9 +388,10 @@ Delete your namespace:
 kubectl delete namespace constraints-mem-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -439,4 +441,4 @@ kubectl delete namespace constraints-mem-example
 
 * [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/memory-default-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/memory-default-namespace.md
index 6c801f6f08..7a2259a274 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/memory-default-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/memory-default-namespace.md
@@ -1,18 +1,18 @@
 ---
 title: 为命名空间配置默认的内存请求和限制
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 
 <!--
 ---
 title: Configure Default Memory Requests and Limits for a Namespace
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to configure default memory requests and limits for a namespace.
@@ -23,9 +23,10 @@ Kubernetes assigns a default memory request under certain conditions that are ex
 
 本文介绍怎样给命名空间配置默认的内存请求和限制。如果在一个有默认内存限制的命名空间创建容器，该容器没有声明自己的内存限制时，将会被指定默认内存限制。Kubernetes 还为某些情况指定了默认的内存请求，本章后面会进行介绍。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -35,9 +36,9 @@ Each node in your cluster must have at least 2 GiB of memory.
 
 你的集群中的每个节点必须至少有2 GiB的内存。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -274,9 +275,10 @@ it can be allowed to run in a namespace that is restricted by a quota.
 
 如果一个容器没有声明自己的内存限制，会被指定默认限制，然后它才会被允许在限定了配额的命名空间中运行。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -330,4 +332,4 @@ it can be allowed to run in a namespace that is restricted by a quota.
 
 * [为 Pod 配置服务数量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace.md
index 7947c43be8..74b6b528eb 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace.md
@@ -1,18 +1,18 @@
 ---
 title: 为命名空间配置内存和 CPU 配额
-content_template: templates/task
+content_type: task
 weight: 50
 ---
 
 <!--
 ---
 title: Configure Memory and CPU Quotas for a Namespace
-content_template: templates/task
+content_type: task
 weight: 50
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to set quotas for the total amount memory and CPU that
@@ -25,10 +25,11 @@ object.
 对象设置配额.
 
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -38,10 +39,10 @@ Each node in your cluster must have at least 1 GiB of memory.
 
 集群中每个节点至少有1 GiB的内存。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -245,9 +246,10 @@ Delete your namespace:
 kubectl delete namespace quota-mem-cpu-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -297,4 +299,4 @@ kubectl delete namespace quota-mem-cpu-example
 
 * [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace.md b/content/zh/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace.md
index ea2897306c..7490e4c37d 100644
--- a/content/zh/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace.md
+++ b/content/zh/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace.md
@@ -1,26 +1,27 @@
 ---
 title: 配置命名空间下pod总数
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文主要描述如何配置一个命名空间下可运行的pod总数。资源配额详细信息可查看：[资源配额](/docs/api-reference/v1.7/#resourcequota-v1-core)
 。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 创建一个命名空间
 
@@ -102,9 +103,10 @@ lastUpdateTime: 2017-07-07T20:57:05Z
 kubectl delete namespace quota-pod-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 ### 对于集群管理
 
@@ -128,7 +130,7 @@ kubectl delete namespace quota-pod-example
 
 * [配置pod的QoS](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md b/content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md
index 51fc980a06..5564bec734 100644
--- a/content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md
+++ b/content/zh/docs/tasks/administer-cluster/namespaces-walkthrough.md
@@ -3,17 +3,17 @@ reviewers:
 - derekwaynecarr
 - janetkuo
 title: 命名空间演练
-content_template: templates/task
+content_type: task
 ---
 <!-- ---
 reviewers:
 - derekwaynecarr
 - janetkuo
 title: Namespaces Walkthrough
-content_template: templates/task
+content_type: task
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- Kubernetes {{< glossary_tooltip text="namespaces" term_id="namespace" >}}
 help different projects, teams, or customers to share a Kubernetes cluster. -->
 
@@ -38,16 +38,17 @@ Kubernetes {{< glossary_tooltip text="命名空间" term_id="namespace" >}}
 
 此示例演示了如何使用 Kubernetes 命名空间细分群集。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Prerequisites -->
 
@@ -383,4 +384,4 @@ authorization rules for each namespace. -->
 
 随着 Kubernetes 中的策略支持的发展，我们将扩展此场景，以展示如何为每个命名空间提供不同的授权规则。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/namespaces.md b/content/zh/docs/tasks/administer-cluster/namespaces.md
index 5d25fe0f6d..f2e63f5d48 100644
--- a/content/zh/docs/tasks/administer-cluster/namespaces.md
+++ b/content/zh/docs/tasks/administer-cluster/namespaces.md
@@ -3,33 +3,34 @@ reviewers:
 - derekwaynecarr
 - janetkuo
 title: 通过命名空间共享集群
-content_template: templates/task
+content_type: task
 ---
 <!-- ---
 reviewers:
 - derekwaynecarr
 - janetkuo
 title: Share a Cluster with Namespaces
-content_template: templates/task
+content_type: task
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows how to view, work in, and delete {{< glossary_tooltip text="namespaces" term_id="namespace" >}}. The page also shows how to use Kubernetes namespaces to subdivide your cluster. -->
 
 本页展示了如何查看、使用和删除{{< glossary_tooltip text="namespaces" term_id="namespace" >}}。本页同时展示了如何使用 Kubernetes 命名空间去细分集群。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!-- * Have an [existing Kubernetes cluster](/docs/setup/).
 * Have a basic understanding of Kubernetes _[Pods](/docs/concepts/workloads/pods/pod/)_, _[Services](/docs/concepts/services-networking/service/)_, and _[Deployments](/docs/concepts/workloads/controllers/deployment/)_. -->
 
 * 您已拥有一个 [配置好的 Kubernetes 集群](/docs/setup/).
 * 您已对 Kubernetes 的 _[Pods](/docs/concepts/workloads/pods/pod/)_, _[Services](/docs/concepts/services-networking/service/)_, 和 _[Deployments](/docs/concepts/workloads/controllers/deployment/)_ 有基本理解。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Viewing namespaces -->
 
@@ -460,9 +461,9 @@ authorization rules for each namespace. -->
 
 随着 Kubernetes 中的策略支持的发展，我们将扩展此场景，以展示如何为每个命名空间提供不同的授权规则。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- ## Understanding the motivation for using namespaces -->
 
@@ -552,9 +553,10 @@ across namespaces, you need to use the fully qualified domain name (FQDN). -->
 
 当您创建 [Service](/docs/concepts/services-networking/service/) 时，它会创建相应的 [DNS 条目](/docs/concepts/services-networking/dns-pod-service/)。此条目的格式为 `<service-name>。<namespace-name> .svc.cluster.local`，这意味着如果容器只使用 `<service-name>`，它将解析为本地服务到命名空间。 这对于在多个命名空间（如开发，暂存和生产）中使用相同的配置非常有用。 如果要跨命名空间访问，则需要使用完全限定的域名（FQDN）。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- * Learn more about [setting the namespace preference](/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-preference).
 * Learn more about [setting the namespace for a request](/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-for-a-request)
 * See [namespaces design](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/architecture/namespaces.md). -->
@@ -564,6 +566,6 @@ across namespaces, you need to use the fully qualified domain name (FQDN). -->
 * 了解更多 [设置请求的命名空间](/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-for-a-request) 的内容。
 * 参见 [命名空间设计](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/architecture/namespaces.md)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy.md b/content/zh/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy.md
index dd94193b7c..4abb9ad1b9 100644
--- a/content/zh/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy.md
@@ -2,22 +2,23 @@
 reviewers:
 - caseydavenport
 title: 使用 Calico 作为 NetworkPolicy
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows a couple of quick ways to create a Calico cluster on Kubernetes. -->
 本页展示了两种在 Kubernetes 上快速创建 Calico 集群的方法。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!-- Decide whether you want to deploy a [cloud](#creating-a-calico-cluster-with-google-kubernetes-engine-gke) or [local](#creating-a-local-calico-cluster-with-kubeadm) cluster. -->
 
 决定您想部署一个[云](#在-Google-Kubernetes-Engine-GKE-上创建一个-Calico-集群) 还是 [本地](#使用-kubeadm-创建一个本地-Calico-集群) 集群。
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!-- ## Creating a Calico cluster with Google Kubernetes Engine (GKE)
 
 **Prerequisite**: [gcloud](https://cloud.google.com/sdk/docs/quickstarts).
@@ -80,10 +81,11 @@ To get a local single-host Calico cluster in fifteen minutes using kubeadm, refe
 在15分钟内使用 kubeadm 得到一个本地单主机 Calico 集群，请参考
 [Calico 快速入门](https://docs.projectcalico.org/latest/getting-started/kubernetes/)。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- Once your cluster is running, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy. -->
 集群运行后，您可以按照 [声明 Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) 去尝试使用 Kubernetes NetworkPolicy。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy.md b/content/zh/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy.md
index 400e3c03ad..151985e4bc 100644
--- a/content/zh/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy.md
@@ -2,11 +2,11 @@
 reviewers:
 - danwent
 title: 使用 Cilium 作为 NetworkPolicy
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows how to use Cilium for NetworkPolicy.
 
 For background on Cilium, read the [Introduction to Cilium](https://cilium.readthedocs.io/en/latest/intro). -->
@@ -15,15 +15,16 @@ For background on Cilium, read the [Introduction to Cilium](https://cilium.readt
 
 关于 Cilium 的背景知识，请阅读 [Cilium 介绍](https://cilium.readthedocs.io/en/latest/intro)。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Deploying Cilium on Minikube for Basic Testing
 
@@ -71,9 +72,9 @@ production DaemonSet files.
 关于部署 Cilium 用于生产的详细说明，请见[Cilium Kubernetes 安装指南](https://cilium.readthedocs.io/en/latest/gettingstarted/#installation)
 ，此文档包括详细的需求、说明和生产用途 DaemonSet 文件示例。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 <!--
 ##  Understanding Cilium components
 
@@ -116,9 +117,10 @@ configuration because it automatically connects to the minikube's etcd instance.
 包括了一个示例 DaemonSet，可以自定义指定此键值存储集群。
 简单的 minikube 的“一体化” DaemonSet 不需要这样的配置，因为它会自动连接到 minikube 的 etcd 实例。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- Once your cluster is running, you can follow the
 [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/)
 to try out Kubernetes NetworkPolicy with Cilium.
@@ -129,5 +131,5 @@ Have fun, and if you have questions, contact us using the
 玩得开心，如果您有任何疑问，请联系我们
 [Cilium Slack Channel](https://cilium.herokuapp.com/)。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/administer-cluster/network-policy-provider/kube-router-network-policy.md b/content/zh/docs/tasks/administer-cluster/network-policy-provider/kube-router-network-policy.md
index 901184cb25..7c4fb19240 100644
--- a/content/zh/docs/tasks/administer-cluster/network-policy-provider/kube-router-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/network-policy-provider/kube-router-network-policy.md
@@ -2,30 +2,32 @@
 reviewers:
 - murali-reddy
 title: 使用 Kube-router 作为 NetworkPolicy
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- This page shows how to use [Kube-router](https://github.com/cloudnativelabs/kube-router) for NetworkPolicy. -->
 本页展示了如何使用 [Kube-router](https://github.com/cloudnativelabs/kube-router) 作为 NetworkPolicy。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!-- You need to have a Kubernetes cluster running. If you do not already have a cluster, you can create one by using any of the cluster installers like Kops, Bootkube, Kubeadm etc. -->
 
 您需要拥有一个正在运行的 Kubernetes 集群。如果您还没有集群，可以使用任意的集群安装器如 Kops，Bootkube，Kubeadm 等创建一个。
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!-- ## Installing Kube-router addon
 The Kube-router Addon comes with a Network Policy Controller that watches Kubernetes API server for any NetworkPolicy and pods updated and configures iptables rules and ipsets to allow or block traffic as directed by the policies. Please follow the [trying Kube-router with cluster installers](https://www.kube-router.io/docs/user-guide/#try-kube-router-with-cluster-installers) guide to install Kube-router addon. -->
 
 ## 安装 Kube-router 插件
 Kube-router 插件自带一个Network Policy 控制器，监视来自于Kubernetes API server 的 NetworkPolicy 和 pods 的变化，根据策略指示配置 iptables 规则和 ipsets 来允许或阻止流量。请根据 [尝试通过集群安装器使用 Kube-router](https://www.kube-router.io/docs/user-guide/#try-kube-router-with-cluster-installers) 指南安装 Kube-router 插件。
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- Once you have installed the Kube-router addon, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy. -->
 在您安装 Kube-router 插件后，可以根据 [声明 Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) 去尝试使用 Kubernetes NetworkPolicy。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md b/content/zh/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md
index 28bb1641df..e355e9c547 100644
--- a/content/zh/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md
@@ -2,25 +2,26 @@
 reviewers:
 - chrismarino
 title: 使用 Romana 作为 NetworkPolicy
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- This page shows how to use Romana for NetworkPolicy. -->
 本页展示如何使用 Romana 作为 NetworkPolicy。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!-- Complete steps 1, 2, and 3 of  the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/). -->
 完成[kubeadm 入门指南](/docs/getting-started-guides/kubeadm/)中的1、2、3步。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Installing Romana with kubeadm
 
@@ -46,12 +47,13 @@ To apply network policies use one of the following:
     * [Romana 网络策略例子](https://github.com/romana/core/blob/master/doc/policy.md)
 * NetworkPolicy API
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 Once you have installed Romana, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy.
  -->
 Romana 安装完成后，您可以按照[声明 Network Policy](/docs/tasks/administer-cluster/declare-network-policy/)去尝试使用 Kubernetes NetworkPolicy。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md b/content/zh/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md
index ff3ede466f..5e7b4baaba 100644
--- a/content/zh/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md
+++ b/content/zh/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md
@@ -2,26 +2,27 @@
 reviewers:
 - bboreham
 title: 使用 Weave Net 作为 NetworkPolicy
-content_template: templates/task
+content_type: task
 weight: 50
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- This page shows how to use Weave Net for NetworkPolicy. -->
 
 本页展示了如何使用使用 Weave Net 作为 NetworkPolicy。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 You need to have a Kubernetes cluster. Follow the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/) to bootstrap one.
  -->
 您需要拥有一个 Kubernetes 集群。按照[kubeadm 入门指南](/docs/getting-started-guides/kubeadm/)来引导一个。
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Install the Weave Net addon
 
@@ -69,13 +70,14 @@ weave-net-pmw8w                         2/2       Running   0          9d
 <!-- Each Node has a weave Pod, and all Pods are `Running` and `2/2 READY`. (`2/2` means that each Pod has `weave` and `weave-npc`.) -->
 每个 Node 都有一个 weave Pod，所有 Pod 都是`Running`和`2/2 READY`。（`2/2`表示每个Pod都有`weave`和`weave-npc`。）
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 Once you have installed the Weave Net addon, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy. If you have any question, contact us at [#weave-community on Slack or Weave User Group](https://github.com/weaveworks/weave#getting-help).
  -->
 
 安装Weave Net插件后，您可以按照[声明网络策略](/docs/tasks/administration-cluster/declare-network-policy/)来试用 Kubernetes NetworkPolicy。 如果您有任何疑问，请联系我们[#weave-community on Slack 或 Weave User Group](https://github.com/weaveworks/weave#getting-help)。
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/administer-cluster/nodelocaldns.md b/content/zh/docs/tasks/administer-cluster/nodelocaldns.md
index 8c50aa56ca..8654e98818 100644
--- a/content/zh/docs/tasks/administer-cluster/nodelocaldns.md
+++ b/content/zh/docs/tasks/administer-cluster/nodelocaldns.md
@@ -3,7 +3,7 @@ reviewers:
 - bowei
 - zihongz
 title: 在 Kubernetes 集群中使用 NodeLocal DNSCache
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -11,24 +11,25 @@ reviewers:
 - bowei
 - zihongz
 title: Using NodeLocal DNSCache in Kubernetes clusters
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page provides an overview of NodeLocal DNSCache feature in Kubernetes.
 -->
 本页概述了 Kubernetes 中的 NodeLocal DNSCache 功能。
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
  {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
- {{% capture steps %}}
+
+ <!-- steps -->
 
 <!--
 ## Introduction
@@ -154,5 +155,5 @@ The addon can be applied using the yaml specified above in any k8s version. The
 | 1.15 | Beta(默认情况下未启用) |
 | 1.13 | Alpha(默认情况下未启用) |
 
- {{% /capture %}}
+ 
 
diff --git a/content/zh/docs/tasks/administer-cluster/out-of-resource.md b/content/zh/docs/tasks/administer-cluster/out-of-resource.md
index ba6a50cc7e..927fb1ab56 100644
--- a/content/zh/docs/tasks/administer-cluster/out-of-resource.md
+++ b/content/zh/docs/tasks/administer-cluster/out-of-resource.md
@@ -4,7 +4,7 @@ reviewers:
 - vishh
 - timstclair
 title: 配置资源不足时的处理方式
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
@@ -13,11 +13,11 @@ reviewers:
 - vishh
 - timstclair
 title: Configure Out Of Resource Handling
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page explains how to configure out of resource handling with `kubelet`.
@@ -32,10 +32,10 @@ nodes become unstable.
 
 当可用计算资源较少时，`kubelet`需要保证节点稳定性。这在处理如内存和硬盘之类的不可压缩资源时尤为重要。如果任意一种资源耗尽，节点将会变得不稳定。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Eviction Policy
@@ -670,4 +670,4 @@ the ability to get root container stats on an on-demand basis [(https://github.c
 ### kubelet 可能会驱逐超过需求数量的 pod
 
 由于状态采集的时间差，驱逐操作可能驱逐比所需的更多的 pod。将来可通过添加从根容器获取所需状态的能力 [https://github.com/google/cadvisor/issues/1247](https://github.com/google/cadvisor/issues/1247) 来减缓这种状况。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/quota-api-object.md b/content/zh/docs/tasks/administer-cluster/quota-api-object.md
index 298ef459e5..6011da5a29 100644
--- a/content/zh/docs/tasks/administer-cluster/quota-api-object.md
+++ b/content/zh/docs/tasks/administer-cluster/quota-api-object.md
@@ -1,16 +1,16 @@
 ---
 title: 配置 API 对象配额
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Configure Quotas for API Objects
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to configure quotas for API objects, including
@@ -25,17 +25,18 @@ object.
 配额限制了可以在命名空间中创建的特定类型对象的数量。
 您可以在 [ResourceQuota](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#resourcequota-v1-core) 对象中指定配额。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -220,9 +221,10 @@ Delete your namespace:
 kubectl delete namespace quota-object-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For cluster administrators
@@ -270,5 +272,5 @@ kubectl delete namespace quota-object-example
 * [为容器和 Pod 分配 CPU 资源](/docs/tasks/configure-pod-container/assign-cpu-resource/)
 * [为 Pod 配置服务质量](/docs/tasks/configure-pod-container/quality-service-pod/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md b/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md
index 14fb191c54..126cbf4b19 100644
--- a/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md
+++ b/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md
@@ -1,6 +1,6 @@
 ---
 title: 在实时集群上重新配置节点的 Kubelet
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -10,12 +10,12 @@ reviewers:
 - mtaufen
 - dawnchen
 title: Reconfigure a Node's Kubelet in a Live Cluster
-content_template: templates/task
+content_type: task
 ---
 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.11" state="beta" >}}
 
@@ -42,9 +42,10 @@ fields is available in the inline `KubeletConfiguration`
 [类型文档](https://github.com/kubernetes/kubernetes/blob/release-1.11/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go)。
 {{< /warning >}}
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 - Kubernetes v1.11 or higher on both the Master and the Nodes
 - kubectl v1.11 or higher, configured to communicate with the cluster
@@ -56,9 +57,9 @@ fields is available in the inline `KubeletConfiguration`
 - kubectl v1.11 或者更高版本和集群配置通信
 - The Kubelet `--dynamic-config-dir` flag 必须设置在节点的可写目录上
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Reconfiguring the Kubelet on a Live Node in your Cluster -->
 ## 在你集群中的一个实时节点上配置Kubelet
@@ -529,9 +530,9 @@ error is reported.
 在删除此字段后，`Node.Status.Config` 最终变成空，所有配置源都已重置为 `nil`，这表示
 本地默认配置是`assigned`，`active` 和 `lastKnownGood`这三个参数，没有报告错误。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- ## Kubectl Patch Example -->
 ## Kubectl 补丁示例
@@ -691,4 +692,4 @@ in the Kubelet log for additional details and context about the error.
 </tr>
 </table>
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md b/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md
index 9abaef533e..3b26ba5ba9 100644
--- a/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md
+++ b/content/zh/docs/tasks/administer-cluster/reserve-compute-resources.md
@@ -4,7 +4,7 @@ reviewers:
 - derekwaynecarr
 - dashpole
 title: 为系统守护进程预留计算资源
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -13,11 +13,11 @@ reviewers:
 - derekwaynecarr
 - dashpole
 title: Reserve Compute Resources for System Daemons
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Kubernetes nodes can be scheduled to `Capacity`. Pods can consume all the
 available capacity on a node by default. This is an issue because nodes
@@ -34,16 +34,17 @@ on each node.
 Kubernetes 的节点可以按照 `Capacity` 调度。默认情况下 pod 能够使用节点全部可用容量。这是个问题，因为节点自己通常运行了不少驱动 OS 和 Kubernetes 的系统守护进程。除非为这些系统守护进程留出资源，否则它们将与 pod 争夺资源并导致节点资源短缺问题。
 
 `kubelet` 公开了一个名为 `Node Allocatable` 的特性，有助于为系统守护进程预留计算资源。Kubernetes 推荐集群管理员按照每个节点上的工作负载密度配置 `Node Allocatable`。
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Node Allocatable
@@ -370,9 +371,9 @@ So expect a drop in `Allocatable` capacity in future releases.
 
 随着时间的增长以及越来越多特性的加入，kube 系统守护进程对资源的需求可能也会增加。以后 kubernetes 项目将尝试减少对节点系统守护进程的利用，但目前那并不是优先事项。所以，请期待在将来的发布中将 `Allocatable` 容量降低。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Example Scenario
@@ -461,4 +462,4 @@ daemons/interrupts/timers and Kubernetes daemons.
 -->
 从 Kubernetes 1.17 版本开始，可以选择将 `reserved-cpus` 显式 cpuset 指定为操作系统守护程序、中断、计时器和 Kubernetes 守护程序保留的 CPU。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/running-cloud-controller.md b/content/zh/docs/tasks/administer-cluster/running-cloud-controller.md
index 014bb69dfc..1e0371908e 100644
--- a/content/zh/docs/tasks/administer-cluster/running-cloud-controller.md
+++ b/content/zh/docs/tasks/administer-cluster/running-cloud-controller.md
@@ -4,7 +4,7 @@ reviewers:
 - thockin
 - wlan0
 title: Kubernetes 云管理控制器
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
@@ -13,11 +13,11 @@ reviewers:
 - thockin
 - wlan0
 title: Kubernetes Cloud Controller Manager
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="beta" >}}
 <!--
@@ -29,10 +29,10 @@ Kubernetes v1.6 包含一个新的二进制文件，叫做 `cloud-controller-man
 
 `cloud-controller-manager` 可以被链接到任何满足 [cloudprovider.Interface](https://github.com/kubernetes/cloud-provider/blob/master/cloud.go) 约束的云服务提供商。为了兼容旧版本，Kubernetes 核心项目中提供的 [cloud-controller-manager](https://github.com/kubernetes/kubernetes/tree/master/cmd/cloud-controller-manager) 使用和 `kube-controller-manager` 相同的云服务类库。已经在 Kubernetes 核心项目中支持的云服务提供商预计将通过使用 in-tree 的 cloud-controller-manager 过渡到 Kubernetes 核心之外。在将来的 Kubernetes 发布中，所有的云管理控制器将在 Kubernetes 核心项目之外，由 sig 领导者或者云服务厂商进行开发。 
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Administration
@@ -177,4 +177,3 @@ Kubelet 中的 TLS 引导特性是一个很好的例子。目前，TLS 引导认
 
 要构建和开发您自己的云管理控制器，请阅读 [开发云管理控制器](/docs/tasks/administer-cluster/developing-cloud-controller-manager.md) 文档。
 
-{{% /capture %}}
\ No newline at end of file
diff --git a/content/zh/docs/tasks/administer-cluster/securing-a-cluster.md b/content/zh/docs/tasks/administer-cluster/securing-a-cluster.md
index 5ca29fab5f..77a32f2bca 100644
--- a/content/zh/docs/tasks/administer-cluster/securing-a-cluster.md
+++ b/content/zh/docs/tasks/administer-cluster/securing-a-cluster.md
@@ -5,7 +5,7 @@ reviewers:
 - ericchiang
 - destijl
 title: 集群安全
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -15,11 +15,11 @@ reviewers:
 - ericchiang
 - destijl
 title: Securing a Cluster
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This document covers topics related to protecting a cluster from accidental or malicious access
@@ -27,15 +27,16 @@ and provides recommendations on overall security.
 -->
 本文档涉及与保护集群免受意外或恶意访问有关的主题，并对总体安全性提出建议。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Controlling access to the Kubernetes API
@@ -365,6 +366,6 @@ page for more on how to report vulnerabilities.
 
 加入 [kubernetes-announce](https://groups.google.com/forum/#!forum/kubernetes-announce) 组，能够获取有关安全公告的邮件。有关如何报告漏洞的更多信息，请参见 [安全报告](/security/)页面。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/administer-cluster/sysctl-cluster.md b/content/zh/docs/tasks/administer-cluster/sysctl-cluster.md
index acf6849d40..a0677d067c 100644
--- a/content/zh/docs/tasks/administer-cluster/sysctl-cluster.md
+++ b/content/zh/docs/tasks/administer-cluster/sysctl-cluster.md
@@ -2,7 +2,7 @@
 title: 在 Kubernetes 集群中使用 sysctl
 reviewers:
 - sttts
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -11,12 +11,12 @@ content_template: templates/task
 title: Using sysctls in a Kubernetes Cluster
 reviewers:
 - sttts
-content_template: templates/task
+content_type: task
 ---
 
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.11" state="beta" >}}
 
 <!--
@@ -25,15 +25,16 @@ Kubernetes cluster using the sysctl interface.
 --->
 本文档介绍如何通过 sysctl 接口在 Kubernetes 集群中配置和使用内核参数。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Listing all Sysctl Parameters
@@ -223,9 +224,9 @@ spec:
       value: "65536"
   ...
 ```
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 {{< warning >}}
 <!--
@@ -329,4 +330,4 @@ spec:
  ...
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/administer-cluster/topology-manager.md b/content/zh/docs/tasks/administer-cluster/topology-manager.md
index 547dfd6638..c0eb000957 100644
--- a/content/zh/docs/tasks/administer-cluster/topology-manager.md
+++ b/content/zh/docs/tasks/administer-cluster/topology-manager.md
@@ -6,7 +6,7 @@ reviewers:
 - lmdaly
 - nolancon
 
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -17,11 +17,11 @@ reviewers:
 - lmdaly
 - nolancon
 
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="alpha" >}}
 
@@ -43,15 +43,16 @@ _Topology Manager_ is a Kubelet component that aims to co-ordinate the set of co
 -->
 _拓扑管理器（Topology Manager）_ 是一个 Kubelet 的一部分，旨在协调负责这些优化的一组组件。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## How Topology Manager Works
@@ -345,4 +346,4 @@ Using this information the Topology Manager calculates the optimal hint for the
 3. 调度器不支持拓扑功能，因此可能会由于拓扑管理器的原因而在节点上进行调度，然后在该节点上调度失败。
 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/assign-cpu-resource.md b/content/zh/docs/tasks/configure-pod-container/assign-cpu-resource.md
index 429e5e6c4e..dc538c64f3 100644
--- a/content/zh/docs/tasks/configure-pod-container/assign-cpu-resource.md
+++ b/content/zh/docs/tasks/configure-pod-container/assign-cpu-resource.md
@@ -1,18 +1,18 @@
 <!--
 ---
 title: Assign CPU Resources to Containers and Pods
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 -->
 
 ---
 title: 为容器和 Pods 分配 CPU 资源
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to assign a CPU *request* and a CPU *limit* to
@@ -23,10 +23,11 @@ allocated as much CPU as it requests.
 此页面显示如何将 CPU *request* 和 CPU *limit* 分配给一个容器。容器使用的 CPU 不能超过配额限制。
 如果系统有空闲的 CPU 时间，则可以保证根据请求给容器分配尽可能多的 CPU 资源。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -76,10 +77,10 @@ NAME
 v1beta1.metrics.k8s.io
 ```
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 <!-- 
@@ -405,9 +406,10 @@ Delete your namespace:
 kubectl delete namespace cpu-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- 
 ### For app developers
@@ -456,5 +458,5 @@ kubectl delete namespace cpu-example
 
 * [配置 API 对象的配额](/docs/tasks/administer-cluster/quota-api-object/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/configure-pod-container/assign-memory-resource.md b/content/zh/docs/tasks/configure-pod-container/assign-memory-resource.md
index 1a67f8afaa..74556aa9a1 100644
--- a/content/zh/docs/tasks/configure-pod-container/assign-memory-resource.md
+++ b/content/zh/docs/tasks/configure-pod-container/assign-memory-resource.md
@@ -1,18 +1,18 @@
 ---
 title: 为容器和 Pod 分配内存资源
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 
 <!--
 ---
 title: Assign Memory Resources to Containers and Pods
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to assign a memory *request* and a memory *limit* to a
@@ -21,10 +21,11 @@ but is not allowed to use more memory than its limit.
 -->
 此页面显示如何将内存 *请求* （request）和内存 *限制* （limit）分配给一个容器。我们保障容器拥有它请求数量的内存，但不允许使用超过限制数量的内存。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -72,9 +73,9 @@ NAME
 v1beta1.metrics.k8s.io
 ```
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a namespace
@@ -507,9 +508,10 @@ Delete your namespace. This deletes all the Pods that you created for this task:
 kubectl delete namespace mem-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 ### 应用开发者扩展阅读
 
@@ -533,7 +535,7 @@ kubectl delete namespace mem-example
 
 * [配置 API 对象配额](/docs/tasks/administer-cluster/quota-api-object/)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/configure-pod-container/assign-pods-nodes.md b/content/zh/docs/tasks/configure-pod-container/assign-pods-nodes.md
index 770c429b9b..be2f8d030b 100644
--- a/content/zh/docs/tasks/configure-pod-container/assign-pods-nodes.md
+++ b/content/zh/docs/tasks/configure-pod-container/assign-pods-nodes.md
@@ -1,31 +1,32 @@
 ---
 title: 将 Pod 分配给节点
-content_template: templates/task
+content_type: task
 weight: 120
 ---
 <!--
 ---
 title: Assign Pods to Nodes
-content_template: templates/task
+content_type: task
 weight: 120
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to assign a Kubernetes Pod to a particular node in a
 Kubernetes cluster.
 -->
 此页面显示如何将 Kubernetes Pod 分配给 Kubernetes 集群中的特定节点。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Add a label to a node
@@ -123,13 +124,14 @@ a `disktype=ssd` label.
         NAME     READY     STATUS    RESTARTS   AGE    IP           NODE
         nginx    1/1       Running   0          13s    10.200.0.4   worker0
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 Learn more about
 [labels and selectors](/docs/concepts/overview/working-with-objects/labels/).
 -->
 了解更多关于
 [标签和选择器](/docs/concepts/overview/working-with-objects/labels/)。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md b/content/zh/docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
index ae631c7a4d..8c0cc202d6 100644
--- a/content/zh/docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
+++ b/content/zh/docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
@@ -1,17 +1,17 @@
 ---
 title: 为容器的生命周期事件设置处理函数
-content_template: templates/task
+content_type: task
 weight: 140
 ---
 <!--
 ---
 title: Attach Handlers to Container Lifecycle Events
-content_template: templates/task
+content_type: task
 weight: 140
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to attach handlers to Container lifecycle events. Kubernetes supports
@@ -23,16 +23,17 @@ Container is terminated.
 当一个容器启动后，Kubernetes 将立即发送 postStart 事件；在容器被终结之前，
 Kubernetes 将发送一个 preStop 事件。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Define postStart and preStop handlers
@@ -95,11 +96,11 @@ The output shows the text written by the postStart handler:
 
     Hello from the postStart handler
 
-{{% /capture %}}
 
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Discussion
@@ -142,10 +143,11 @@ preStop 的事件处理逻辑不会被触发。这个限制在
 [issue #55087](https://github.com/kubernetes/kubernetes/issues/55807) 中被追踪。
 {{< /note >}}
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Container lifecycle hooks](/docs/concepts/containers/container-lifecycle-hooks/).
@@ -168,6 +170,6 @@ preStop 的事件处理逻辑不会被触发。这个限制在
 * [Container](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#container-v1-core)
 * 参阅 [PodSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podspec-v1-core) 中关于`terminationGracePeriodSeconds` 的部分
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md b/content/zh/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md
index 6c54e30f93..bc4bdbdda4 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md
@@ -1,10 +1,10 @@
 ---
 title: 配置存活、就绪和启动探测器
-content_template: templates/task
+content_type: task
 weight: 110
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to configure liveness, readiness and startup probes for Containers.
 
@@ -34,15 +34,16 @@ kubelet 使用就绪探测器可以知道容器什么时候准备好了并可以
 
 kubelet 使用启动探测器可以知道应用程序容器什么时候启动了。如果配置了这类探测器，就可以控制容器在启动成功后再进行存活性和就绪检查，确保这些存活、就绪探测器不会影响应用程序的启动。这可以用于对慢启动容器进行存活性检测，避免它们在启动运行之前就被杀掉。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Define a liveness command
@@ -505,9 +506,10 @@ to resolve it.
 
 对于一次 TCP 探测，kubelet 在节点上（不是在 Pod 里面）建立探测连接，这意味着你不能在 `host` 参数上配置 service name，因为 kubelet 不能解析 service name。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about
@@ -527,4 +529,4 @@ to resolve it.
 * [容器](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#container-v1-core)
 * [探测器](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#probe-v1-core)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md b/content/zh/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
index f62145e724..874700d19a 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
@@ -1,18 +1,18 @@
 ---
 title: 配置 Pod 以使用 PersistentVolume 作为存储
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 
 <!--
 ---
 title: Configure a Pod to Use a PersistentVolume for Storage
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to configure a Pod to use a PersistentVolumeClaim for storage.
@@ -36,9 +36,10 @@ bound to a suitable PersistentVolume.
 
 1. 用户创建一个使用 PersistentVolumeClaim 作为存储的 Pod。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * You need to have a Kubernetes cluster that has only one Node, and the kubectl
@@ -55,9 +56,9 @@ do not already have a single-node cluster, you can create one by using
 
 * 熟悉[持久卷](/docs/concepts/storage/persistent-volumes/)中的材料。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create an index.html file on your Node
@@ -293,10 +294,10 @@ hostPath volume:
 
     Hello from Kubernetes storage
 
-{{% /capture %}}
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Access control
@@ -347,10 +348,11 @@ PersistentVolume are not present on the Pod resource itself.
 当 Pod 使用 PersistentVolume 时，与 PersistentVolume 关联的 GID 不会在 Pod 本身的资源对象上出现。
 {{< /note >}}
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [PersistentVolumes](/docs/concepts/storage/persistent-volumes/).
@@ -372,4 +374,4 @@ PersistentVolume are not present on the Pod resource itself.
 * [PersistentVolumeClaimSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#persistentvolumeclaimspec-v1-core)
 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-pod-configmap.md b/content/zh/docs/tasks/configure-pod-container/configure-pod-configmap.md
index b3e8ef1814..c150314bd6 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-pod-configmap.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-pod-configmap.md
@@ -1,6 +1,6 @@
 ---
 title: 使用 ConfigMap 配置 Pod
-content_template: templates/task
+content_type: task
 weight: 150
 card:
   name: tasks
@@ -8,26 +8,27 @@ card:
 ---
 <!-- ---
 title: Configure a Pod to Use a ConfigMap
-content_template: templates/task
+content_type: task
 weight: 150
 card:
   name: tasks
   weight: 50
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!-- ConfigMaps allow you to decouple configuration artifacts from image content to keep containerized applications portable. This page provides a series of usage examples demonstrating how to create ConfigMaps and configure Pods using data stored in ConfigMaps. -->
 ConfigMap 允许您将配置文件与镜像文件分离，以使容器化的应用程序具有可移植性。该页面提供了一系列使用示例，这些示例演示了如何使用存储在 ConfigMap 中的数据创建 ConfigMap 和配置 Pod。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 
 <!-- ## Create a ConfigMap
@@ -756,9 +757,9 @@ basis. The [Secrets](/docs/concepts/configuration/secret/#using-secrets-as-files
 使用 ConfigMap 作为子路径[subPath](/docs/concepts/storage/volumes/#using-subpath)的容器将不会收到 ConfigMap 更新。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- ## Understanding ConfigMaps and Pods -->
 ## 了解 ConfigMap 和 Pod
@@ -824,11 +825,12 @@ ConfigMap 驻留在特定的[命令空间](/docs/concepts/overview/working-with-
   这些不是创建 pods 的常用方法。
   {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!-- * Follow a real world example of [Configuring Redis using a ConfigMap](/docs/tutorials/configuration/configure-redis-using-configmap/). -->
 * 遵循[使用ConfigMap配置Redis](/docs/tutorials/configuration/configure-redis-using-configmap/)的真实案例。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-pod-initialization.md b/content/zh/docs/tasks/configure-pod-container/configure-pod-initialization.md
index c9c875c476..170d8b1a5d 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-pod-initialization.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-pod-initialization.md
@@ -1,32 +1,33 @@
 ---
 title: 配置 Pod 初始化
-content_template: templates/task
+content_type: task
 weight: 130
 ---
 
 <!--
 ---
 title: Configure Pod Initialization
-content_template: templates/task
+content_type: task
 weight: 130
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to use an Init Container to initialize a Pod before an
 application Container runs.
 -->
 本文介绍在应用容器运行前，怎样利用 Init 容器初始化 Pod。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a Pod that has an Init Container
@@ -129,9 +130,10 @@ The output shows that nginx is serving the web page that was written by the init
       <p>Kubernetes is open source giving you the freedom to take advantage ...</p>
       ...
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about
@@ -146,6 +148,6 @@ The output shows that nginx is serving the web page that was written by the init
 * 进一步了解 [卷](/docs/concepts/storage/volumes/)。
 * 进一步了解 [Init 容器排错](/docs/tasks/debug-application-cluster/debug-init-containers/)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-projected-volume-storage.md b/content/zh/docs/tasks/configure-pod-container/configure-projected-volume-storage.md
index ec892fe01e..ec91c53ec5 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-projected-volume-storage.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-projected-volume-storage.md
@@ -3,7 +3,7 @@ reviewers:
 - jpeeler
 - pmorie
 title: 配置 Pod 使用投射卷作存储
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 
@@ -13,12 +13,12 @@ reviewers:
 - jpeeler
 - pmorie
 title: Configure a Pod to Use a Projected Volume for Storage
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to use a [`projected`](/docs/concepts/storage/volumes/#projected) volume to mount
 several existing volume sources into the same directory. Currently, `secret`, `configMap`, `downwardAPI`,
@@ -34,13 +34,14 @@ and `serviceAccountToken` volumes can be projected.
 -->
 `serviceAccountToken` 不是一种卷类型
 {{< /note >}}
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Configure a projected volume for a pod
@@ -95,9 +96,10 @@ the Pod:-->确认 Pod 中的容器运行正常，然后监视 Pod 的变化：
 ```shell
        ls /projected-volume/
 ```
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [`projected`](/docs/concepts/storage/volumes/#projected) volumes.
@@ -106,5 +108,5 @@ the Pod:-->确认 Pod 中的容器运行正常，然后监视 Pod 的变化：
 
 * 进一步了解[`投射`](/docs/concepts/storage/volumes/#projected) 卷。
 * 阅读[一体卷](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/node/all-in-one-volume.md)设计文档。
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-runasusername.md b/content/zh/docs/tasks/configure-pod-container/configure-runasusername.md
index 65a9e88cb5..d6a2476c6f 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-runasusername.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-runasusername.md
@@ -1,18 +1,18 @@
 ---
 title: 为 Windows 的 pod 和容器配置 RunAsUserName
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 
 <!--
 ---
 title: Configure RunAsUserName for Windows pods and containers
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.17" state="beta" >}}
 
@@ -29,9 +29,10 @@ This feature is in beta. The overall functionality for `RunAsUserName` will not
 该功能目前处于 beta 状态。 `RunAsUserName` 的整体功能不会出现变更，但是关于用户名验证的部分可能会有所更改。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 You need to have a Kubernetes cluster and the kubectl command-line tool must be configured to communicate with your cluster. The cluster is expected to have Windows worker nodes where pods with containers running Windows workloads will get scheduled.
@@ -217,9 +218,10 @@ For more information about these limtations, check [here](https://support.micros
 
 关于这些限制的更多信息，可以查看[这里](https://support.microsoft.com/en-us/help/909264/naming-conventions-in-active-directory-for-computers-domains-sites-and)和[这里](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.localaccounts/new-localuser?view=powershell-5.1)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Guide for scheduling Windows containers in Kubernetes](/docs/setup/production-environment/windows/user-guide-windows-containers/)
@@ -231,4 +233,4 @@ For more information about these limtations, check [here](https://support.micros
 * [使用组托管服务帐户（GMSA）管理工作负载身份](/docs/setup/production-environment/windows/user-guide-windows-containers/#managing-workload-identity-with-group-managed-service-accounts)
 * [Windows 下 pod 和容器的 GMSA 配置](/docs/tasks/configure-pod-container/configure-gmsa/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-service-account.md b/content/zh/docs/tasks/configure-pod-container/configure-service-account.md
index 31d725c6b1..5c53b1d259 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-service-account.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-service-account.md
@@ -4,7 +4,7 @@ reviewers:
 - liggitt
 - thockin
 title: 为 Pod 配置服务账户
-content_template: templates/task
+content_type: task
 weight: 90
 ---
 
@@ -15,12 +15,12 @@ reviewers:
 - liggitt
 - thockin
 title: Configure Service Accounts for Pods
-content_template: templates/task
+content_type: task
 weight: 90
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 A service account provides an identity for processes that run in a Pod.
@@ -59,16 +59,17 @@ When they do, they are authenticated as a particular Service Account (for exampl
 当您（人类）访问集群时（例如，使用 `kubectl`），api 服务器将您的身份验证为特定的用户帐户（当前这通常是 `admin`，除非您的集群管理员已经定制了您的集群配置）。
 Pod 内的容器中的进程也可以与 api 服务器接触。
 当它们进行身份验证时，它们被验证为特定的服务帐户（例如，`default`）。
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Use the Default Service Account to access the API server.
@@ -448,4 +449,4 @@ Kubelet 将代表 Pod 请求和存储令牌，使令牌在可配置的文件路
 应用程序负责在令牌旋转时重新加载令牌。
 对于大多数情况，定期重新加载（例如，每 5 分钟一次）就足够了。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/configure-volume-storage.md b/content/zh/docs/tasks/configure-pod-container/configure-volume-storage.md
index bb41d311ef..2f5b7a4e5c 100644
--- a/content/zh/docs/tasks/configure-pod-container/configure-volume-storage.md
+++ b/content/zh/docs/tasks/configure-pod-container/configure-volume-storage.md
@@ -1,17 +1,17 @@
 ---
 title: 配置 Pod 以使用卷进行存储
-content_template: templates/task
+content_type: task
 weight: 50
 ---
 <!--
 ---
 title: Configure a Pod to Use a Volume for Storage
-content_template: templates/task
+content_type: task
 weight: 50
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 此页面展示了如何配置 Pod 以使用卷进行存储。
 
@@ -27,15 +27,16 @@ consistent storage that is independent of the Container, you can use a
 applications, such as key-value stores (such as Redis) and databases.
 -->
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 为 Pod 配置卷
 
@@ -178,9 +179,10 @@ of `Always`.
     kubectl delete pod redis
     ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 参阅[卷](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#volume-v1-core)。
 
@@ -200,4 +202,4 @@ details such as mounting and unmounting the devices on the nodes. See
 [Volumes](/docs/concepts/storage/volumes/) for more details.
 -->
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/extended-resource.md b/content/zh/docs/tasks/configure-pod-container/extended-resource.md
index 5551219219..005152b9e9 100644
--- a/content/zh/docs/tasks/configure-pod-container/extended-resource.md
+++ b/content/zh/docs/tasks/configure-pod-container/extended-resource.md
@@ -1,18 +1,18 @@
 ---
 title: 为容器分派扩展资源 
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
 <!--
 ---
 title: Assign Extended Resources to a Container
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="stable" >}}
 
@@ -23,10 +23,11 @@ This page shows how to assign extended resources to a Container.
 
 {{< feature-state state="stable" >}}
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -38,10 +39,10 @@ That will configure one of your Nodes to advertise a dongle resource.
 在您开始此练习前，请先练习[为节点广播扩展资源](/docs/tasks/administer-cluster/extended-resource-node/)。
 在那个练习中将配置您的一个节点来广播 dongle 资源。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Assign an extended resource to a Pod
@@ -193,9 +194,10 @@ kubectl delete pod extended-resource-demo
 kubectl delete pod extended-resource-demo-2
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 ### For application developers
@@ -217,5 +219,5 @@ kubectl delete pod extended-resource-demo-2
 
 * [为节点广播扩展资源](/docs/tasks/administer-cluster/extended-resource-node/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/configure-pod-container/pull-image-private-registry.md b/content/zh/docs/tasks/configure-pod-container/pull-image-private-registry.md
index 7a2cc0d7c2..b8228ac2ba 100644
--- a/content/zh/docs/tasks/configure-pod-container/pull-image-private-registry.md
+++ b/content/zh/docs/tasks/configure-pod-container/pull-image-private-registry.md
@@ -1,18 +1,18 @@
 ---
 title: 从私有仓库拉取镜像
-content_template: templates/task
+content_type: task
 weight: 100
 ---
 
 <!--
 ---
 title: Pull an Image from a Private Registry
-content_template: templates/task
+content_type: task
 weight: 100
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to create a Pod that uses a Secret to pull an image from a
@@ -21,9 +21,10 @@ private Docker registry or repository.
 
 本文介绍如何使用 Secret 从私有的 Docker 镜像仓库或代码仓库拉取镜像来创建 Pod。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -34,9 +35,9 @@ private Docker registry or repository.
 
 您需要 [Docker ID](https://docs.docker.com/docker-id/) 和密码来进行本练习。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Log in to Docker
@@ -265,9 +266,10 @@ kubectl create -f my-private-reg-pod.yaml
 kubectl get pod private-reg
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Secrets](/docs/concepts/configuration/secret/).
@@ -283,4 +285,4 @@ kubectl get pod private-reg
 * 参考 [Secret](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#secret-v1-core)。
 * 参考 [PodSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podspec-v1-core) 中的 `imagePullSecrets` 字段 。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/quality-service-pod.md b/content/zh/docs/tasks/configure-pod-container/quality-service-pod.md
index f4ed73359b..680d38b316 100644
--- a/content/zh/docs/tasks/configure-pod-container/quality-service-pod.md
+++ b/content/zh/docs/tasks/configure-pod-container/quality-service-pod.md
@@ -1,18 +1,18 @@
 ---
 title: 配置 Pod 的服务质量
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 
 <!--
 ---
 title: Configure Quality of Service for Pods
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to configure Pods so that they will be assigned particular
@@ -22,17 +22,18 @@ scheduling and evicting Pods.
 
 本文介绍怎样配置 Pod 让其获得特定的服务质量（QoS）类。Kubernetes 使用 QoS 类来决定 Pod 的调度和驱逐策略。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## QoS classes
@@ -382,9 +383,10 @@ Delete your namespace:
 kubectl delete namespace qos-example
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 <!--
@@ -439,5 +441,5 @@ kubectl delete namespace qos-example
 
 * [控制节点上的拓扑管理策略](/docs/tasks/administer-cluster/topology-manager/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/configure-pod-container/share-process-namespace.md b/content/zh/docs/tasks/configure-pod-container/share-process-namespace.md
index 04c8b2735b..91e9e53733 100644
--- a/content/zh/docs/tasks/configure-pod-container/share-process-namespace.md
+++ b/content/zh/docs/tasks/configure-pod-container/share-process-namespace.md
@@ -1,7 +1,7 @@
 ---
 title: 在 Pod 中的容器之间共享进程命名空间
 min-kubernetes-server-version: v1.10
-content_template: templates/task
+content_type: task
 weight: 160
 ---
 <!--
@@ -12,12 +12,12 @@ reviewers:
 - verb
 - yujuhong
 - dchen1107
-content_template: templates/task
+content_type: task
 weight: 160
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="stable" for_k8s_version="v1.17" >}}
 
@@ -36,15 +36,16 @@ include debugging utilities like a shell.
 -->
 您可以使用此功能来配置协作容器，比如日志处理 sidecar 容器，或者对那些不包含诸如 shell 等调试实用工具的镜像进行故障排查。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Configure a Pod
@@ -142,9 +143,9 @@ events {
     worker_connections  1024;
 ```
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Understanding Process Namespace Sharing
@@ -181,6 +182,6 @@ Pod 共享许多资源，因此它们共享进程命名空间是很有意义的
 
 3. **容器文件系统通过 `/proc/$pid/root` 链接对 pod 中的其他容器可见。** 这使调试更加容易，但也意味着文件系统安全性只受文件系统权限的保护。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/configure-pod-container/static-pod.md b/content/zh/docs/tasks/configure-pod-container/static-pod.md
index c8309604b8..eef7ea7f2b 100644
--- a/content/zh/docs/tasks/configure-pod-container/static-pod.md
+++ b/content/zh/docs/tasks/configure-pod-container/static-pod.md
@@ -3,10 +3,10 @@ reviewers:
 - jsafrane
 title: 创建静态 Pod
 weight: 170
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 *Static Pods* are managed directly by the kubelet daemon on a specific node,
@@ -45,9 +45,10 @@ kubelet 会尝试通过 Kubernetes API 服务器为每个静态 Pod 自动创建
 如果你在运行一个 Kubernetes 集群，并且在每个节点上都运行一个静态 Pod，就可能需要考虑使用 {{< glossary_tooltip text="DaemonSet" term_id="daemonset" >}} 替代这种方式。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -60,9 +61,9 @@ Instructions for other distributions or Kubernetes installations may vary.
 本文假定你在使用 {{< glossary_tooltip term_id="docker" >}} 来运行 Pod，并且你的节点是运行着 Fedora 操作系统。
 其它发行版或者 Kubernetes 部署版本上操作方式可能不一样。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Create a static pod {#static-pod-creation}
@@ -397,4 +398,4 @@ CONTAINER ID        IMAGE         COMMAND                CREATED           ...
 e7a62e3427f1        nginx:latest  "nginx -g 'daemon of   27 seconds ago
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/configure-pod-container/translate-compose-kubernetes.md b/content/zh/docs/tasks/configure-pod-container/translate-compose-kubernetes.md
index 866558d07a..9ecc6c22f2 100644
--- a/content/zh/docs/tasks/configure-pod-container/translate-compose-kubernetes.md
+++ b/content/zh/docs/tasks/configure-pod-container/translate-compose-kubernetes.md
@@ -2,7 +2,7 @@
 reviewers:
 - cdrage
 title: 将 Docker Compose 文件转换为 Kubernetes 资源
-content_template: templates/task
+content_type: task
 weight: 200
 ---
 
@@ -11,12 +11,12 @@ weight: 200
 reviewers:
 - cdrage
 title: Translate a Docker Compose File to Kubernetes Resources
-content_template: templates/task
+content_type: task
 weight: 170
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 What's Kompose? It's a conversion tool for all things compose (namely Docker Compose) to container orchestrators (Kubernetes or OpenShift).
@@ -30,16 +30,17 @@ More information can be found on the Kompose website at [http://kompose.io](http
 
 更多信息请参考 Kompose 官网 [http://kompose.io](http://kompose.io)。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Install Kompose
@@ -271,9 +272,9 @@ you need is an existing `docker-compose.yml` file.
       $ curl http://192.0.2.89
       ```
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## User Guide
@@ -841,4 +842,4 @@ Kompose 支持的 Docker Compose 版本包括：1、2 和 3。有限支持 2.1 
 
 所有三个版本的兼容性列表请查看我们的 [转换文档](https://github.com/kubernetes/kompose/blob/master/docs/conversion.md)，文档中列出了所有不兼容的 Docker Compose 关键字。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/audit.md b/content/zh/docs/tasks/debug-application-cluster/audit.md
index 98928e33cc..594ba79b27 100644
--- a/content/zh/docs/tasks/debug-application-cluster/audit.md
+++ b/content/zh/docs/tasks/debug-application-cluster/audit.md
@@ -3,11 +3,11 @@ reviewers:
 - soltysh
 - sttts
 - ericchiang
-content_template: templates/concept
+content_type: concept
 title: Auditing
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="beta" >}}
 
@@ -37,11 +37,11 @@ Kubernetes 审计功能提供了与安全相关的按时间顺序排列的记录
  - 它从哪触发的？
  - 活动的后续处理行为是什么？
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture body %}}
+<!-- body -->
 
 <!--
 [Kube-apiserver][kube-apiserver] performs auditing. Each request on each stage
@@ -609,4 +609,4 @@ Kubernetes 可能会在创建新的日志文件时删除旧的日志文件; 您
 [logstash_install_doc]: https://www.elastic.co/guide/en/logstash/current/installing-logstash.html
 [kube-aggregator]: /docs/concepts/api-extension/apiserver-aggregation
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/crictl.md b/content/zh/docs/tasks/debug-application-cluster/crictl.md
index 8bc0ca2973..7e51054053 100644
--- a/content/zh/docs/tasks/debug-application-cluster/crictl.md
+++ b/content/zh/docs/tasks/debug-application-cluster/crictl.md
@@ -4,7 +4,7 @@ reviewers:
 - feiskyer
 - mrunalp
 title: 使用 crictl 对 Kubernetes 节点进行调试
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -14,12 +14,12 @@ reviewers:
 - feiskyer
 - mrunalp
 title: Debugging Kubernetes nodes with crictl
-content_template: templates/task
+content_type: task
 ---
 -->
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.11" state="stable" >}}
 
@@ -34,9 +34,10 @@ Kubernetes node. `crictl` and its source are hosted in the
 您可以使用它来检查和调试 Kubernetes 节点上的容器运行时和应用程序。
 `crictl`和它的源代码在 [cri-tools](https://github.com/kubernetes-incubator/cri-tools) 代码库。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 `crictl` requires a Linux operating system with a CRI runtime.
@@ -44,9 +45,9 @@ Kubernetes node. `crictl` and its source are hosted in the
 
 `crictl` 需要带有 CRI 运行时的 Linux 操作系统。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Installing crictl
@@ -473,10 +474,10 @@ CONTAINER ID        IMAGE               CREATED              STATE
 3e025dd50a72d       busybox             About a minute ago   Running             busybox             0
 ```
 
-{{% /capture %}}
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 See [kubernetes-incubator/cri-tools](https://github.com/kubernetes-incubator/cri-tools)
@@ -485,4 +486,4 @@ for more information.
 
 更多信息请参考 [kubernetes-incubator/cri-tools](https://github.com/kubernetes-incubator/cri-tools)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-application-introspection.md b/content/zh/docs/tasks/debug-application-cluster/debug-application-introspection.md
index 1e5acccd81..23383abb8b 100644
--- a/content/zh/docs/tasks/debug-application-cluster/debug-application-introspection.md
+++ b/content/zh/docs/tasks/debug-application-cluster/debug-application-introspection.md
@@ -2,11 +2,11 @@
 reviewers:
 - janetkuo
 - thockin
-content_template: templates/concept
+content_type: concept
 title: 应用自测与调试
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Once your application is running, you'll inevitably need to debug problems with it.
@@ -17,10 +17,10 @@ your pods. But there are a number of ways to get even more information about you
 前面我们介绍了如何使用 `kubectl get pods` 来查询 pod 的简单信息。
 除此之外，还有一系列的方法来获取应用的更详细信息。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Using `kubectl describe pod` to fetch details about pods
@@ -518,9 +518,10 @@ status:
     systemUUID: ABE5F6B4-D44B-108B-C46A-24CCE16C8B6E
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Learn about additional debugging tools, including:
@@ -542,4 +543,4 @@ Learn about additional debugging tools, including:
 * [使用端口转发连接容器](/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)
 * [使用 crictl 检查节点](/docs/tasks/debug-application-cluster/crictl/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-init-containers.md b/content/zh/docs/tasks/debug-application-cluster/debug-init-containers.md
index 95d1abc891..9b91aad043 100644
--- a/content/zh/docs/tasks/debug-application-cluster/debug-init-containers.md
+++ b/content/zh/docs/tasks/debug-application-cluster/debug-init-containers.md
@@ -8,7 +8,7 @@ reviewers:
 - kow3ns
 - smarterclayton
 title: 调试 Init 容器
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -22,11 +22,11 @@ reviewers:
 - kow3ns
 - smarterclayton
 title: Debug Init Containers
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to investigate problems related to the execution of
@@ -38,9 +38,10 @@ Init Containers. The example command lines below refer to the Pod as
 此页显示如何核查与 init 容器执行相关的问题。
 下面的示例命令行将 Pod 称为 `<pod-name>`，而 init 容器称为 `<init-container-1>` 和 `<init-container-2>`。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -53,9 +54,9 @@ Init Containers. The example command lines below refer to the Pod as
 * 您应该熟悉 [Init 容器](/docs/concepts/abstractions/init-containers/)的基础知识。
 * 您应该已经[配置好一个 Init 容器](/docs/tasks/configure-pod-container/configure-pod-initialization/#creating-a-pod-that-has-an-init-container/)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Checking the status of Init Containers
@@ -183,9 +184,9 @@ commands as they're executed. For example, you can do this in Bash by running
 运行 shell 脚本打印命令的init容器,执行 shell 脚本。
 例如，您可以在 Bash 中通过在脚本的开头运行 `set -x` 来实现。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Understanding Pod status
@@ -220,5 +221,5 @@ Status | Meaning
 `Pending` | Pod 还没有开始执行 Init 容器。
 `PodInitializing` or `Running` | Pod 已经完成执行 Init 容器。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md b/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
index 7c36c56b4a..671f7cf67a 100644
--- a/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
+++ b/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
@@ -2,27 +2,28 @@
 reviewers:
 - bprashanth
 title: 调试 Pods 和 Replication Controllers
-content_template: templates/task
+content_type: task
 ---
 <!-- 
 ---
 reviewers:
 - bprashanth
 title: Debug Pods and ReplicationControllers
-content_template: templates/task
+content_type: task
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- 
 This page shows how to debug Pods and ReplicationControllers. 
 -->
 此页面告诉您如何调试 Pod 和 ReplicationController。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -33,9 +34,9 @@ This page shows how to debug Pods and ReplicationControllers.
 * 您应该先熟悉
   [Pods](/docs/concepts/workloads/pods/pod/) 和 [Pod Lifecycle](/docs/concepts/workloads/pods/pod-lifecycle/) 的基础概念。 
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- 
 ## Debugging Pods 
@@ -247,4 +248,4 @@ related to the replication controller.
 -->
 您也可以使用`kubectl describe rc ${CONTROLLER_NAME}`来检查和Replication Controllers有关的事件。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-service.md b/content/zh/docs/tasks/debug-application-cluster/debug-service.md
index 7b70264018..76cccc17d3 100644
--- a/content/zh/docs/tasks/debug-application-cluster/debug-service.md
+++ b/content/zh/docs/tasks/debug-application-cluster/debug-service.md
@@ -2,7 +2,7 @@
 reviewers:
 - thockin
 - bowei
-content_template: templates/concept
+content_type: concept
 title: 调试 Service
 ---
 
@@ -11,12 +11,12 @@ title: 调试 Service
 reviewers:
 - thockin
 - bowei
-content_template: templates/concept
+content_type: concept
 title: Debug Services
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 An issue that comes up rather frequently for new installations of Kubernetes is
 that a `Service` is not working properly.  You've run your `Deployment` and
@@ -25,10 +25,10 @@ This document will hopefully help you to figure out what's going wrong.
 -->
 对于新安装的 Kubernetes，经常出现的一个问题是 `Service` 没有正常工作。如果您已经运行了 `Deployment` 并创建了一个 `Service`，但是当您尝试访问它时没有得到响应，希望这份文档能帮助您找出问题所在。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Conventions
@@ -1167,14 +1167,15 @@ Contact us on
 使用 [Slack](/docs/troubleshooting/#slack) 或者 [Forum](https://discuss.kubernetes.io) 或者 [GitHub](https://github.com/kubernetes/kubernetes) 联系我们。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Visit [troubleshooting document](/docs/troubleshooting/) for more information.
 -->
 访问[故障排查文档](/docs/troubleshooting/)获取更多信息。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-stateful-set.md b/content/zh/docs/tasks/debug-application-cluster/debug-stateful-set.md
index 61a77fa1f8..e6ad084295 100644
--- a/content/zh/docs/tasks/debug-application-cluster/debug-stateful-set.md
+++ b/content/zh/docs/tasks/debug-application-cluster/debug-stateful-set.md
@@ -1,23 +1,24 @@
 ---
 title: 调试StatefulSet
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 此任务展示如何调试StatefulSet。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 
 * 你需要有一个Kubernetes集群，通过必要的配置使kubectl命令行工具与您的集群进行通信。
 * 你应该有一个运行中的StatefulSet，以便用于调试。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 调试StatefulSet
 
@@ -67,12 +68,13 @@ spec:
 kubectl annotate pods <pod-name> pod.alpha.kubernetes.io/initialized="true" --overwrite
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 点击链接[调试init-container](/docs/tasks/troubleshoot/debug-init-containers/)，了解更多信息。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md b/content/zh/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
index 8e1b947be6..b5d2ac48ae 100644
--- a/content/zh/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
+++ b/content/zh/docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
@@ -1,16 +1,16 @@
 ---
 title: 确定 Pod 失败的原因
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Determine the Reason for Pod Failure
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to write and read a Container
@@ -32,17 +32,18 @@ you put in a termination message should also be written to the general
 
 
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Writing and reading a termination message
@@ -151,9 +152,10 @@ is empty and the container exited with an error. The log output is limited to
 通过将 `terminationMessagePolicy` 设置为 "`FallbackToLogsOnError`"，你就可以告诉 Kubernetes，在容器因错误退出时，如果终止消息文件为空，则使用容器日志输出的最后一块作为终止消息。
 日志输出限制为 2048 字节或 80 行，以较小者为准。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * See the `terminationMessagePath` field in
@@ -166,7 +168,7 @@ is empty and the container exited with an error. The log output is limited to
 * 了解[接收日志](/docs/concepts/cluster-administration/logging/)。
 * 了解 [Go 模版](https://golang.org/pkg/text/template/)。
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/events-stackdriver.md b/content/zh/docs/tasks/debug-application-cluster/events-stackdriver.md
index c2a24f20f5..160a99a6a7 100644
--- a/content/zh/docs/tasks/debug-application-cluster/events-stackdriver.md
+++ b/content/zh/docs/tasks/debug-application-cluster/events-stackdriver.md
@@ -2,7 +2,7 @@
 reviewers:
 - piosz
 - x13n
-content_template: templates/concept
+content_type: concept
 title: StackDriver 中的事件
 ---
 
@@ -11,12 +11,12 @@ title: StackDriver 中的事件
 reviewers:
 - piosz
 - x13n
-content_template: templates/concept
+content_type: concept
 title: Events in Stackdriver
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes events are objects that provide insight into what is happening
@@ -66,10 +66,10 @@ of the potential inaccuracy.
 [sdLogMetrics]: https://cloud.google.com/logging/docs/view/logs_based_metrics
 [sdAlerts]: https://cloud.google.com/logging/docs/view/logs_based_metrics#creating_an_alerting_policy
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Deployment
@@ -164,4 +164,4 @@ jsonPayload.involvedObject.name:"nginx-deployment"
 
 {{< figure src="/images/docs/stackdriver-event-exporter-filter.png" alt="Filtered events in the Stackdriver Logging interface" width="500" >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/falco.md b/content/zh/docs/tasks/debug-application-cluster/falco.md
index 8c07c5e641..3cd3c275b5 100644
--- a/content/zh/docs/tasks/debug-application-cluster/falco.md
+++ b/content/zh/docs/tasks/debug-application-cluster/falco.md
@@ -3,7 +3,7 @@ reviewers:
 - soltysh
 - sttts
 - ericchiang
-content_template: templates/concept
+content_type: concept
 title: 使用 Falco 审计
 ---
 <!--
@@ -12,11 +12,11 @@ reviewers:
 - soltysh
 - sttts
 - ericchiang
-content_template: templates/concept
+content_type: concept
 title: Auditing with Falco
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 <!--
 ### Use Falco to collect audit events
 -->
@@ -28,9 +28,9 @@ This section describes how to set up Falco, how to send audit events to the Kube
 -->
 [Falco](https://falco.org/)是一个开源项目，用于为云原生平台提供入侵和异常检测。本节介绍如何设置 Falco、如何将审计事件发送到 Falco 公开的 Kubernetes Audit 端点、以及 Falco 如何应用一组规则来自动检测可疑行为。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 #### Install Falco
@@ -236,4 +236,4 @@ For further details, see [Kubernetes Audit Events][falco_ka_docs] in the Falco d
 [falco_installation]: https://falco.org/docs/installation
 [falco_helm_chart]: https://github.com/helm/charts/tree/master/stable/falco
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/get-shell-running-container.md b/content/zh/docs/tasks/debug-application-cluster/get-shell-running-container.md
index 15d5331f3d..885a2347e8 100644
--- a/content/zh/docs/tasks/debug-application-cluster/get-shell-running-container.md
+++ b/content/zh/docs/tasks/debug-application-cluster/get-shell-running-container.md
@@ -3,7 +3,7 @@ reviewers:
 - caesarxuchao
 - mikedanese
 title: 获取正在运行容器的 Shell
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -12,11 +12,11 @@ reviewers:
 - caesarxuchao
 - mikedanese
 title: Get a Shell to a Running Container
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to use `kubectl exec` to get a shell to a
@@ -25,17 +25,18 @@ running Container.
 
 本文介绍怎样使用 `kubectl exec` 命令获取正在运行容器的 Shell。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Getting a shell to a Container
@@ -202,9 +203,9 @@ kubectl exec shell-demo ls /
 kubectl exec shell-demo cat /proc/1/mounts
 ```
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Opening a shell when a Pod has more than one Container
@@ -228,14 +229,15 @@ shell to the main-app Container.
 kubectl exec -it my-pod --container main-app -- /bin/bash
 ```
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * [kubectl exec](/docs/reference/generated/kubectl/kubectl-commands/#exec)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/local-debugging.md b/content/zh/docs/tasks/debug-application-cluster/local-debugging.md
index cdcb6bbd1a..7414f18e64 100644
--- a/content/zh/docs/tasks/debug-application-cluster/local-debugging.md
+++ b/content/zh/docs/tasks/debug-application-cluster/local-debugging.md
@@ -1,16 +1,16 @@
 ---
 title: 在本地开发和调试服务
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Developing and debugging services locally
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes applications usually consist of multiple, separate services, each running in its own container. Developing and debugging these services on a remote Kubernetes cluster can be cumbersome, requiring you to [get a shell on a running container](/docs/tasks/debug-application-cluster/get-shell-running-container/) and running your tools inside the remote shell.
@@ -32,9 +32,10 @@ This document describes using `telepresence` to develop and debug services runni
 
 本文档描述如何在本地使用 `telepresence` 开发和调试远程集群上运行的服务。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * Kubernetes cluster is installed
@@ -46,9 +47,9 @@ This document describes using `telepresence` to develop and debug services runni
 * 配置好 `kubectl` 与集群交互
 * [Telepresence](https://www.telepresence.io/reference/install) 安装完毕
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Getting a shell on a remote cluster
@@ -103,9 +104,10 @@ Running this command spawns a shell. In the shell, start your service. You can t
 运行此命令将生成 shell。在 shell 中，启动您的服务。
 然后，您就可以在本地对源代码进行编辑、保存并能看到更改立即生效。您还可以在调试器或任何其他本地开发工具中运行服务。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 If you're interested in a hands-on tutorial, check out [this tutorial](https://cloud.google.com/community/tutorials/developing-services-with-k8s) that walks through locally developing the Guestbook application on Google Kubernetes Engine.
@@ -123,4 +125,4 @@ Telepresence 有[多种代理选项](https://www.telepresence.io/reference/metho
 
 要了解更多信息，请访问 [Telepresence 网站](https://www.telepresence.io)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md b/content/zh/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
index d815f17ed9..fce78f5e36 100644
--- a/content/zh/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
+++ b/content/zh/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
@@ -2,7 +2,7 @@
 reviewers:
 - piosz
 - x13n
-content_template: templates/concept
+content_type: concept
 title: 使用 ElasticSearch 和 Kibana 进行日志管理
 ---
 
@@ -11,12 +11,12 @@ title: 使用 ElasticSearch 和 Kibana 进行日志管理
 reviewers:
 - piosz
 - x13n
-content_template: templates/concept
+content_type: concept
 title: Logging Using Elasticsearch and Kibana
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 On the Google Compute Engine (GCE) platform, the default logging support targets
@@ -42,9 +42,9 @@ You cannot automatically deploy Elasticsearch and Kibana in the Kubernetes clust
 您不能在 Google Kubernetes Engine 平台运行的 Kubernetes 集群上自动的部署 Elasticsearch 和 Kibana。您必须手动部署它们。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 To use Elasticsearch and Kibana for cluster logging, you should set the
@@ -179,9 +179,10 @@ Here is a typical view of ingested logs from the Kibana viewer:
 
 ![Kibana logs](/images/docs/kibana-logs.png)
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Kibana opens up all sorts of powerful options for exploring your logs! For some
@@ -190,4 +191,4 @@ ideas on how to dig into it, check out [Kibana's documentation](https://www.elas
 
 Kibana 为浏览您的日志提供了各种强大的选项！有关如何深入研究它的一些想法，请查看 [Kibana 的文档](https://www.elastic.co/guide/en/kibana/current/discover.html)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/monitor-node-health.md b/content/zh/docs/tasks/debug-application-cluster/monitor-node-health.md
index f01fe70956..59cf513428 100644
--- a/content/zh/docs/tasks/debug-application-cluster/monitor-node-health.md
+++ b/content/zh/docs/tasks/debug-application-cluster/monitor-node-health.md
@@ -1,5 +1,5 @@
 ---
-content_template: templates/task
+content_type: task
 title: 节点健康监测
 ---
 <!-- 
@@ -7,12 +7,12 @@ title: 节点健康监测
 reviewers:
 - Random-Liu
 - dchen1107
-content_template: templates/task
+content_type: task
 title: Monitor Node Health
 --- 
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 *节点问题探测器* 是一个 [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) 用来监控节点健康。它从各种守护进程收集节点问题，并以[NodeCondition](/docs/concepts/architecture/nodes/#condition) 和 [Event](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#event-v1-core) 的形式报告给 apiserver 。 
 <!-- 
@@ -41,15 +41,16 @@ See more information
 -->
 更多信息请参阅 [这里](https://github.com/kubernetes/node-problem-detector)。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- 
 ## Limitations 
@@ -285,9 +286,9 @@ plugin to translate kernel log the internal data structure. It is easy to
 implement a new translator for a new log format. 
 -->
 内核监视器使用 [`Translator`] 插件将内核日志转换为内部数据结构。我们可以很容易为新的日志格式实现新的翻译器。
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- 
 ## Caveats 
@@ -312,4 +313,4 @@ resource overhead on each node. Usually this is fine, because:
 * 即使在高负载下，资源使用也是可以接受的。
 (参阅 [基准测试结果](https://github.com/kubernetes/node-problem-detector/issues/2#issuecomment-220255629)) 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/resource-metrics-pipeline.md b/content/zh/docs/tasks/debug-application-cluster/resource-metrics-pipeline.md
index 149f58f7d5..ba7c28b8ad 100644
--- a/content/zh/docs/tasks/debug-application-cluster/resource-metrics-pipeline.md
+++ b/content/zh/docs/tasks/debug-application-cluster/resource-metrics-pipeline.md
@@ -3,7 +3,7 @@ reviewers:
 - fgrzadkowski
 - piosz
 title: 资源指标管道
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
@@ -11,11 +11,11 @@ reviewers:
 - fgrzadkowski
 - piosz
 title: Resource metrics pipeline
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Starting from Kubernetes 1.8, resource usage metrics, such as container CPU and memory usage,
@@ -25,10 +25,10 @@ Horizontal Pod Autoscaler, to make decisions.
 -->
 从 Kubernetes 1.8开始，资源使用指标，例如容器 CPU 和内存使用率，可通过 Metrics API 在 Kubernetes 中获得。这些指标可以直接被用户访问，比如使用`kubectl top`命令行，或者这些指标由集群中的控制器使用，例如，Horizontal Pod Autoscaler，使用这些指标来做决策。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## The Metrics API
@@ -102,4 +102,4 @@ Learn more about the metrics server in [the design doc](https://github.com/kuber
 -->
 在[设计文档](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/metrics-server.md)中可以了解到有关 Metrics Server 的更多信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/debug-application-cluster/resource-usage-monitoring.md b/content/zh/docs/tasks/debug-application-cluster/resource-usage-monitoring.md
index cbd049906f..a91705008b 100644
--- a/content/zh/docs/tasks/debug-application-cluster/resource-usage-monitoring.md
+++ b/content/zh/docs/tasks/debug-application-cluster/resource-usage-monitoring.md
@@ -1,19 +1,19 @@
 ---
 reviewers:
 - mikedanese
-content_template: templates/concept
+content_type: concept
 title: 资源监控工具
 ---
 <!--
 ---
 reviewers:
 - mikedanese
-content_template: templates/concept
+content_type: concept
 title: Tools for Monitoring Resources
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 To scale an application and provide a reliable service, you need to
@@ -30,9 +30,9 @@ where bottlenecks can be removed to improve overall performance.
 Kubernetes 在每个级别上提供有关应用程序资源使用情况的详细信息。
 此信息使您可以评估应用程序的性能，以及在何处可以消除瓶颈以提高整体性能。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 In Kubernetes, application monitoring does not depend on a single monitoring solution. On new clusters, you can use [resource metrics](#resource-metrics-pipeline) or [full metrics](#full-metrics-pipeline) pipelines to collect monitoring statistics.
@@ -101,5 +101,5 @@ Full metrics pipeline projects that are not part of the CNCF are outside the sco
 Prometheus 本身。
 完整度量管道项目不属于 CNCF 的一部分，不在 Kubernetes 文档的范围之内。
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/debug-application-cluster/troubleshooting.md b/content/zh/docs/tasks/debug-application-cluster/troubleshooting.md
index f2206d28d6..396e7ffc59 100644
--- a/content/zh/docs/tasks/debug-application-cluster/troubleshooting.md
+++ b/content/zh/docs/tasks/debug-application-cluster/troubleshooting.md
@@ -2,7 +2,7 @@
 reviewers:
 - brendandburns
 - davidopp
-content_template: templates/concept
+content_type: concept
 title: 排错
 ---
 
@@ -11,12 +11,12 @@ title: 排错
 reviewers:
 - brendandburns
 - davidopp
-content_template: templates/concept
+content_type: concept
 title: Troubleshooting
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Sometimes things go wrong. This guide is aimed at making them right. It has
@@ -40,10 +40,10 @@ you're using.
 
 您也应该查看所用[版本](https://github.com/kubernetes/kubernetes/releases)的已知问题。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Getting help
@@ -217,4 +217,4 @@ problem, such as:
 * 云提供商，OS 发行版、网络配置和 Docker 版本
 * 重现问题的步骤
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/example-task-template.md b/content/zh/docs/tasks/example-task-template.md
index 3d3bec9b53..e3cf46734f 100644
--- a/content/zh/docs/tasks/example-task-template.md
+++ b/content/zh/docs/tasks/example-task-template.md
@@ -2,7 +2,7 @@
 title: 示例任务的模板
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 toc_hide: true
 ---
 
@@ -11,12 +11,12 @@ toc_hide: true
 title: Example Task Template
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 toc_hide: true
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Be sure to also [create an entry in the table of contents](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) for your new document.
@@ -31,9 +31,10 @@ This page shows how to ...
 -->
 这个页面展示了如何...
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
@@ -46,9 +47,9 @@ This page shows how to ...
 * 做这个。
 * 也做这个。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Doing ...
@@ -64,9 +65,9 @@ This page shows how to ...
 1. 做这个。
 1. 接下来做这个。可能需要阅读一下这个[相关解释](...).
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Understanding ...
@@ -82,9 +83,10 @@ Here's an interesting thing to know about the steps you just did.
 -->
 关于你刚才所做的过程，有一点是需要知道的。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 **[Optional Section]**
@@ -100,6 +102,6 @@ Here's an interesting thing to know about the steps you just did.
 * 了解更多关于[撰写新主题](/docs/home/contribute/write-new-topic/).
 * 查看[使用页面模板-任务模板](/docs/home/contribute/page-templates/#task_template) for how to use this template.
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/extend-kubectl/kubectl-plugins.md b/content/zh/docs/tasks/extend-kubectl/kubectl-plugins.md
index e3882b54bb..c22481b71c 100644
--- a/content/zh/docs/tasks/extend-kubectl/kubectl-plugins.md
+++ b/content/zh/docs/tasks/extend-kubectl/kubectl-plugins.md
@@ -12,10 +12,10 @@ reviewers:
 - juanvallejo
 - soltysh
 description: With kubectl plugins, you can extend the functionality of the kubectl command by adding new subcommands.
-content_template: templates/task
+content_type: task
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state state="stable" >}}
 
@@ -27,9 +27,10 @@ of plugins as a means of utilizing these building blocks to create more complex
 通过将核心 `kubectl` 命令看作与 Kubernetes 集群交互的基本构建块，集群管理员可以将插件视为一种利用这些构建块创建更复杂行为的方法。
 插件用新的子命令扩展了 `kubectl`，允许新的和自定义的特性不包括在 `kubectl` 的主要发行版中。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 You need to have a working `kubectl` binary installed.
@@ -45,9 +46,9 @@ Plugins were officially introduced as an alpha feature in the v1.8.0 release. Th
 
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Installing kubectl plugins
@@ -493,9 +494,10 @@ See the [Sample CLI Plugin](https://github.com/kubernetes/sample-cli-plugin) for
 参见 [CLI 插件示例](https://github.com/kubernetes/sample-cli-plugin)了解 CLI Runtime 存储库中提供的工具的使用示例。
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Check the Sample CLI Plugin repository for [a detailed example](https://github.com/kubernetes/sample-cli-plugin) of a plugin written in Go.
@@ -507,6 +509,6 @@ See the [Sample CLI Plugin](https://github.com/kubernetes/sample-cli-plugin) for
 * 如有任何问题，请随时联系 [CLI SIG 小组](https://github.com/kubernetes/community/tree/master/sig-cli)
 * 二进制插件是 beta 版的特性，所以现在是时候为代码库贡献一些想法和改进了。我们也很高兴听到您计划用插件实现什么，所以[让我们知道](https://github.com/kubernetes/community/tree/master/sig-cli)！
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/configmap.md b/content/zh/docs/tasks/federation/administer-federation/configmap.md
index db52ac7752..0c2e619338 100644
--- a/content/zh/docs/tasks/federation/administer-federation/configmap.md
+++ b/content/zh/docs/tasks/federation/administer-federation/configmap.md
@@ -1,15 +1,15 @@
 ---
 title: 联邦 ConfigMap
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Federated ConfigMap
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -28,9 +28,10 @@ across all the clusters in federation.
 ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) 非常相似且提供相同的功能。
 在联邦控制平面中创建它们可以确保它们在联邦的所有集群中同步。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 <!--
@@ -40,9 +41,9 @@ general and [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-confi
 -->
 * 通常我们还期望您拥有基本的 [Kubernetes 应用知识](/docs/tutorials/kubernetes-basics/)，
 特别是 [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) 相关的应用知识。
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a Federated ConfigMap
@@ -142,6 +143,6 @@ Deleting a Federated ConfigMap does not delete the corresponding ConfigMaps from
 要注意的是这时删除联邦 ConfigMap 并不会删除底层集群中对应的 ConfigMap。您必须自己手动删除底层集群中的 ConfigMap。
 {{< /note >}}
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/daemonset.md b/content/zh/docs/tasks/federation/administer-federation/daemonset.md
index 5c121ace0c..88ed66d090 100644
--- a/content/zh/docs/tasks/federation/administer-federation/daemonset.md
+++ b/content/zh/docs/tasks/federation/administer-federation/daemonset.md
@@ -1,15 +1,15 @@
 ---
 title: 联邦 DaemonSet
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Federated DaemonSet
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -28,9 +28,10 @@ across all the clusters in federation.
 
 联邦控制平面中的 DaemonSet（在本指南中称为 “联邦 DaemonSet”）与传统的 Kubernetes [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) 非常类似，并提供相同的功能。在联邦控制平面中创建联邦 DaemonSet 可以确保它们同步到联邦的所有集群中。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 <!--
@@ -40,9 +41,9 @@ general and [DaemonSets](/docs/concepts/workloads/controllers/daemonset/) in par
 -->
 * 你还应该具备基本的 [Kubernetes 应用知识](/docs/tutorials/kubernetes-basics/)，特别是 [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) 相关的应用知识。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a Federated Daemonset
@@ -130,6 +131,6 @@ kubectl --context=federation-cluster delete daemonset mydaemonset
 kubectl --context=federation-cluster delete daemonset mydaemonset
 ```
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/deployment.md b/content/zh/docs/tasks/federation/administer-federation/deployment.md
index 3af526f5b3..1d4e53ffa4 100644
--- a/content/zh/docs/tasks/federation/administer-federation/deployment.md
+++ b/content/zh/docs/tasks/federation/administer-federation/deployment.md
@@ -1,15 +1,15 @@
 ---
 title: 联邦 Deployment
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Federated Deployment
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -36,9 +36,10 @@ Some features
 (such as full rollout compatibility) are still in development.
 -->
 一些特性（例如完整的 rollout 兼容性）仍在开发中。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 <!--
@@ -48,9 +49,9 @@ general and [Deployments](/docs/concepts/workloads/controllers/deployment/) in p
 -->
 * 您还应当拥有基本的 [Kubernetes 应用知识](/docs/tutorials/kubernetes-basics/)，特别是在 [Deployments](/docs/concepts/workloads/controllers/deployment/) 方面。 
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Creating a Federated Deployment
 
@@ -171,6 +172,6 @@ kubectl --context=federation-cluster delete deployment mydep
 kubectl --context=federation-cluster delete deployment mydep
 ```
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/events.md b/content/zh/docs/tasks/federation/administer-federation/events.md
index 824f62d7e0..56f0a644f6 100644
--- a/content/zh/docs/tasks/federation/administer-federation/events.md
+++ b/content/zh/docs/tasks/federation/administer-federation/events.md
@@ -1,16 +1,16 @@
 ---
 title: 联邦事件
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
 ---
 title: Federated Events
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -21,10 +21,10 @@ This guide explains how to use events in federation control plane to help in deb
 -->
 本指南介绍如何在联邦控制平面中使用事件来帮助调试。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Prerequisites
@@ -84,4 +84,4 @@ The standard kubectl get, update, delete commands will all work.
 -->
 标准的 kubectl get，update，delete 命令都可以正常工作。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/federation/administer-federation/job.md b/content/zh/docs/tasks/federation/administer-federation/job.md
index e10314baaf..27983d7924 100644
--- a/content/zh/docs/tasks/federation/administer-federation/job.md
+++ b/content/zh/docs/tasks/federation/administer-federation/job.md
@@ -1,16 +1,16 @@
 ---
 title: 联邦 Job
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Federated Jobs
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -30,9 +30,10 @@ parallelism and completions exist across the registered clusters.
 联邦控制平面中的一次性任务（在本指南中称为“联邦一次性任务”）类似于传统的 [Kubernetes 一次性任务](/docs/concepts/workloads/controllers/job/)，并且提供相同的功能。
 在联邦控制平面中创建 job 可以确保在已注册的集群中存在所需的并行性和完成数。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 * 你需要具备基本的 [Kubernetes 的工作知识](/docs/tutorials/kubernetes-basics/)，特别是 [job](/docs/concepts/workloads/controllers/jobs-run-to-completion/)。
@@ -43,9 +44,9 @@ parallelism and completions exist across the registered clusters.
 general and [jobs](/docs/concepts/workloads/controllers/jobs-run-to-completion/) in particular.
 -->
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a federated job
@@ -185,6 +186,6 @@ You must delete the underlying jobs manually.
 
 {{< /note >}}
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/namespaces.md b/content/zh/docs/tasks/federation/administer-federation/namespaces.md
index 8ed098eaf8..f5032b52f3 100644
--- a/content/zh/docs/tasks/federation/administer-federation/namespaces.md
+++ b/content/zh/docs/tasks/federation/administer-federation/namespaces.md
@@ -1,16 +1,16 @@
 ---
 title: 联邦命名空间
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Federated Namespaces
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -31,9 +31,10 @@ across all the clusters in federation.
 联邦控制平面中的命名空间（本指南中称为“联邦命名空间”）与提供相同功能的传统 Kubernetes 命名空间非常相似。
 在联邦控制平面中创建它们可确保它们在联邦中的所有集群之间同步
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 * 您还需要具备基本的 [Kubernetes 工作知识](/docs/tutorials/Kubernetes-basics/)，
@@ -45,9 +46,9 @@ You are also expected to have a basic
 general and [Namespaces](/docs/concepts/overview/working-with-objects/namespaces/) in particular.
 -->
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a Federated Namespace
@@ -152,6 +153,6 @@ At this point, deleting a federated Namespace will not delete the corresponding
 
 {{< /note >}}
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/replicaset.md b/content/zh/docs/tasks/federation/administer-federation/replicaset.md
index b68bca653d..af7ae0efe9 100644
--- a/content/zh/docs/tasks/federation/administer-federation/replicaset.md
+++ b/content/zh/docs/tasks/federation/administer-federation/replicaset.md
@@ -1,15 +1,15 @@
 ---
 title: 联邦 ReplicaSet
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Federated ReplicaSets
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -27,9 +27,10 @@ replicas exist across the registered clusters.
 本指南阐述了如何在联邦控制平面中使用 ReplicaSet。
 在联邦控制平面中的 ReplicaSet (在本指南中称为”联邦 ReplicaSet”) 和传统的 [Kubernetes
 ReplicaSet](/docs/concepts/workloads/controllers/replicaset/) 很相似，提供了一样的功能。在联邦控制平面中创建联邦 ReplicaSet 可以确保在联邦的所有集群中都有预期数量的副本。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "federated-task-tutorial-prereqs.md" >}}
 <!--
@@ -39,9 +40,9 @@ general and [ReplicaSets](/docs/concepts/workloads/controllers/replicaset/) in p
 -->
 * 你还应该具备基本的 [Kubernetes 应用知识](/docs/tutorials/kubernetes-basics/)，特别是 [ReplicaSets](/docs/concepts/workloads/controllers/replicaset/) 相关的应用知识。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a Federated ReplicaSet
@@ -214,6 +215,6 @@ At this point, deleting a federated ReplicaSet will not delete the corresponding
 要注意的是这时删除联邦 ReplicaSet 并不会删除底层集群中对应的 ReplicaSet。您必须自己手动删除底层集群中的 ReplicaSet。我们打算在将来修复这个问题。
 {{< /note >}}
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/administer-federation/secret.md b/content/zh/docs/tasks/federation/administer-federation/secret.md
index b3a7a83fb2..5b185ddb29 100644
--- a/content/zh/docs/tasks/federation/administer-federation/secret.md
+++ b/content/zh/docs/tasks/federation/administer-federation/secret.md
@@ -1,16 +1,16 @@
 ---
 title: 联邦 Secret
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
 ---
 title: Federated Secrets
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -30,10 +30,10 @@ across all the clusters in federation.
 联邦控制平面中的 Secret（在本指南中称为“联邦 secret”）与提供相同功能的传统 [Kubernetes Secret](/docs/concepts/configuration/secret/) 非常相似。
 在联邦控制平面中创建它们可以确保它们跨联邦中的所有集群同步。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Prerequisites
@@ -161,4 +161,4 @@ At this point, deleting a federated secret will not delete the corresponding sec
 
 {{< /note >}}
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/federation/federation-service-discovery.md b/content/zh/docs/tasks/federation/federation-service-discovery.md
index a242731e57..b3237e0122 100644
--- a/content/zh/docs/tasks/federation/federation-service-discovery.md
+++ b/content/zh/docs/tasks/federation/federation-service-discovery.md
@@ -1,6 +1,6 @@
 ---
 title: 使用联合服务来实现跨集群的服务发现
-content_template: templates/task
+content_type: task
 weight: 140
 ---
 <!-- ---
@@ -8,11 +8,11 @@ title: Cross-cluster Service Discovery using Federated Services
 reviewers:
 - bprashanth
 - quinton-hoole
-content_template: templates/task
+content_type: task
 weight: 140
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -52,17 +52,18 @@ cluster if it exists and is healthy, or the closest healthy shard in a
 different cluster if it does not. -->
 如果存在健康的分片，联合 Kubernetes 集群(即 Pods )中的客户端将自动在其中找到联合服务的本地分片集群或者集群中最接近的健康分片;如果不存在，则使用最接近的其他集群的健康分片。
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture prerequisites %}}
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Prerequisites -->
 ## 前提
@@ -432,9 +433,9 @@ many clients will fail over automatically to one of the alternative
 IP's in less time than that given appropriate configuration. -->
 标准的 Kubernetes 服务集群 IP 已确保无响应的单个 Pod 端点以低延迟(几秒钟)自动退出服务。此外，如上所述，Kubernetes 联邦集群系统会自动监视集群的状态以及联合服务的所有分片后面的端点，并根据需要使分片进入和退出服务(例如，当服务后面的所有端点或者整个集群或可用性区域出现故障时，或者相反地从中断中恢复时)。由于 DNS 缓存固有的延迟(默认情况下,缓存超时或联合服务 DNS 记录的 TTL 配置为3分钟，可以调整),在灾难性故障的情况下，所有客户端可能要花费很长时间才能完全故障转移到备用集群。但是，鉴于每个区域服务端点可以返回的离散 IP 地址数量(例如上面的 us-central1，它有三个替代方案),与给定的合适配置相比，许多客户端将在更少的时间内自动故障转移到其他 IP。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- ## Troubleshooting -->
 ## 故障排除
@@ -505,4 +506,4 @@ Check that: -->
 
  <!-- * [Federation proposal](https://git.k8s.io/community/contributors/design-proposals/multicluster/federation.md) details use cases that motivated this work. -->
  * [联合提议](https://git.k8s.io/community/contributors/design-proposals/multicluster/federation.md) 详细介绍了促进这项工作的用例。
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/federation/set-up-coredns-provider-federation.md b/content/zh/docs/tasks/federation/set-up-coredns-provider-federation.md
index 03508536a5..8193d928dc 100644
--- a/content/zh/docs/tasks/federation/set-up-coredns-provider-federation.md
+++ b/content/zh/docs/tasks/federation/set-up-coredns-provider-federation.md
@@ -1,18 +1,18 @@
 ---
 title: 将 CoreDNS 设置为联邦集群的 DNS 提供者
-content_template: templates/tutorial
+content_type: tutorial
 weight: 130
 ---
 
 <!--
 ---
 title: Set up CoreDNS as DNS provider for Cluster Federation
-content_template: templates/tutorial
+content_type: tutorial
 weight: 130
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -24,10 +24,11 @@ DNS provider for Cluster Federation.
 -->
 此页面显示如何配置和部署 CoreDNS，将其用作联邦集群的 DNS 提供者
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * Configure and deploy CoreDNS server
@@ -39,10 +40,11 @@ DNS provider for Cluster Federation.
 * 使用 CoreDNS 作为 dns 提供者设置联邦
 * 在 nameserver 查找链中设置 CoreDNS 服务器
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * You need to have a running Kubernetes cluster (which is
@@ -56,10 +58,10 @@ mandatory to enable `CoreDNS` for service discovery across federated clusters.
 * 你需要有一个正在运行的 Kubernetes 集群（作为主机集群引用）。请参阅[入门指南](/docs/setup/)，了解平台的安装说明。
 * 必须在联邦的集群成员中支持 `LoadBalancer` 服务，用来支持跨联邦集群的 `CoreDNS` 服务发现。
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Deploying CoreDNS and etcd charts
@@ -247,6 +249,6 @@ Now the federated cluster is ready for cross-cluster service discovery!
 -->
 现在联邦集群已经为跨集群服务发现做好了准备！
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/federation/set-up-placement-policies-federation.md b/content/zh/docs/tasks/federation/set-up-placement-policies-federation.md
index 774966f39c..1dfc62e3fd 100644
--- a/content/zh/docs/tasks/federation/set-up-placement-policies-federation.md
+++ b/content/zh/docs/tasks/federation/set-up-placement-policies-federation.md
@@ -1,14 +1,14 @@
 ---
 title: 在联邦中设置放置策略
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 title: Set up placement policies in Federation
-content_template: templates/task
+content_type: task
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< deprecationfilewarning >}}
 {{< include "federation-deprecation-warning-note.md" >}}
@@ -20,9 +20,10 @@ resources using an external policy engine.
 -->
 此页面显示如何使用外部策略引擎对联邦资源强制执行基于策略的放置决策。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 You need to have a running Kubernetes cluster (which is referenced as host
@@ -31,9 +32,9 @@ guides for installation instructions for your platform.
 -->
 您需要一个正在运行的 Kubernetes 集群(它被引用为主机集群)。有关您的平台的安装说明，请参阅[入门](/docs/setup/)指南。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Deploying Federation and configuring an external policy engine
@@ -325,6 +326,6 @@ Inspect the ReplicaSet to confirm the appropriate annotations have been applied:
 
     kubectl --context=federation get rs nginx-pci -o jsonpath='{.metadata.annotations}'
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/inject-data-application/define-command-argument-container.md b/content/zh/docs/tasks/inject-data-application/define-command-argument-container.md
index 47a3ddafe2..bf788388dd 100644
--- a/content/zh/docs/tasks/inject-data-application/define-command-argument-container.md
+++ b/content/zh/docs/tasks/inject-data-application/define-command-argument-container.md
@@ -1,17 +1,17 @@
 ---
 title: 为容器设置启动时要执行的命令及其入参
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 <!--
 ---
 title: Define a Command and Arguments for a Container
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to define commands and arguments when you run a container
@@ -19,17 +19,18 @@ in a {{< glossary_tooltip term_id="pod" >}}.
 -->
 本页将展示如何为 {{< glossary_tooltip term_id="pod" >}} 中的容器设置启动时要执行的命令及其入参。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Define a command and arguments when you create a Pod
@@ -234,9 +235,10 @@ Here are some examples:
 |     `[/ep-1]`      |   `[foo bar]`    |   `[/ep-2]`         |     `[zoo boo]`    | `[ep-2 zoo boo]` |
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [configuring pods and containers](/docs/tasks/).
@@ -247,7 +249,7 @@ Here are some examples:
 * 了解更多 [在容器中运行命令](/docs/tasks/debug-application-cluster/get-shell-running-container/)。
 * 请参阅 [有关容器的文档](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#container-v1-core)。
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/inject-data-application/define-environment-variable-container.md b/content/zh/docs/tasks/inject-data-application/define-environment-variable-container.md
index 53795cf0d6..eadfae352f 100644
--- a/content/zh/docs/tasks/inject-data-application/define-environment-variable-container.md
+++ b/content/zh/docs/tasks/inject-data-application/define-environment-variable-container.md
@@ -1,17 +1,17 @@
 ---
 title: 为容器设置环境变量
-content_template: templates/task
+content_type: task
 ---
 
 <!--
 ---
 title: Define Environment Variables for a Container
-content_template: templates/task
+content_type: task
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to define environment variables for a container
@@ -20,17 +20,18 @@ in a Kubernetes Pod.
 
 本页将展示如何为 kubernetes Pod 下的容器设置环境变量。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Define an environment variable for a container
@@ -167,9 +168,10 @@ Upon creation, the command `echo Warm greetings to The Most Honorable Kubernetes
 -->
 创建后，命令 `echo Warm greetings to The Most Honorable Kubernetes` 将在容器中运行。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [environment variables](/docs/tasks/inject-data-application/environment-variable-expose-pod-information/).
@@ -181,4 +183,4 @@ Upon creation, the command `echo Warm greetings to The Most Honorable Kubernetes
 * 有关如何通过环境变量来使用 Secret，请参阅[这里](/docs/user-guide/secrets/#using-secrets-as-environment-variables)。
 * 关于 [EnvVarSource](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#envvarsource-v1-core) 资源的信息。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/inject-data-application/distribute-credentials-secure.md b/content/zh/docs/tasks/inject-data-application/distribute-credentials-secure.md
index 9ef03ba68e..ce0b85820d 100644
--- a/content/zh/docs/tasks/inject-data-application/distribute-credentials-secure.md
+++ b/content/zh/docs/tasks/inject-data-application/distribute-credentials-secure.md
@@ -1,19 +1,20 @@
 ---
 title: 使用 Secret 安全地分发凭证
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本文展示如何安全地将敏感数据（如密码和加密密钥）注入到 Pods 中。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 将 secret 数据转换为 base-64 形式
 
@@ -187,9 +188,10 @@ base-64 形式的密码为 `Mzk1MjgkdmRnN0pi`。
     SECRET_PASSWORD=39528$vdg7Jb
     ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 了解更多关于 [Secrets](/docs/concepts/configuration/secret/)。
 * 了解 [Volumes](/docs/concepts/storage/volumes/)。
@@ -200,4 +202,4 @@ base-64 形式的密码为 `Mzk1MjgkdmRnN0pi`。
 * [Volume](/docs/api-reference/{{< param "version" >}}/#volume-v1-core)
 * [Pod](/docs/api-reference/{{< param "version" >}}/#pod-v1-core)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md b/content/zh/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md
index e702a8dcf2..84ddad382e 100644
--- a/content/zh/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md
+++ b/content/zh/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md
@@ -1,22 +1,23 @@
 ---
 title: 通过文件将Pod信息呈现给容器
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 此页面描述Pod如何使用DownwardAPIVolumeFile把自己的信息呈现给pod中运行的容器。DownwardAPIVolumeFile可以呈现pod的字段和容器字段。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## Downward API
 
@@ -175,9 +176,9 @@ kubectl exec -it kubernetes-downwardapi-volume-example-2 -- sh
 ```
 你可以使用同样的命令查看`cpu_request`, `mem_limit` 和`mem_request` 文件.
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 ## Capabilities of the Downward API
 
@@ -225,10 +226,11 @@ kubectl exec -it kubernetes-downwardapi-volume-example-2 -- sh
 对于容器来说，有时候拥有自己的信息是很有用的，可避免与Kubernetes过度耦合。Downward API使得容器使用自己或者集群的信息，而不必通过Kubernetes客户端或API服务器。
 
 一个例子是有一个现有的应用假定要用一个非常熟悉的环境变量来保存一个唯一标识。一种可能是给应用增加处理层，但这样是冗余和易出错的，而且它违反了低耦合的目标。更好的选择是使用Pod名称作为标识，把Pod名称注入这个环境变量中。
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * [PodSpec](/docs/resources-reference/{{< param "version" >}}/#podspec-v1-core)
 * [Volume](/docs/resources-reference/{{< param "version" >}}/#volume-v1-core)
@@ -236,6 +238,6 @@ kubectl exec -it kubernetes-downwardapi-volume-example-2 -- sh
 * [DownwardAPIVolumeFile](/docs/resources-reference/{{< param "version" >}}/#downwardapivolumefile-v1-core)
 * [ResourceFieldSelector](/docs/resources-reference/{{< param "version" >}}/#resourcefieldselector-v1-core)
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md b/content/zh/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md
index 610181bb41..46e101baa5 100644
--- a/content/zh/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md
+++ b/content/zh/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md
@@ -1,9 +1,9 @@
 ---
 title: 通过环境变量将Pod信息呈现给容器
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 此页面显示了Pod如何使用环境变量把自己的信息呈现给pod中运行的容器。环境变量可以呈现pod的字段和容器字段。
 
@@ -11,17 +11,18 @@ content_template: templates/task
 环境变量 和[DownwardAPIVolumeFiles](/docs/resources-reference/{{< param "version" >}}/#downwardapivolumefile-v1-core).
 这两种呈现Pod和Container字段的方式都称为*Downward API*。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## Downward API
 
@@ -137,9 +138,10 @@ kubectl logs dapi-envars-resourcefieldref
 67108864
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * [给容器定义环境变量](/docs/tasks/configure-pod-container/define-environment-variable-container/)
 * [PodSpec](/docs/resources-reference/{{< param "version" >}}/#podspec-v1-core)
@@ -149,7 +151,7 @@ kubectl logs dapi-envars-resourcefieldref
 * [ObjectFieldSelector](/docs/resources-reference/{{< param "version" >}}/#objectfieldselector-v1-core)
 * [ResourceFieldSelector](/docs/resources-reference/{{< param "version" >}}/#resourcefieldselector-v1-core)
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/job/automated-tasks-with-cron-jobs.md b/content/zh/docs/tasks/job/automated-tasks-with-cron-jobs.md
index 5b987b3cc3..131ef52219 100644
--- a/content/zh/docs/tasks/job/automated-tasks-with-cron-jobs.md
+++ b/content/zh/docs/tasks/job/automated-tasks-with-cron-jobs.md
@@ -3,7 +3,7 @@ reviewers:
 - chenopis
 
 title: 使用 CronJob 运行自动化任务
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 
@@ -12,12 +12,12 @@ weight: 10
 title: Running Automated Tasks with a CronJob
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 You can use [CronJobs](/docs/concepts/workloads/controllers/cron-jobs) to run jobs on a time-based schedule.
@@ -53,9 +53,10 @@ CronJobs 有一些限制和特点。
 因此，任务应该是幂等的。
 查看更多限制，请参考 [CronJobs](/docs/concepts/workloads/controllers/cron-jobs)。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 <!--
@@ -69,9 +70,9 @@ component.
 * 你需要一个版本 >=1.8 且工作正常的 Kubernetes 集群。对于更早的版本（ <1.8 ），你需要对 API 服务器设置 `--runtime-config=batch/v2alpha1=true` 来开启 `batch/v2alpha1` API，(更多信息请查看 [为你的集群开启或关闭 API 版本](/docs/admin/cluster-management/#turn-on-or-off-an-api-version-for-your-cluster)
 ), 然后重启 API 服务器和控制管理器。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Creating a Cron Job
@@ -359,4 +360,4 @@ By default, they are set to 3 and 1 respectively.  Setting a limit to `0` corres
 这两个域声明了有多少执行完成和失败的任务会被保留。
 默认设置为3和1。限制设置为0代表相应类型的任务完成后不会保留。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/job/coarse-parallel-processing-work-queue.md b/content/zh/docs/tasks/job/coarse-parallel-processing-work-queue.md
index f403a4eddd..8a74313894 100644
--- a/content/zh/docs/tasks/job/coarse-parallel-processing-work-queue.md
+++ b/content/zh/docs/tasks/job/coarse-parallel-processing-work-queue.md
@@ -1,18 +1,18 @@
 ---
 title: 使用工作队列进行粗粒度并行处理
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 
 <!--
 ---
 title: Coarse Parallel Processing Using a Work Queue
-content_template: templates/task
+content_type: task
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 In this example, we will run a Kubernetes Job with multiple parallel
@@ -43,10 +43,11 @@ Here is an overview of the steps in this example:
 
 1. **启动一个在队列中执行这些任务的 Job**。该 Job 启动多个 Pod。每个 Pod 从消息队列中取走一个任务，处理它，然后重复执行，直到队列的队尾。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 Be familiar with the basic,
@@ -57,9 +58,9 @@ non-parallel, use of [Job](/docs/concepts/jobs/run-to-completion-finite-workload
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Starting a message queue service
@@ -436,9 +437,9 @@ All our pods succeeded.  Yay.
 
 我们所有的 Pod 都成功了。耶！
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Alternatives
@@ -501,4 +502,4 @@ in the queue have been processed.
 * 在 amqp-consume 命令拿到消息和容器成功退出之间的时间段内，执行杀死容器操作；
 * 在 kubelet 向 api-server 传回 Pod 成功运行之前，发生节点崩溃。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/job/fine-parallel-processing-work-queue.md b/content/zh/docs/tasks/job/fine-parallel-processing-work-queue.md
index 3ca8a9d511..45951f4706 100755
--- a/content/zh/docs/tasks/job/fine-parallel-processing-work-queue.md
+++ b/content/zh/docs/tasks/job/fine-parallel-processing-work-queue.md
@@ -2,18 +2,18 @@
 cn-approvers:
 - linyouchong
 title: 使用工作队列进行精细的并行处理
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 <!--
 ---
 title: Fine Parallel Processing Using a Work Queue
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 In this example, we will run a Kubernetes Job with multiple parallel
@@ -57,17 +57,18 @@ Here is an overview of the steps in this example:
 
 3. **启动一个 Job 对队列中的任务进行处理**。这个 Job 启动了若干个 Pod 。每个 Pod 从消息队列中取出一个工作任务，处理它，然后重复，直到到达队列的尾部。
 
-{{% /capture %}}
+
 
 {{< toc >}}
 
-{{% capture prerequisites %}}
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 Be familiar with the basic,
@@ -75,9 +76,9 @@ non-parallel, use of [Job](/docs/concepts/jobs/run-to-completion-finite-workload
 -->
 熟秋基础知识，非并行方式运行 [Job](/docs/concepts/jobs/run-to-completion-finite-workloads/)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Starting Redis
@@ -359,9 +360,9 @@ As you can see, one of our pods worked on several work units.
 -->
 您可以看到，其中的一个 pod 处理了若干个工作单元。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Alternatives
@@ -382,4 +383,4 @@ and consider running a background processing library such as
 -->
 如果您有连续的后台处理业务，那么可以考虑使用 `replicationController` 来运行您的后台业务，和运行一个类似 [https://github.com/resque/resque](https://github.com/resque/resque) 的后台处理库。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/job/parallel-processing-expansion.md b/content/zh/docs/tasks/job/parallel-processing-expansion.md
index e113804e73..b010ae6848 100644
--- a/content/zh/docs/tasks/job/parallel-processing-expansion.md
+++ b/content/zh/docs/tasks/job/parallel-processing-expansion.md
@@ -1,6 +1,6 @@
 ---
 title: 使用扩展进行并行处理
-content_template: templates/concept
+content_type: concept
 min-kubernetes-server-version: v1.8
 weight: 20
 ---
@@ -8,13 +8,13 @@ weight: 20
 <!--
 ---
 title: Parallel Processing using Expansions
-content_template: templates/concept
+content_type: concept
 min-kubernetes-server-version: v1.8
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 In this example, we will run multiple Kubernetes Jobs created from
@@ -23,10 +23,10 @@ non-parallel, use of [Jobs](/docs/concepts/workloads/controllers/jobs-run-to-com
 -->
 在这个示例中，我们将运行从一个公共模板创建的多个 Kubernetes Job。您可能需要先熟悉 [Jobs](/docs/concepts/workloads/controllers/jobs-run-to-completion/) 的基本概念、非并行以及如何使用它。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Basic Template Expansion
@@ -338,4 +338,4 @@ other [job patterns](/docs/concepts/jobs/run-to-completion-finite-workloads/#job
 -->
 在这种情况下，您可以考虑其他的[作业模式](/docs/concepts/jobs/run-to-completion-finite-workloads/#job-patterns)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/manage-daemon/rollback-daemon-set.md b/content/zh/docs/tasks/manage-daemon/rollback-daemon-set.md
index 12764dd515..780a16f95e 100644
--- a/content/zh/docs/tasks/manage-daemon/rollback-daemon-set.md
+++ b/content/zh/docs/tasks/manage-daemon/rollback-daemon-set.md
@@ -2,25 +2,26 @@
 approvers:
 - janetkuo
 title: 对 DaemonSet 执行回滚
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文展示了如何对 DaemonSet 执行回滚。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * DaemonSet 滚动升级历史和 DaemonSet 回滚特性仅在 Kubernetes 1.7 及以后版本的 `kubectl` 中支持。
 * 确保您了解如何 [对 DaemonSet 执行滚动升级](/docs/tasks/manage-daemon/update-daemon-set/)。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 对 DaemonSet 执行回滚
 
@@ -98,10 +99,10 @@ kubectl rollout status ds/<daemonset-name>
 daemonset "<daemonset-name>" successfully rolled out
 ```
 
-{{% /capture %}}
 
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 ## 理解 DaemonSet 版本
 
@@ -134,6 +135,6 @@ NAME                               CONTROLLER                     REVISION   AGE
 
 * 查看 [DaemonSet 滚动升级故障排除](/docs/tasks/manage-daemon/update-daemon-set/#troubleshooting)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/manage-daemon/update-daemon-set.md b/content/zh/docs/tasks/manage-daemon/update-daemon-set.md
index 66c5f63175..7ad4b7259d 100644
--- a/content/zh/docs/tasks/manage-daemon/update-daemon-set.md
+++ b/content/zh/docs/tasks/manage-daemon/update-daemon-set.md
@@ -2,7 +2,7 @@
 reviewers:
 - janetkuo
 title: 对 DaemonSet 执行滚动更新
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -10,31 +10,32 @@ content_template: templates/task
 reviewers:
 - janetkuo
 title: Perform a Rolling Update on a DaemonSet
-content_template: templates/task
+content_type: task
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to perform a rolling update on a DaemonSet.
 --->
 本文介绍了如何对 DaemonSet 执行滚动更新。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * The DaemonSet rolling update feature is only supported in Kubernetes version 1.6 or later.
 --->
 * Kubernetes 1.6 或者更高版本中才支持 DaemonSet 滚动更新功能。
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## DaemonSet Update Strategy
@@ -319,10 +320,11 @@ progress.
 --->
 如果在 DaemonSet 中指定了 `.spec.minReadySeconds`，主节点和工作节点之间的时钟偏差会使 DaemonSet 无法检测到正确的滚动更新进度。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * See [Task: Performing a rollback on a
@@ -332,4 +334,4 @@ progress.
 * 查看[任务: 在 DaemonSet 上执行回滚](/docs/tasks/manage-daemon/rollback-daemon-set/)
 * 查看[概念: 创建 DaemonSet 以适应现有的 DaemonSet pods](/docs/concepts/workloads/controllers/daemonset/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/manage-gpus/scheduling-gpus.md b/content/zh/docs/tasks/manage-gpus/scheduling-gpus.md
index 09b0883f06..ac4f179771 100644
--- a/content/zh/docs/tasks/manage-gpus/scheduling-gpus.md
+++ b/content/zh/docs/tasks/manage-gpus/scheduling-gpus.md
@@ -1,19 +1,19 @@
 ---
 reviewers:
 - vishh
-content_template: templates/concept
+content_type: concept
 title: 调度 GPUs
 ---
 <!--
 ---
 reviewers:
 - vishh
-content_template: templates/concept
+content_type: concept
 title: Schedule GPUs
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Kubernetes includes **experimental** support for managing AMD and NVIDIA GPUs spread
@@ -28,10 +28,10 @@ Kubernetes 支持对节点上的 AMD 和 NVIDA GPU 进行管理，目前处于**
 
 这个页面介绍了用户如何在不同的 Kubernetes 版本中使用 GPU，以及当前存在的一些限制。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## v1.8 onwards
diff --git a/content/zh/docs/tasks/manage-hugepages/scheduling-hugepages.md b/content/zh/docs/tasks/manage-hugepages/scheduling-hugepages.md
index 7e6171358b..9bb6292242 100644
--- a/content/zh/docs/tasks/manage-hugepages/scheduling-hugepages.md
+++ b/content/zh/docs/tasks/manage-hugepages/scheduling-hugepages.md
@@ -2,18 +2,18 @@
 reviewers:
 - derekwaynecarr
 title: 管理巨页（HugePages）
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 reviewers:
 - derekwaynecarr
 title: Manage HugePages
-content_template: templates/task
+content_type: task
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="stable" >}}
 
 <!--
@@ -23,9 +23,10 @@ can consume huge pages and the current limitations.
 --->
 作为 **GA** 特性，Kubernetes 支持在 Pod 应用中使用预先分配的巨页。本文描述了用户如何使用巨页，以及当前的限制。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 1. Kubernetes nodes must pre-allocate huge pages in order for the node to report
@@ -39,9 +40,9 @@ schedulable resource.
 
 节点会自动发现全部巨页资源，并作为可供调度的资源进行上报。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## API
 
@@ -121,6 +122,6 @@ token.
 - 作为服务质量特性，保证巨页的 NUMA 局部性。
 - 支持 LimitRange 。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/manage-kubernetes-objects/imperative-config.md b/content/zh/docs/tasks/manage-kubernetes-objects/imperative-config.md
index d001d4638a..1cd2daf0a1 100644
--- a/content/zh/docs/tasks/manage-kubernetes-objects/imperative-config.md
+++ b/content/zh/docs/tasks/manage-kubernetes-objects/imperative-config.md
@@ -1,17 +1,17 @@
 ---
 title: 使用配置文件对 Kubernetes 对象进行命令式管理
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 <!--
 ---
 title: Imperative Management of Kubernetes Objects Using Configuration Files
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Kubernetes objects can be created, updated, and deleted by using the `kubectl`
 command-line tool along with an object configuration file written in YAML or JSON.
@@ -19,9 +19,10 @@ This document explains how to define and manage objects using configuration file
 -->
 可以使用 `kubectl` 命令行工具以及用 YAML 或 JSON 编写的对象配置文件来创建、更新和删除 Kubernetes 对象。
 本文档说明了如何使用配置文件定义和管理对象。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 Install [`kubectl`](/docs/tasks/tools/install-kubectl/).
@@ -30,9 +31,9 @@ Install [`kubectl`](/docs/tasks/tools/install-kubectl/).
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Trade-offs
@@ -256,9 +257,10 @@ template:
       controller-selector: "apps/v1/deployment/nginx"
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Managing Kubernetes Objects Using Imperative Commands](/docs/tasks/manage-kubernetes-objects/imperative-command/)
@@ -271,5 +273,5 @@ template:
 * [Kubectl 命令参考](/docs/reference/generated/kubectl/kubectl/)
 * [Kubernetes API 参考](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/)
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/network/validate-dual-stack.md b/content/zh/docs/tasks/network/validate-dual-stack.md
index 9ed6fc1de6..c0d1363fcc 100644
--- a/content/zh/docs/tasks/network/validate-dual-stack.md
+++ b/content/zh/docs/tasks/network/validate-dual-stack.md
@@ -3,7 +3,7 @@ reviewers:
 - lachie83
 - khenidak
 title: 验证 IPv4/IPv6 双协议栈
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
@@ -11,18 +11,19 @@ reviewers:
 - lachie83
 - khenidak
 title: Validate IPv4/IPv6 dual-stack
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This document shares how to validate IPv4/IPv6 dual-stack enabled Kubernetes clusters.
 -->
 这篇文章分享了如何验证 IPv4/IPv6 双协议栈的 Kubernetes 集群。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * Kubernetes 1.16 or later
@@ -37,9 +38,9 @@ This document shares how to validate IPv4/IPv6 dual-stack enabled Kubernetes clu
 * Kube-proxy 在 IPVS 模式下运行
 * [启用双协议栈](/docs/concepts/services-networking/dual-stack/) 集群
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Validate addressing
@@ -236,7 +237,7 @@ NAME         TYPE        CLUSTER-IP       EXTERNAL-IP                     PORT(S
 my-service   ClusterIP   fe80:20d::d06b   2001:db8:f100:4002::9d37:c0d7   80:31868/TCP   30s
 ```
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/run-application/configure-pdb.md b/content/zh/docs/tasks/run-application/configure-pdb.md
index f0da9fa965..faeba16c3c 100644
--- a/content/zh/docs/tasks/run-application/configure-pdb.md
+++ b/content/zh/docs/tasks/run-application/configure-pdb.md
@@ -1,16 +1,16 @@
 ---
 title: 指定应用程序的中断预算（Disruption Budget）
-content_template: templates/task
+content_type: task
 weight: 110
 ---
 
 <!-- ---
 title: Specifying a Disruption Budget for your Application
-content_template: templates/task
+content_type: task
 weight: 110
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- This page shows how to limit the number of concurrent disruptions
 that your application experiences, allowing for higher availability
@@ -19,9 +19,10 @@ nodes. -->
 
 本文展示了如何限制应用程序的并发中断数量，在允许集群管理员管理集群节点的同时保证高可用。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!-- * You are the owner of an application running on a Kubernetes cluster that requires
   high availability. -->
@@ -39,9 +40,9 @@ nodes. -->
   Pod Disruption Budgets. -->
 * 用户应当与集群所有者或服务提供者确认其遵从 Pod 中断预算（Pod Disruption Budgets）的规则。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!-- ## Protecting an Application with a PodDisruptionBudget -->
 ## 用 PodDisruptionBudget 来保护应用
@@ -56,9 +57,9 @@ nodes. -->
 1. 以 YAML 文件形式定义 PDB 。
 1. 通过 YAML 文件创建 PDB 对象。
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!-- ## Identify an Application to Protect -->
 ## 确定要保护的应用
@@ -329,6 +330,6 @@ to create PDBs whose selectors overlap. -->
 用户可以令选择器选择一个内置控制器所控制 pod 的子集或父集。然而，当名字空间下存在多个 PDB 时，
 用户必须小心，保证 PDB 的选择器之间不重叠。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/run-application/delete-stateful-set.md b/content/zh/docs/tasks/run-application/delete-stateful-set.md
index 31c789cd48..92c35c7ded 100644
--- a/content/zh/docs/tasks/run-application/delete-stateful-set.md
+++ b/content/zh/docs/tasks/run-application/delete-stateful-set.md
@@ -6,29 +6,30 @@ reviewers:
 - janetkuo
 - smarterclayton
 title: 删除 StatefulSet
-content_template: templates/task
+content_type: task
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This task shows you how to delete a StatefulSet.
 --->
 本文介绍如何删除 StatefulSet。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * This task assumes you have an application running on your cluster represented by a StatefulSet.
 --->
 * 本文假设在您的集群上已经运行了由 StatefulSet 创建的应用。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 删除 StatefulSet
 
@@ -119,15 +120,16 @@ If you find that some pods in your StatefulSet are stuck in the 'Terminating' or
 --->
 如果您发现 StatefulSet 中的某些 pods 长时间处于 'Terminating' 或者 'Unknown' 状态，则可能需要手动干预以强制从 apiserver 中删除 pods。这是一项潜在的危险任务。详细信息请阅读[删除 StatefulSet 类型的 Pods](/docs/tasks/manage-stateful-set/delete-pods/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Learn more about [force deleting StatefulSet Pods](/docs/tasks/run-application/force-delete-stateful-set-pod/).
 --->
 了解更多有关[强制删除 StatefulSet 类型的 Pods](/docs/tasks/run-application/force-delete-stateful-set-pod/)。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/run-application/force-delete-stateful-set-pod.md b/content/zh/docs/tasks/run-application/force-delete-stateful-set-pod.md
index 7197d8034d..3a401d617a 100644
--- a/content/zh/docs/tasks/run-application/force-delete-stateful-set-pod.md
+++ b/content/zh/docs/tasks/run-application/force-delete-stateful-set-pod.md
@@ -5,7 +5,7 @@ reviewers:
 - foxish
 - smarterclayton
 title: 强制删除 StatefulSet 类型的 Pods
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 
@@ -17,19 +17,20 @@ reviewers:
 - foxish
 - smarterclayton
 title: Force Delete StatefulSet Pods
-content_template: templates/task
+content_type: task
 weight: 70
 ---
 --->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page shows how to delete Pods which are part of a stateful set, and explains the considerations to keep in mind when doing so.
 --->
 本文介绍了如何删除 StatefulSet 管理的部分 pods，并且解释了这样操作时需要记住的注意事项。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 * This is a fairly advanced task and has the potential to violate some of the properties inherent to StatefulSet.
@@ -38,9 +39,9 @@ This page shows how to delete Pods which are part of a stateful set, and explain
 * 这是一项相当高级的任务，并且可能会违反 StatefulSet 固有的某些属性。
 * 继续任务之前，请熟悉下面列举的注意事项。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## StatefulSet considerations
@@ -146,13 +147,14 @@ Always perform force deletion of StatefulSet Pods carefully and with complete kn
 --->
 请始终谨慎地执行强制删除 StatefulSet 类型的 pods，并完全了解所涉及地风险。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Learn more about [debugging a StatefulSet](/docs/tasks/debug-application-cluster/debug-stateful-set/).
 --->
 进一步了解[调试 StatefulSet](/docs/tasks/debug-application-cluster/debug-stateful-set/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md b/content/zh/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
index 72adc7421e..d7db4ef10b 100644
--- a/content/zh/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
+++ b/content/zh/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
@@ -5,11 +5,11 @@ reviewers:
 - justinsb
 - directxman12
 title: Horizontal Pod Autoscaler演练
-content_template: templates/task
+content_type: task
 weight: 100
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Horizontal Pod Autoscaler automatically scales the number of pods
@@ -25,11 +25,12 @@ This document walks you through an example of enabling Horizontal Pod Autoscaler
 本文将引导您了解如何为 php-apache 服务器配置和使用 Horizontal Pod Autoscaler。
 更多 Horizontal Pod Autoscaler 的信息请参阅 [Horizontal Pod Autoscaler user guide](/docs/tasks/run-application/horizontal-pod-autoscale/)。
 
-{{% /capture %}}
 
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 This example requires a running Kubernetes cluster and kubectl, version 1.2 or later.
@@ -55,9 +56,9 @@ See the [Horizontal Pod Autoscaler user guide](/docs/tasks/run-application/horiz
 最后，如果要使用与 Kubernetes 对象无关的度量指标，则 Kubernetes 集群版本至少需要达到1.10版本，同样，需要保证集群能够与提供这些外部指标的API服务器通信。
 更多详细信息，请参阅[Horizontal Pod Autoscaler user guide](/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-custom-metrics)。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Run & expose php-apache server
@@ -261,9 +262,9 @@ Autoscaling the replicas may take a few minutes.
 自动伸缩完成副本数量的改变可能需要几分钟的时间。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture discussion %}}
+
+<!-- discussion -->
 
 <!--
 ## Autoscaling on multiple metrics and custom metrics
@@ -690,4 +691,4 @@ kubectl create -f https://k8s.io/examples/application/hpa/php-apache.yaml
 horizontalpodautoscaler.autoscaling/php-apache created
 ```
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/run-application/horizontal-pod-autoscale.md b/content/zh/docs/tasks/run-application/horizontal-pod-autoscale.md
index dde0f6cc9a..10966fdf4d 100644
--- a/content/zh/docs/tasks/run-application/horizontal-pod-autoscale.md
+++ b/content/zh/docs/tasks/run-application/horizontal-pod-autoscale.md
@@ -9,11 +9,11 @@ feature:
   description: >
     使用一个简单的命令、一个UI或基于CPU使用情况自动对应用程序进行伸缩。
 
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The Horizontal Pod Autoscaler automatically scales the number of pods
@@ -36,10 +36,10 @@ to match the observed average CPU utilization to the target specified by user.
 Pod 水平自动伸缩特性由 Kubernetes API 资源和控制器实现。资源决定了控制器的行为。
 控制器会周期性的获取平均 CPU 利用率，并与目标值相比较后来调整 replication controller 或 deployment 中的副本数量。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## How does the Horizontal Pod Autoscaler work?
@@ -543,9 +543,10 @@ and [the walkthrough for using external metrics](/docs/tasks/run-application/hor
 [the walkthrough for using custom metrics](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-multiple-metrics-and-custom-metrics)
 和 [the walkthrough for using external metrics](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-metrics-not-related-to-kubernetes-objects)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Design documentation: [Horizontal Pod Autoscaling](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md).
@@ -556,4 +557,4 @@ and [the walkthrough for using external metrics](/docs/tasks/run-application/hor
 * kubectl 自动缩放命令： [kubectl autoscale](/docs/reference/generated/kubectl/kubectl-commands/#autoscale).
 * 使用示例：[Horizontal Pod Autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/).
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/run-application/rolling-update-replication-controller.md b/content/zh/docs/tasks/run-application/rolling-update-replication-controller.md
index e5e47e161b..d715d73f17 100644
--- a/content/zh/docs/tasks/run-application/rolling-update-replication-controller.md
+++ b/content/zh/docs/tasks/run-application/rolling-update-replication-controller.md
@@ -2,7 +2,7 @@
 reviewers:
 - janetkuo
 title: 基于Replication Controller执行滚动升级
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
 
@@ -11,7 +11,7 @@ weight: 80
 reviewers:
 - janetkuo
 title: Perform Rolling Update Using a Replication Controller
-content_template: templates/concept
+content_type: concept
 weight: 80
 --- 
 -->
diff --git a/content/zh/docs/tasks/run-application/run-replicated-stateful-application.md b/content/zh/docs/tasks/run-application/run-replicated-stateful-application.md
index 407c7f5c18..d35a0efefa 100644
--- a/content/zh/docs/tasks/run-application/run-replicated-stateful-application.md
+++ b/content/zh/docs/tasks/run-application/run-replicated-stateful-application.md
@@ -1,6 +1,6 @@
 ---
 title: 运行一个有状态的应用程序
-content_template: templates/tutorial
+content_type: tutorial
 weight: 30
 ---
 <!-- ---
@@ -12,11 +12,11 @@ reviewers:
 - kow3ns
 - smarterclayton
 title: Run a Replicated Stateful Application
-content_template: templates/tutorial
+content_type: tutorial
 weight: 30
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!-- This page shows how to run a replicated stateful application using a
 [StatefulSet](/docs/concepts/workloads/controllers/statefulset/) controller.
@@ -30,9 +30,10 @@ on general patterns for running stateful applications in Kubernetes. -->
 请注意 **这不是生产配置**。
 重点是， MySQL 设置保留在不安全的默认值上，使重点放在 Kubernetes 中运行有状态应用程序的常规模式。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!-- * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 * {{< include "default-storage-class-prereqs.md" >}}
@@ -54,9 +55,10 @@ on general patterns for running stateful applications in Kubernetes. -->
   [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/).
 * 熟悉 MySQL 会有所帮助，但是本教程旨在介绍对其他系统应该有用的常规模式。
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!-- * Deploy a replicated MySQL topology with a StatefulSet controller.
 * Send MySQL client traffic.
@@ -67,9 +69,9 @@ on general patterns for running stateful applications in Kubernetes. -->
 * 观察对宕机的抵抗力。
 * 缩放 StatefulSet 的大小。
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!-- ## Deploy MySQL -->
 ## 部署 MySQL
@@ -590,9 +592,10 @@ kubectl delete pvc data-mysql-3
 kubectl delete pvc data-mysql-4
 ```
 
-{{% /capture %}}
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 <!-- 1. Cancel the `SELECT @@server_id` loop by pressing **Ctrl+C** in its terminal,
    or running the following from another terminal: -->
@@ -642,15 +645,16 @@ kubectl delete pvc data-mysql-4
    如果您使用了动态预配器，当得知您删除 PersistentVolumeClaims 时，它将自动删除 PersistentVolumes。
    一些动态预配器(例如用于 EBS 和 PD 的预配器)也会在删除 PersistentVolumes 时释放基础资源。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- * Look in the [Helm Charts repository](https://github.com/kubernetes/charts)
   for other stateful application examples. -->
 * 在[Helm Charts 存储库](https://github.com/kubernetes/charts)中查找其他有状态的应用程序示例。
 
-{{% /capture %}}
+
 
 
 
diff --git a/content/zh/docs/tasks/run-application/run-single-instance-stateful-application.md b/content/zh/docs/tasks/run-application/run-single-instance-stateful-application.md
index 6ba0afd89c..5bd417375a 100644
--- a/content/zh/docs/tasks/run-application/run-single-instance-stateful-application.md
+++ b/content/zh/docs/tasks/run-application/run-single-instance-stateful-application.md
@@ -1,33 +1,35 @@
 ---
 title: 运行一个单实例有状态应用
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文介绍在 Kubernetes 中使用 PersistentVolume 和 Deployment 如何运行一个单实例有状态应用. 该应用是 MySQL.
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 * 在环境中通过磁盘创建一个PersistentVolume.
 * 创建一个MySQL Deployment.
 * 在集群内以一个已知的 DNS 名将 MySQL 暴露给其他 pods.
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
 * {{< include "default-storage-class-prereqs.md" >}}
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 ## 部署MySQL
 
@@ -158,10 +160,11 @@ kubectl delete pv mysql-pv-volume
 如果通过手动的方式分配 PersistentVolume, 那么也需要手动的删除它，以及释放下层资源.
 如果是用过动态分配 PersistentVolume 的方式，在删除 PersistentVolumeClaim 后 PersistentVolume 将被自动的删除. 一些存储服务(比如 EBS 和 PD)也会在 PersistentVolume 被删除时自动回收下层资源.
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 了解更多 Deployment 对象请参考 [Deployment objects](/docs/concepts/workloads/controllers/deployment/).
 
@@ -171,6 +174,6 @@ kubectl delete pv mysql-pv-volume
 
 * 卷和持久卷请参考 [Volumes](/docs/concepts/storage/volumes/) 和 [Persistent Volumes](/docs/concepts/storage/persistent-volumes/)
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/run-application/run-stateless-application-deployment.md b/content/zh/docs/tasks/run-application/run-stateless-application-deployment.md
index a4b086717f..a925a0d919 100644
--- a/content/zh/docs/tasks/run-application/run-stateless-application-deployment.md
+++ b/content/zh/docs/tasks/run-application/run-stateless-application-deployment.md
@@ -1,32 +1,34 @@
 ---
 title: 使用Deployment运行一个无状态应用
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本文介绍通过Kubernetes Deployment对象如何去运行一个应用.
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 * 创建一个nginx deployment.
 * 使用kubectl列举关于deployment信息.
 * 更新deployment.
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 ## 创建和探究一个nginx deployment
 
@@ -132,13 +134,14 @@ content_template: templates/tutorial
 
 创建一个多副本应用首选方法是使用Deployment,反过来使用ReplicaSet. 在Deployment和ReplicaSet加入到Kubernetes之前, 多副本应用通过[ReplicationController](/docs/concepts/workloads/controllers/replicationcontroller/)来配置.
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 了解更多 [Deployment objects](/docs/concepts/workloads/controllers/deployment/).
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/run-application/scale-stateful-set.md b/content/zh/docs/tasks/run-application/scale-stateful-set.md
index cf4a6817a8..ef0e5223e2 100644
--- a/content/zh/docs/tasks/run-application/scale-stateful-set.md
+++ b/content/zh/docs/tasks/run-application/scale-stateful-set.md
@@ -8,22 +8,23 @@ approvers:
 - kow3ns
 - smarterclayton
 title: 弹缩StatefulSet
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本文介绍如何弹缩StatefulSet.
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * StatefulSets仅适用于Kubernetes1.5及以上版本.
 * **不是所有Stateful应用都适合弹缩.** 在弹缩前您的应用前. 您必须充分了解您的应用, 不适当的弹缩StatefulSet或许会造成应用自身功能的不稳定.
 * 仅当您确定该Stateful应用的集群是完全健康才可执行弹缩操作.
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 使用 `kubectl` 弹缩StatefulSets
 
@@ -79,12 +80,13 @@ StatefulSet的扩容/缩容操作. 一些分布式数据库在节点加入和同
 这些情况下，最好是在应用级别进行弹缩操作, 并且只有在您确保Stateful应用的集群是完全健康时才执行弹缩.
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 了解更多 [deleting a StatefulSet](/docs/tasks/manage-stateful-set/deleting-a-statefulset/).
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/run-application/update-api-object-kubectl-patch.md b/content/zh/docs/tasks/run-application/update-api-object-kubectl-patch.md
index 23a94d1d08..68c99d6881 100644
--- a/content/zh/docs/tasks/run-application/update-api-object-kubectl-patch.md
+++ b/content/zh/docs/tasks/run-application/update-api-object-kubectl-patch.md
@@ -1,7 +1,7 @@
 ---
 title: 使用 kubectl patch 更新 API 对象
 description: 使用 kubectl patch 更新 Kubernetes API 对象。做一个策略性的合并 patch 或 JSON 合并 patch。
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 
@@ -9,12 +9,12 @@ weight: 40
 ---
 title: Update API Objects in Place Using kubectl patch
 description: Use kubectl patch to update Kubernetes API objects in place. Do a strategic merge patch or a JSON merge patch.
-content_template: templates/task
+content_type: task
 weight: 40
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This task shows how to use `kubectl patch` to update an API object in place. The exercises
@@ -23,16 +23,17 @@ in this task demonstrate a strategic merge patch and a JSON merge patch.
 
 这个任务展示了如何使用 `kubectl patch` 就地更新 API 对象。这个任务中的练习演示了一个策略性合并 patch 和一个 JSON 合并 patch。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Use a strategic merge patch to update a Deployment
@@ -505,10 +506,11 @@ and
 和
 [kubectl apply](/docs/reference/generated/kubectl/kubectl-commands/#apply)。
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * [Kubernetes Object Management](/docs/concepts/overview/object-management-kubectl/overview/)
@@ -522,6 +524,6 @@ and
 * [使用配置文件强制管理 Kubernetes 对象](/docs/concepts/overview/object-management-kubectl/imperative-config/)
 * [使用配置文件对 Kubernetes 对象进行声明式管理](/docs/concepts/overview/object-management-kubectl/declarative-config/)
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/service-catalog/install-service-catalog-using-helm.md b/content/zh/docs/tasks/service-catalog/install-service-catalog-using-helm.md
index 4f46b08078..37bc08ed3d 100644
--- a/content/zh/docs/tasks/service-catalog/install-service-catalog-using-helm.md
+++ b/content/zh/docs/tasks/service-catalog/install-service-catalog-using-helm.md
@@ -1,17 +1,17 @@
 ---
 title: 使用 Helm 安装 Service Catalog
-content_template: templates/task
+content_type: task
 ---
 <!--
 ---
 title: Install Service Catalog using Helm
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< glossary_definition term_id="service-catalog" length="all" prepend="Service Catalog is" >}}
 
 <!--
@@ -20,9 +20,10 @@ Use [Helm](https://helm.sh/) to install Service Catalog on your Kubernetes clust
 使用 [Helm](https://helm.sh/) 在 Kubernetes 集群上安装 Service Catalog。
 要获取有关此过程的最新信息，请浏览 [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog/blob/master/docs/install.md) 仓库。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 * Understand the key concepts of [Service Catalog](/docs/concepts/service-catalog/).
 * Service Catalog requires a Kubernetes cluster running version 1.7 or higher.
@@ -44,9 +45,9 @@ Use [Helm](https://helm.sh/) to install Service Catalog on your Kubernetes clust
     * 遵照 [Helm 安装说明](https://github.com/kubernetes/helm/blob/master/docs/install.md)。
     * 如果已经安装了适当版本的 Helm，请执行 `helm init` 来安装 Helm 的服务器端组件 Tiller。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Add the service-catalog Helm repository
 -->
@@ -152,9 +153,10 @@ helm install catalog svc-cat/catalog --namespace catalog
 helm install svc-cat/catalog --name catalog --namespace catalog
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * View [sample service brokers](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers).
 * Explore the [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) project.
@@ -162,4 +164,4 @@ helm install svc-cat/catalog --name catalog --namespace catalog
 * 查看[示例服务代理](https://github.com/openservicebrokerapi/servicebroker/blob/mastergettingStarted.md#sample-service-brokers)。
 * 探索 [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) 项目。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/service-catalog/install-service-catalog-using-sc.md b/content/zh/docs/tasks/service-catalog/install-service-catalog-using-sc.md
index 706d624898..dd179932c5 100644
--- a/content/zh/docs/tasks/service-catalog/install-service-catalog-using-sc.md
+++ b/content/zh/docs/tasks/service-catalog/install-service-catalog-using-sc.md
@@ -2,7 +2,7 @@
 title: 使用 SC 安装服务目录
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 ---
 
 <!--
@@ -10,11 +10,11 @@ content_template: templates/task
 title: Install Service Catalog using SC
 reviewers:
 - chenopis
-content_template: templates/task
+content_type: task
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 {{< glossary_definition term_id="service-catalog" length="all" prepend="Service Catalog is" >}}
 
 <!--
@@ -23,10 +23,11 @@ Use the [Service Catalog Installer](https://github.com/GoogleCloudPlatform/k8s-s
 使用[服务目录安装程序](https://github.com/GoogleCloudPlatform/k8s-service-catalog#installation)工具可以轻松地在 Kubernetes 集群上安装或卸载服务目录。
 这个 CLI 工具以 `sc` 命令形式被安装在您的本地环境中。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 * Understand the key concepts of [Service Catalog](/docs/concepts/service-catalog/).
 * Install [Go 1.6+](https://golang.org/dl/) and set the `GOPATH`.
@@ -46,10 +47,10 @@ Use the [Service Catalog Installer](https://github.com/GoogleCloudPlatform/k8s-s
 
         kubectl create clusterrolebinding cluster-admin-binding --clusterrole=cluster-admin --user=<user-name>
 
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 <!--
 ## Install `sc` in your local environment
 -->
@@ -115,9 +116,10 @@ If you would like to uninstall Service Catalog from your Kubernetes cluster usin
 sc uninstall
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 * View [sample service brokers](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers).
 * Explore the [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) project.
@@ -125,4 +127,4 @@ sc uninstall
 * 查看 [服务代理示例](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers)。
 * 探索 [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) 项目。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/tls/certificate-rotation.md b/content/zh/docs/tasks/tls/certificate-rotation.md
index 15da604e8b..398ffe23cf 100644
--- a/content/zh/docs/tasks/tls/certificate-rotation.md
+++ b/content/zh/docs/tasks/tls/certificate-rotation.md
@@ -3,22 +3,23 @@ approvers:
 - jcbsmpsn
 - mikedanese
 title: 证书轮换
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本文展示如何在 kubelet 中启用并配置证书轮换。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * 要求 Kubernetes 1.8.0 或更高的版本
 
 * Kubelet 证书轮换在 1.8.0 版本中处于 beta 阶段, 这意味着该特性可能在没有通知的情况下发生变化。
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## 概述
 
@@ -60,6 +61,6 @@ Kubelet 会从 Kubernetes API 取回签署的证书，并将其写入磁盘，
 会从 Kubernetes API 取回签署的证书，并将其写入磁盘。 然后它会更新与 Kubernetes API
 的连接，使用新的证书重新连接到 Kubernetes API。
 
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tasks/tls/managing-tls-in-a-cluster.md b/content/zh/docs/tasks/tls/managing-tls-in-a-cluster.md
index e82f1303ee..a5184367d1 100644
--- a/content/zh/docs/tasks/tls/managing-tls-in-a-cluster.md
+++ b/content/zh/docs/tasks/tls/managing-tls-in-a-cluster.md
@@ -1,6 +1,6 @@
 ---
 title: 管理集群中的 TLS 认证
-content_template: templates/task
+content_type: task
 reviewers:
 - mikedanese
 - beacham
@@ -9,7 +9,7 @@ reviewers:
 <!--
 ---
 title: Manage TLS Certificates in a Cluster
-content_template: templates/task
+content_type: task
 reviewers:
 - mikedanese
 - beacham
@@ -17,7 +17,7 @@ reviewers:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 
 Kubernetes provides a `certificates.k8s.io` API, which lets you provision TLS
@@ -48,16 +48,17 @@ CA 可以达到这个目的，但是您永远不要依赖它。不要以为
 这些证书将针对群根目录 CA 进行验证。
 {{< /note >}}
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Trusting TLS in a Cluster
@@ -408,4 +409,4 @@ your Certificate Authority's keypair.
 
 本教程假设将签名者设置为服务证书 API。Kubernetes controller manager 提供了一个签名者的默认实现。 要启用它，请将`--cluster-signing-cert-file` 和 `--cluster-signing-key-file` 参数传递给 controller manager，并配置具有证书颁发机构的密钥对的路径。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tasks/tools/install-kubectl.md b/content/zh/docs/tasks/tools/install-kubectl.md
index e8fff91758..9607f9f937 100644
--- a/content/zh/docs/tasks/tools/install-kubectl.md
+++ b/content/zh/docs/tasks/tools/install-kubectl.md
@@ -2,7 +2,7 @@
 reviewers:
 - mikedanese
 title: 安装并设置 kubectl
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 <!--
@@ -11,26 +11,27 @@ reviewers:
 - bgrant0607
 - mikedanese
 title: Install and Set Up kubectl
-content_template: templates/task
+content_type: task
 weight: 10
 ---
 -->
-{{% capture overview %}}
+<!-- overview -->
 <!--
  Use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/), to deploy and manage applications on Kubernetes. Using kubectl, you can inspect cluster resources; create, delete, and update components; look at your new cluster; and bring up example apps.
  -->
  在 Kubernetes 上使用 Kubernetes 命令行工具 [kubectl](/docs/user-guide/kubectl/) 部署和管理应用程序。使用 kubectl，您可以检查集群资源；创建、删除和更新组件；查看您的新集群；并启动实例应用程序。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 <!--
 You must use a kubectl version that is within one minor version difference of your cluster. For example, a v1.2 client should work with v1.1, v1.2, and v1.3 master. Using the latest version of kubectl helps avoid unforeseen issues.
 -->
 您必须使用与集群小版本号差别为一的 kubectl 版本。例如，1.2版本的客户端应该与1.1版本、1.2版本和1.3版本的主节点一起使用。使用最新版本的 kubectl 有助于避免无法预料的问题。
-{{% /capture %}}
 
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 ## Install kubectl
@@ -691,12 +692,13 @@ fi
 ```shell
 plugins=(kubectl)
 ```
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 <!--
 [Learn how to launch and expose your application.](/docs/tasks/access-application-cluster/service-access-application-cluster/)
 -->
 [了解如何启动并对外暴露您的应用程序](/docs/tasks/access-application-cluster/service-access-application-cluster/)
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tasks/tools/install-minikube.md b/content/zh/docs/tasks/tools/install-minikube.md
index db9657876d..6dba5fd3c6 100644
--- a/content/zh/docs/tasks/tools/install-minikube.md
+++ b/content/zh/docs/tasks/tools/install-minikube.md
@@ -1,6 +1,6 @@
 ---
 title: 安装 Minikube
-content_template: templates/task
+content_type: task
 weight: 20
 card:
   name: tasks
@@ -10,7 +10,7 @@ card:
 <!--
 ---
 title: Install Minikube
-content_template: templates/task
+content_type: task
 weight: 20
 card:
   name: tasks
@@ -18,7 +18,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows you how to install [Minikube](/docs/tutorials/hello-minikube), a tool that runs a single-node Kubernetes cluster in a virtual machine on your personal computer.
@@ -26,9 +26,10 @@ This page shows you how to install [Minikube](/docs/tutorials/hello-minikube), a
 
 本页面讲述如何安装 [Minikube](/docs/tutorials/hello-minikube)，该工具用于在您电脑中的虚拟机上运行一个单节点的 Kubernetes 集群。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< tabs name="minikube_before_you_begin" >}}
 {{% tab name="Linux" %}}
@@ -101,9 +102,9 @@ Hyper-V Requirements:     A hypervisor has been detected. Features required for
 {{% /tab %}}
 {{< /tabs >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 <!--
 # Installing minikube
@@ -380,9 +381,10 @@ To install Minikube manually on Windows, download [`minikube-windows-amd64`](htt
 {{< /tabs >}}
 
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 
 <!--
@@ -391,7 +393,7 @@ To install Minikube manually on Windows, download [`minikube-windows-amd64`](htt
 
 * [使用 Minikube 在本地运行 Kubernetes](/docs/setup/learning-environment/minikube/)
 
-{{% /capture %}}
+
 
 <!--
 ## Confirm Installation
diff --git a/content/zh/docs/tutorials/_index.md b/content/zh/docs/tutorials/_index.md
index ea43094cbf..97db0a8e7e 100644
--- a/content/zh/docs/tutorials/_index.md
+++ b/content/zh/docs/tutorials/_index.md
@@ -2,7 +2,7 @@
 title: 教程
 main_menu: true
 weight: 60
-content_template: templates/concept
+content_type: concept
 ---
 
 <!--
@@ -10,11 +10,11 @@ content_template: templates/concept
 title: Tutorials
 main_menu: true
 weight: 60
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 Kubernetes 文档的这一部分包含教程。一个教程展示了如何完成一个比单个[任务](/zh/docs/tasks/)更大的目标。
 通常一个教程有几个部分，每个部分都有一系列步骤。在浏览每个教程之前，
@@ -29,9 +29,9 @@ Before walking through each tutorial, you may want to bookmark the
 [Standardized Glossary](/docs/reference/glossary/) page for later references.
 -->
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 基础知识
 
@@ -173,9 +173,10 @@ Before walking through each tutorial, you may want to bookmark the
 * [Using Source IP](/docs/tutorials/services/source-ip/)
 -->
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 如果您想编写教程，请参阅[使用页面模板](/zh/docs/home/contribute/page-templates/)
 以获取有关教程页面类型和教程模板的信息。
@@ -185,5 +186,5 @@ If you would like to write a tutorial, see
 for information about the tutorial page type and the tutorial template.
 -->
 
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tutorials/clusters/apparmor.md b/content/zh/docs/tutorials/clusters/apparmor.md
index 655eec5db1..5dcee5fac7 100644
--- a/content/zh/docs/tutorials/clusters/apparmor.md
+++ b/content/zh/docs/tutorials/clusters/apparmor.md
@@ -1,15 +1,15 @@
 ---
 title: AppArmor
-content_template: templates/tutorial
+content_type: tutorial
 ---
 <!-- ---
 reviewers:
 - stclair
 title: AppArmor
-content_template: templates/tutorial
+content_type: tutorial
 --- -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 {{< feature-state for_k8s_version="v1.4" state="beta" >}}
 
@@ -24,9 +24,10 @@ violations. -->
 Apparmor 是一个 Linux 内核安全模块，它补充了标准的基于 Linux 用户和组的安全模块将程序限制为有限资源集的权限。AppArmor 可以配置为任何应用程序减少潜在的攻击面，并且提供更加深入的防御。AppArmor 是通过配置文件进行配置的，这些配置文件被调整为报名单，列出了特定程序或者容器所需要的访问权限，如 Linux 功能、网络访问、文件权限等。每个配置文件都可以在*强制*模式(阻止访问不允许的资源)或*投诉*模式(仅报告冲突)下运行。
 
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!-- * See an example of how to load a profile on a node
 * Learn how to enforce the profile on a Pod
@@ -39,9 +40,10 @@ Apparmor 是一个 Linux 内核安全模块，它补充了标准的基于 Linux
 * 查看违反配置文件时会发生什么情况
 * 查看无法加载配置文件时会发生什么情况
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!-- Make sure: -->
 务必：
@@ -175,9 +177,9 @@ gke-test-default-pool-239f5d02-x1kf: kubelet is posting ready status. AppArmor e
 gke-test-default-pool-239f5d02-xwux: kubelet is posting ready status. AppArmor enabled
 ```
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!-- ## Securing a Pod -->
 ## 保护 Pod
@@ -586,9 +588,10 @@ logs or through `journalctl`. More information is provided in
 * **value**: 配置文件引用的逗号分隔列表(如上所述)
   - 尽管转义逗号是配置文件名中的合法字符，但此处不能显式允许。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!-- Additional resources: -->
 其他资源
@@ -598,4 +601,4 @@ logs or through `journalctl`. More information is provided in
 * [Apparmor 配置文件语言快速指南](https://gitlab.com/apparmor/apparmor/wikis/QuickProfileLanguage)
 * [Apparmor 核心策略参考](https://gitlab.com/apparmor/apparmor/wikis/Policy_Layout)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/configuration/configure-redis-using-configmap.md b/content/zh/docs/tutorials/configuration/configure-redis-using-configmap.md
index 8cc92c076e..d43ee91103 100644
--- a/content/zh/docs/tutorials/configuration/configure-redis-using-configmap.md
+++ b/content/zh/docs/tutorials/configuration/configure-redis-using-configmap.md
@@ -3,19 +3,20 @@ reviewers:
 - eparis
 - pmorie
 title: 使用 ConfigMap 来配置 Redis
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page provides a real world example of how to configure Redis using a ConfigMap and builds upon the [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/) task.
 -->
 这篇文档基于[使用 ConfigMap 来配置 Containers](/zh/docs/tasks/configure-pod-container/configure-pod-configmap/) 这个任务，提供了一个使用 ConfigMap 来配置 Redis 的真实案例。
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * * Create a `kustomization.yaml` file containing:
@@ -33,9 +34,10 @@ This page provides a real world example of how to configure Redis using a Config
 
 
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 <!--
@@ -45,9 +47,9 @@ This page provides a real world example of how to configure Redis using a Config
 * 此页面上显示的示例适用于 `kubectl` 1.14和在其以上的版本。
 * 理解[使用ConfigMap来配置Containers](/zh/docs/tasks/configure-pod-container/configure-pod-configmap/)。
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 
 <!--
@@ -151,9 +153,10 @@ Delete the created pod:
 kubectl delete pod redis
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/).
@@ -161,4 +164,4 @@ kubectl delete pod redis
 * 了解有关 [ConfigMaps](/zh/docs/tasks/configure-pod-container/configure-pod-configmap/)的更多信息。
 
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/hello-minikube.md b/content/zh/docs/tutorials/hello-minikube.md
index 340ddfcd9e..b889324fc5 100644
--- a/content/zh/docs/tutorials/hello-minikube.md
+++ b/content/zh/docs/tutorials/hello-minikube.md
@@ -1,6 +1,6 @@
 ---
 title: 你好 Minikube
-content_template: templates/tutorial
+content_type: tutorial
 weight: 5
 menu:
   main:
@@ -15,7 +15,7 @@ card:
 <!--
 ---
 title: Hello Minikube
-content_template: templates/tutorial
+content_type: tutorial
 weight: 5
 menu:
   main:
@@ -29,7 +29,7 @@ card:
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This tutorial shows you how to run a simple Hello World Node.js app
@@ -46,9 +46,10 @@ You can also follow this tutorial if you've installed [Minikube locally](/docs/t
 
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * Deploy a hello world application to Minikube.
@@ -59,9 +60,10 @@ You can also follow this tutorial if you've installed [Minikube locally](/docs/t
 * 运行应用程序。
 * 查看应用日志
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 This tutorial provides a container image built from the following files:
@@ -77,9 +79,9 @@ For more information on the `docker build` command, read the [Docker documentati
 -->
 有关 `docker build` 命令的更多信息，请参阅 [Docker 文档](https://docs.docker.com/engine/reference/commandline/build/)。
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Create a Minikube cluster
@@ -442,9 +444,10 @@ Optionally, delete the Minikube VM:
 minikube delete
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Deployment objects](/docs/concepts/workloads/controllers/deployment/).
@@ -455,4 +458,4 @@ minikube delete
 * 学习更多关于 [部署应用](/zh/docs/tasks/run-application/run-stateless-application-deployment/)。
 * 学习更多关于 [Service 对象](/zh/docs/concepts/services-networking/service/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/online-training/overview.md b/content/zh/docs/tutorials/online-training/overview.md
index 1b254ae49e..055bd6d1c3 100644
--- a/content/zh/docs/tutorials/online-training/overview.md
+++ b/content/zh/docs/tutorials/online-training/overview.md
@@ -1,24 +1,24 @@
 ---
 title: Kubernetes 在线培训概述
-content_template: templates/concept
+content_type: concept
 ---
 <!--
 ---
 title: Overview of Kubernetes Online Training
-content_template: templates/concept
+content_type: concept
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Here are some of the sites that offer online training for Kubernetes:
 -->
 以下是提供 Kubernetes 在线培训的一些网站:
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 * [AIOps Essentials (Autoscaling Kubernetes with Prometheus Metrics) with Hands-On Labs (Linux Academy)](https://linuxacademy.com/devops/training/course/name/using-machine-learning-to-scale-kubernetes-clusters)
@@ -166,5 +166,5 @@ Here are some of the sites that offer online training for Kubernetes:
 -->
 * [自定进度的 Kubernetes 在线课程 (Learnk8s 学院)]
 (https://learnk8s.io/academy)
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tutorials/services/source-ip.md b/content/zh/docs/tutorials/services/source-ip.md
index 098f5d760f..d44eb358a0 100644
--- a/content/zh/docs/tutorials/services/source-ip.md
+++ b/content/zh/docs/tutorials/services/source-ip.md
@@ -1,17 +1,18 @@
 ---
 
 title: 使用 Source IP
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 
 Kubernetes 集群中运行的应用通过 Service 抽象来互相查找、通信和与外部世界沟通。本文介绍被发送到不同类型 Services 的数据包源 IP 的变化过程，你可以根据你的需求改变这些行为。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -41,19 +42,20 @@ kubectl run source-ip-app --image=k8s.gcr.io/echoserver:1.4
 deployment.apps/source-ip-app created
 ```
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 
 * 通过多种类型的 Services 暴露一个简单应用
 * 理解每种 Service 类型如何处理源 IP NAT
 * 理解保留源IP所涉及的折中
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 
 ## Type=ClusterIP 类型 Services 的 Source IP
@@ -368,9 +370,10 @@ __跨平台支持__
 第一类负载均衡器必须使用一种它和后端之间约定的协议来和真实的客户端 IP 通信，例如 HTTP [X-FORWARDED-FOR](https://en.wikipedia.org/wiki/X-Forwarded-For) 头，或者 [proxy 协议](http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt)。
 第二类负载均衡器可以通过简单的在保存于 Service 的 `service.spec.healthCheckNodePort` 字段上创建一个 HTTP 健康检查点来使用上面描述的特性。
 
-{{% /capture %}}
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 
 删除服务：
@@ -386,10 +389,11 @@ $ kubectl delete svc -l run=source-ip-app
 $ kubectl delete deployment source-ip-app
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 * 学习更多关于 [通过 services 连接应用](/zh/docs/concepts/services-networking/connect-applications-service/)
 * 学习更多关于 [负载均衡](/zh/docs/user-guide/load-balancer)
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/stateful-application/basic-stateful-set.md b/content/zh/docs/tutorials/stateful-application/basic-stateful-set.md
index e48f5f2528..868c13def6 100644
--- a/content/zh/docs/tutorials/stateful-application/basic-stateful-set.md
+++ b/content/zh/docs/tutorials/stateful-application/basic-stateful-set.md
@@ -1,6 +1,6 @@
 ---
 title: StatefulSet 基础
-content_template: templates/tutorial
+content_type: tutorial
 approvers:
 - enisoc
 - erictune
@@ -11,7 +11,7 @@ approvers:
 
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This tutorial provides an introduction to managing applications with
@@ -21,9 +21,10 @@ demonstrates how to create, delete, scale, and update the Pods of StatefulSets.
 
 本教程介绍如何了使用 [StatefulSets](/zh/docs/concepts/abstractions/controllers/statefulsets/) 来管理应用。演示了如何创建、删除、扩容/缩容和更新 StatefulSets 的 Pods。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
 Before you begin this tutorial, you should familiarize yourself with the
@@ -49,9 +50,10 @@ tutorial.
 
 本教程假设你的集群被配置为动态的提供 PersistentVolumes。如果没有这样配置，在开始本教程之前，你需要手动准备 2 个 1 GiB 的存储卷。
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 StatefulSets are intended to be used with stateful applications and distributed
@@ -79,10 +81,10 @@ StatefulSets 旨在与有状态的应用及分布式系统一起使用。然而
 * 如何对 StatefulSet 进行扩容/缩容
 * 如何更新一个 StatefulSet 的 Pods
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 ## 创建 StatefulSet
 
@@ -1516,9 +1518,10 @@ StatefulSet 控制器将并发的删除所有 Pod，在删除一个 Pod 前不
 kubectl delete svc nginx
 ```
 
-{{% /capture %}}
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 <!--
 You will need to delete the persistent storage media for the PersistentVolumes
@@ -1528,6 +1531,6 @@ reclaimed.
 -->
 
 你需要删除本教程中用到的 PersistentVolumes 的持久化存储介质。基于你的环境、存储配置和提供方式，按照必须的步骤保证回收所有的存储。
-{{% /capture %}}
+
 
 
diff --git a/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md b/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md
index d05f07d135..e5e53815d9 100644
--- a/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md
+++ b/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md
@@ -2,7 +2,7 @@
 title: 示例：使用 Persistent Volumes 部署 WordPress 和 MySQL
 reviewers:
 - ahmetb
-content_template: templates/tutorial
+content_type: tutorial
 weight: 20
 card:
   name: tutorials
@@ -10,7 +10,7 @@ card:
   title: "Stateful 示例: Wordpress with Persistent Volumes"
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This tutorial shows you how to deploy a WordPress site and a MySQL database using Minikube. Both applications use PersistentVolumes and PersistentVolumeClaims to store data.
@@ -43,9 +43,10 @@ deployment 在生产场景中并不适合，它使用单实例 WordPress 和 MyS
 本教程中提供的文件使用 GA Deployment API，并且特定于 kubernetes 1.9 或更高版本。如果您希望将本教程与 Kubernetes 的早期版本一起使用，请相应地更新 API 版本，或参考本教程的早期版本。
 {{< /note >}}
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 <!--
 * Create PersistentVolumeClaims and PersistentVolumes
 * Create a `kustomization.yaml` with
@@ -64,9 +65,10 @@ deployment 在生产场景中并不适合，它使用单实例 WordPress 和 MyS
 * 应用整个 kustomization 目录 `kubectl apply -k ./`
 * 清理
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
@@ -88,9 +90,9 @@ Download the following configuration files:
 
 2. [wordpress-deployment.yaml](/examples/application/wordpress/wordpress-deployment.yaml)
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Create PersistentVolumeClaims and PersistentVolumes
@@ -424,7 +426,7 @@ kubectl apply -k ./
 
       ![wordpress-init](https://raw.githubusercontent.com/kubernetes/examples/master/mysql-wordpress-pd/WordPress.png)
 
-{{% /capture %}}
+
 
 {{< warning >}}
 <!--
@@ -434,7 +436,8 @@ Do not leave your WordPress installation on this page. If another user finds it,
 
 {{< /warning >}}
 
-{{% capture cleanup %}}
+## {{% heading "cleanup" %}}
+
 <!--
 1. Run the following command to delete your Secret, Deployments, Services and PersistentVolumeClaims:
 
@@ -449,9 +452,10 @@ Do not leave your WordPress installation on this page. If another user finds it,
       kubectl delete -k ./
       ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Learn more about [Introspection and Debugging](/docs/tasks/debug-application-cluster/debug-application-introspection/)
@@ -465,4 +469,4 @@ Do not leave your WordPress installation on this page. If another user finds it,
 * 了解更多关于 [Port Forwarding](/zh/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)
 * 了解如何 [Get a Shell to a Container](/zh/docs/tasks/debug-application-cluster/get-shell-running-container/)
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/stateful-application/zookeeper.md b/content/zh/docs/tutorials/stateful-application/zookeeper.md
index 2c5189ac4a..25218ecd84 100644
--- a/content/zh/docs/tutorials/stateful-application/zookeeper.md
+++ b/content/zh/docs/tutorials/stateful-application/zookeeper.md
@@ -9,15 +9,16 @@ approvers:
 - smarterclayton
 
 title: 运行 ZooKeeper， 一个 CP 分布式系统
-content_template: templates/tutorial
+content_type: tutorial
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 本教程展示了在 Kubernetes 上使用 [PodDisruptionBudgets](/zh/docs/admin/disruptions/#specifying-a-poddisruptionbudget) 和 [PodAntiAffinity](/zh/docs/user-guide/node-selection/#inter-pod-affinity-and-anti-affinity-beta-feature) 特性运行 [Apache Zookeeper](https://zookeeper.apache.org)。
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 在开始本教程前，你应该熟悉以下 Kubernetes 概念。
 
@@ -38,9 +39,10 @@ content_template: templates/tutorial
 
 
 本教程假设你的集群配置为动态的提供 PersistentVolumes。如果你的集群没有配置成这样，在开始本教程前，你需要手动准备三个 20 GiB 的卷。
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 在学习本教程后，你将熟悉下列内容。
 
@@ -48,9 +50,9 @@ content_template: templates/tutorial
 * 如何使用 ConfigMaps 一致性配置 ensemble。
 * 如何在 ensemble 中 分布 ZooKeeper 服务的部署。
 * 如何在计划维护中使用 PodDisruptionBudgets 确保服务可用性。
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 
 ### ZooKeeper 基础
@@ -1167,11 +1169,12 @@ node "kubernetes-minion-group-ixsl" uncordoned
 
 你可以同时使用 `kubectl drain` 和 PodDisruptionBudgets 来保证你的服务在维护过程中仍然可用。如果使用 drain 来隔离节点并在此之前删除 pods 使节点进入离线维护状态，如果服务表达了 disruption budget，这个 budget 将被遵守。你应该总是为关键服务分配额外容量，这样它们的 Pods 就能够迅速的重新调度。
 
-{{% /capture %}}
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 * 使用 `kubectl uncordon` 解除你集群中所有节点的隔离。
 * 你需要删除在本教程中使用的 PersistentVolumes 的持久存储媒介。请遵循必须的步骤，基于你的环境、存储配置和准备方法，保证回收所有的存储。
-{{% /capture %}}
+
 
diff --git a/content/zh/docs/tutorials/stateless-application/expose-external-ip-address.md b/content/zh/docs/tutorials/stateless-application/expose-external-ip-address.md
index b5f9eccfb0..4a4d7779e2 100644
--- a/content/zh/docs/tutorials/stateless-application/expose-external-ip-address.md
+++ b/content/zh/docs/tutorials/stateless-application/expose-external-ip-address.md
@@ -1,18 +1,18 @@
 ---
 title: 公开外部 IP 地址以访问集群中应用程序
-content_template: templates/tutorial
+content_type: tutorial
 weight: 10
 ---
 
 <!--
 ---
 title: Exposing an External IP Address to Access an Application in a Cluster
-content_template: templates/tutorial
+content_type: tutorial
 weight: 10
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This page shows how to create a Kubernetes Service object that exposes an
@@ -20,10 +20,11 @@ external IP address.
 -->
 此页面显示如何创建公开外部 IP 地址的 Kubernetes 服务对象。
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 <!--
  * Install [kubectl](/docs/tasks/tools/install-kubectl/).
@@ -44,10 +45,11 @@ external IP address.
 
  * 配置 `kubectl` 与 Kubernetes API 服务器通信。有关说明，请参阅云供应商文档。
 
-{{% /capture %}}
 
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * Run five instances of a Hello World application.
@@ -59,10 +61,10 @@ external IP address.
 * 创建一个公开外部 IP 地址的 Service 对象。
 * 使用 Service 对象访问正在运行的应用程序。
 
-{{% /capture %}}
 
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Creating a service for an application running in five pods
@@ -238,10 +240,11 @@ If the external IP address is shown as \<pending\>, wait for a minute and enter
 
         Hello Kubernetes!
 
-{{% /capture %}}
 
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 <!--
 To delete the Service, enter this command:
@@ -258,10 +261,11 @@ the Hello World application, enter this command:
 
         kubectl delete deployment hello-world
 
-{{% /capture %}}
 
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 Learn more about
@@ -270,4 +274,4 @@ Learn more about
 
 了解更多关于[将应用程序与服务连接](/zh/docs/concepts/services-networking/connect-applications-service/)。
 
-{{% /capture %}}
+
diff --git a/content/zh/docs/tutorials/stateless-application/guestbook.md b/content/zh/docs/tutorials/stateless-application/guestbook.md
index 8eea7b7922..062f9957c9 100644
--- a/content/zh/docs/tutorials/stateless-application/guestbook.md
+++ b/content/zh/docs/tutorials/stateless-application/guestbook.md
@@ -2,7 +2,7 @@
 title: "示例：使用 Redis 部署 PHP 留言板应用程序"
 reviewers:
 - ahmetb
-content_template: templates/tutorial
+content_type: tutorial
 weight: 20
 ---
 
@@ -11,12 +11,12 @@ weight: 20
 title: "Example: Deploying PHP Guestbook application with Redis"
 reviewers:
 - ahmetb
-content_template: templates/tutorial
+content_type: tutorial
 weight: 20
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 This tutorial shows you how to build and deploy a simple, multi-tier web application using Kubernetes and [Docker](https://www.docker.com/). This example consists of the following components:
@@ -35,9 +35,10 @@ This tutorial shows you how to build and deploy a simple, multi-tier web applica
 * 多个 web 前端实例
 
 
-{{% /capture %}}
 
-{{% capture objectives %}}
+
+## {{% heading "objectives" %}}
+
 
 <!--
 * Start up a Redis master.
@@ -53,17 +54,18 @@ This tutorial shows you how to build and deploy a simple, multi-tier web applica
 * 公开并查看前端服务。
 * 清理。
 
-{{% /capture %}}
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}}
 
 {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture lessoncontent %}}
+
+<!-- lessoncontent -->
 
 <!--
 ## Start up the Redis Master
@@ -549,9 +551,10 @@ Scaling up or down is easy because your servers are defined as a Service that us
       redis-slave-2005841000-phfv9    1/1       Running   0          1h
       ```
 
-{{% /capture %}}
 
-{{% capture cleanup %}}
+
+## {{% heading "cleanup" %}}
+
 
 <!--
 Deleting the Deployments and Services also deletes any running Pods. Use labels to delete multiple resources with one command.
@@ -602,9 +605,10 @@ Deleting the Deployments and Services also deletes any running Pods. Use labels
       No resources found.
       ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Complete the [Kubernetes Basics](/docs/tutorials/kubernetes-basics/) Interactive Tutorials
@@ -618,5 +622,5 @@ Deleting the Deployments and Services also deletes any running Pods. Use labels
 * 阅读更多关于[连接应用程序](/zh/docs/concepts/services-networking/connect-applications-service/)
 * 阅读更多关于[管理资源](/zh/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively)
 
-{{% /capture %}}
+