Merge pull request #21359 from kbhawkey/kb-migrate-capture-stmts

removing capture statements
2020-06-10 02:30:09 -07:00
parent d46c7d50d7 87f68710ff
commit 15f44cc421
1308 changed files with 10883 additions and 9712 deletions
@@ -23,12 +23,16 @@ disableLanguages = ["hi", "no"]
 [markup]
 [markup.goldmark]
   [markup.goldmark.extensions]
     definitionList = true
     table = true
     typographer = false
   [markup.goldmark.parser]
     attribute = true
     autoHeadingID = true
     autoHeadingIDType = "blackfriday"
   [markup.goldmark.renderer]
     unsafe = true
   [markup.goldmark.extensions]
      definitionList = true
      table = true
      typographer = false
  [markup.highlight]
    codeFences = true
    guessSyntax = false
@@ -39,6 +43,10 @@ disableLanguages = ["hi", "no"]
    noClasses = true
    style = "emacs"
    tabWidth = 4
  [markup.tableOfContents]
    endLevel = 2
    ordered = false
    startLevel = 2
 [frontmatter]
 date = ["date", ":filename", "publishDate", "lastmod"]
@@ -1,17 +1,17 @@
 ---
 title: Konzepte
 main_menu: true
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
-{{% capture overview %}}
+<!-- overview -->
 Im Abschnitt Konzepte erfahren Sie mehr über die Bestandteile des Kubernetes-Systems und die Abstraktionen, die Kubernetes zur Verwaltung Ihres Clusters zur Verfügung stellt. Sie erhalten zudem ein tieferes Verständnis der Funktionsweise von Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Überblick
@@ -65,11 +65,12 @@ Die Nodes in einem Cluster sind die Maschinen (VMs, physische Server usw.), auf
 * [Anmerkungen](/docs/concepts/overview/working-with-objects/annotations/)
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Wenn Sie eine Konzeptseite schreiben möchten, lesen Sie [Seitenvorlagen verwenden](/docs/home/contribute/page-templates/)
 für Informationen zum Konzeptseitentyp und zur Dokumentations Vorlage.
-{{% /capture %}}
+
@@ -1,10 +1,10 @@
 ---
 title: Zugrunde liegende Konzepte des Cloud Controller Manager
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 Das Konzept des Cloud Controller Managers (CCM) (nicht zu verwechseln mit der Binärdatei) wurde ursprünglich entwickelt, um Cloud-spezifischen Anbieter Code und den Kubernetes Kern unabhängig voneinander entwickeln zu können. Der Cloud Controller Manager läuft zusammen mit anderen Master Komponenten wie dem Kubernetes Controller Manager, dem API-Server und dem Scheduler auf dem Host. Es kann auch als Kubernetes Addon gestartet werden, in diesem Fall läuft er auf Kubernetes.
 Das Design des Cloud Controller Managers basiert auf einem Plugin Mechanismus, der es neuen Cloud Anbietern ermöglicht, sich mit Kubernetes einfach über Plugins zu integrieren. Es gibt Pläne für die Einbindung neuer Cloud Anbieter auf Kubernetes und für die Migration von Cloud Anbietern vom alten Modell auf das neue CCM-Modell.
@@ -15,10 +15,10 @@ Die Architektur eines Kubernetes Clusters ohne den Cloud Controller Manager sieh
 ![Pre CCM Kube Arch](/images/docs/pre-ccm-arch.png)
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Design
@@ -235,4 +235,4 @@ Die folgenden Cloud Anbieter haben CCMs implementiert:
 Eine vollständige Anleitung zur Konfiguration und zum Betrieb des CCM findest du [hier](/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager).
-{{% /capture %}}
+
@@ -1,18 +1,18 @@
 ---
 title: Master-Node Kommunikation
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 Dieses Dokument katalogisiert die Kommunikationspfade zwischen dem Master (eigentlich dem Apiserver) und des Kubernetes-Clusters.
 Die Absicht besteht darin, Benutzern die Möglichkeit zu geben, ihre Installation so anzupassen, dass die Netzwerkkonfiguration so abgesichert wird, dass der Cluster in einem nicht vertrauenswürdigen Netzwerk (oder mit vollständig öffentlichen IP-Adressen eines Cloud-Providers) ausgeführt werden kann.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Cluster zum Master
@@ -69,4 +69,4 @@ Dieser Tunnel stellt sicher, dass der Datenverkehr nicht außerhalb des Netzwerk
 SSH-Tunnel werden zur Zeit nicht unterstützt. Sie sollten also nicht verwendet werden, sei denn, man weiß, was man tut. Ein Ersatz für diesen Kommunikationskanal wird entwickelt.
-{{% /capture %}}
+
@@ -1,10 +1,10 @@
 ---
 title: Nodes
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Ein Knoten (Node in Englisch) ist eine Arbeitsmaschine in Kubernetes, früher als `minion` bekannt. Ein Node
 kann je nach Cluster eine VM oder eine physische Maschine sein. Jeder Node enthält
@@ -13,10 +13,10 @@ und wird von den Master-Komponenten verwaltet.
 Die Dienste auf einem Node umfassen die [Container Runtime](/docs/concepts/overview/components/#node-components), das Kubelet und den Kube-Proxy.
 Weitere Informationen finden Sie im Abschnitt Kubernetes Node in der Architekturdesign-Dokumentation.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Node Status
@@ -244,4 +244,4 @@ Wenn Sie Ressourcen explizit für Nicht-Pod-Prozesse reservieren möchten, folge
 Node ist eine Top-Level-Ressource in der Kubernetes-REST-API. Weitere Details zum API-Objekt finden Sie unter:
 [Node API object](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#node-v1-core).
-{{% /capture %}}
+
@@ -1,9 +1,9 @@
 ---
 title: Addons Installieren
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Add-Ons erweitern die Funktionalität von Kubernetes.
@@ -12,10 +12,10 @@ Diese Seite gibt eine Übersicht über einige verfügbare Add-Ons und verweist a
 Die Add-Ons in den einzelnen Kategorien sind alphabetisch sortiert - Die Reihenfolge impliziert keine bevorzugung einzelner Projekte.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Networking und Network Policy
@@ -53,4 +53,4 @@ Es gibt einige weitere Add-Ons die in dem abgekündigten [cluster/addons](https:
 Add-Ons die ordentlich gewartet werden dürfen gerne hier aufgezählt werden. Wir freuen uns auf PRs!
-{{% /capture %}}
+
@@ -1,15 +1,15 @@
 ---
 title: Controller Manager Metriken
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
-{{% capture overview %}}
+<!-- overview -->
 Controller Manager Metriken liefern wichtige Erkenntnisse über die Leistung und den Zustand von den Controller Managern.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Was sind Controller Manager Metriken
 Die Kennzahlen des Controller Managers liefert wichtige Erkenntnisse über die Leistung und den Zustand des Controller Managers.
@@ -38,4 +38,3 @@ Die Metriken werden im [Prometheus Format](https://prometheus.io/docs/instrument
 In einer Produktionsumgebung können Sie Prometheus oder einen anderen Metrik Scraper konfigurieren, um diese Metriken regelmäßig zu sammeln und in einer Art Zeitreihen Datenbank verfügbar zu machen.
 {{% /capture %}}
@@ -1,14 +1,14 @@
 ---
 title: Proxies in Kubernetes
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
-{{% capture overview %}}
+<!-- overview -->
 Auf dieser Seite werden die im Kubernetes verwendeten Proxies erläutert.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Proxies
@@ -61,4 +61,3 @@ Kubernetes Benutzer müssen sich in der Regel um nichts anderes als die ersten b
 Proxies haben die Möglichkeit der Umleitung (redirect) ersetzt. Umleitungen sind veraltet.
 {{% /capture %}}
@@ -1,18 +1,18 @@
 ---
 title: Images
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Sie erstellen ihr Docker Image und laden es in eine Registry hoch, bevor es in einem Kubernetes Pod referenziert werden kann.
 Die `image` Eigenschaft eines Containers unterstüzt die gleiche Syntax wie die des `docker` Kommandos, inklusive privater Registries und Tags.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Aktualisieren von Images
@@ -334,7 +334,7 @@ Es gibt eine Anzahl an Lösungen um eigene Registries zu konfigurieren, hier sin
   - Generieren die Registry - Zugriffsdaten für jeden Mandanten, abgelegt in einem Secret das in jedem Mandanten - Namespace vorhanden ist.
   - Der Mandant fügt dieses Sercret zu den imagePullSecrets in jedem seiner Namespace hinzu.
-{{% /capture %}}
+
 Falls die Zugriff auf mehrere Registries benötigen, können sie ein Secret für jede Registry erstellen, Kubelet wird jedwede `imagePullSecrets` in einer einzelnen `.docker/config.json` zusammenfassen.
@@ -1,10 +1,10 @@
 ---
 title: Konzept Dokumentations-Vorlage
-content_template: templates/concept
+content_type: concept
 toc_hide: true
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< note >}}
 Stellen Sie auch sicher [einen Eintrag im Inhaltsverzeichnis](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) für Ihr neues Dokument zu erstellen.
@@ -12,9 +12,9 @@ Stellen Sie auch sicher [einen Eintrag im Inhaltsverzeichnis](/docs/home/contrib
 Diese Seite erklärt ...
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Verstehen ...
@@ -24,15 +24,16 @@ Kubernetes bietet ...
 Benutzen Sie ...
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 **[Optionaler Bereich]**
 * Lernen Sie mehr über [ein neues Thema schreiben](/docs/home/contribute/write-new-topic/).
 * Besuchen Sie [Seitenvorlagen verwenden - Konzeptvorlage](/docs/home/contribute/page-templates/#concept_template) wie Sie diese Vorlage verwenden.
-{{% /capture %}}
+
@@ -1,17 +1,17 @@
 ---
 title: Kubernetes Komponenten
-content_template: templates/concept
+content_type: concept
 weight: 20
 card:
  name: concepts
  weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 In diesem Dokument werden die verschiedenen binären Komponenten beschrieben, die zur Bereitstellung eines funktionsfähigen Kubernetes-Clusters erforderlich sind.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Master-Komponenten
 Master-Komponenten stellen die Steuerungsebene des Clusters bereit. Master-Komponenten treffen globale Entscheidungen über den Cluster (z. B. Zeitplanung) und das Erkennen und Reagieren auf Clusterereignisse (Starten eines neuen Pods, wenn das `replicas`-Feld eines Replikationscontrollers nicht zufriedenstellend ist).
@@ -107,6 +107,6 @@ Von Kubernetes gestartete Container schließen diesen DNS-Server automatisch in
 Ein [Cluster-level logging](/docs/concepts/cluster-administration/logging/) Mechanismus ist für das Speichern von Containerprotokollen in einem zentralen Protokollspeicher mit Such- / Browsing-Schnittstelle verantwortlich.
-{{% /capture %}}
+
@@ -1,17 +1,17 @@
 ---
 title: Was ist Kubernetes?
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
  name: concepts
  weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Diese Seite ist eine Übersicht über Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 Kubernetes ist eine portable, erweiterbare Open-Source-Plattform zur Verwaltung von
 containerisierten Arbeitslasten und Services, die sowohl die deklarative Konfiguration als auch die Automatisierung erleichtert.
@@ -160,11 +160,12 @@ Der Name **Kubernetes** stammt aus dem Griechischen, bedeutet *Steuermann* oder
 [cybernetic](http://www.etymonline.com/index.php?term=cybernetics). *K8s*
 ist eine Abkürzung, die durch Ersetzen der 8 Buchstaben "ubernete" mit "8" abgeleitet wird.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 *   [Bereit loszulegen](/docs/setup/)?
 *   Weitere Einzelheiten finden Sie in der [Kubernetes Dokumentation](/docs/home/).
-{{% /capture %}}
+
@@ -1,12 +1,12 @@
 ---
-content_template: templates/concept
+content_type: concept
 title: Zur Kubernets-Dokumentation beitragen
 linktitle: Mitmachen
 main_menu: true
 weight: 80
 ---
-{{% capture overview %}}
+<!-- overview -->
 Wenn Sie an der Dokumentation oder der Website von Kubernetes mitwirken möchten, freuen wir uns über Ihre Hilfe!
 Jeder kann seinen Beitrag leisten, unabhängig davon ob Sie neu im Projekt sind oder schon lange dabei sind, und ob Sie sich als
@@ -15,7 +15,7 @@ Entwickler, Endbenutzer oder einfach jemanden, der es einfach nicht aushält, Ti
 Weitere Möglichkeiten, sich in der Kubernetes-Community zu engagieren oder mehr über uns zu erfahren, finden Sie auf der [Kubernetes-Community-Seite](/community/).
 Informationen zum Handbuch zur Dokumentation von Kubernetes finden Sie im [Gestaltungshandbuch](/docs/contribute/style/style-guide/).
-{{% capture body %}}
+<!-- body -->
 ## Arten von Mitwirkenden
@@ -59,4 +59,4 @@ Dies ist keine vollständige Liste von Möglichkeiten, wie Sie zur Kubernetes-Do
  - Verbesserungsvorschläge für Dokumentprüfungen vorschlagen
  - Vorschläge für Verbesserungen der Kubernetes-Website oder anderer Tools
-{{% /capture %}}
+
@@ -1,6 +1,6 @@
 ---
 title: Lokalisierung der Kubernetes Dokumentation
-content_template: templates/concept
+content_type: concept
 weight: 50
 card:
  name: mitarbeiten
@@ -8,13 +8,13 @@ card:
  title: Übersetzen der Dokumentation
 ---
-{{% capture overview %}}
+<!-- overview -->
 Diese Seite zeigt dir wie die Dokumentation für verschiedene Sprachen [lokalisiert](https://blog.mozilla.org/l10n/2011/12/14/i18n-vs-l10n-whats-the-diff/) wird.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Erste Schritte
@@ -277,13 +277,14 @@ SIG Docs begrüßt Upstream Beiträge, also auf das englische Original, und Korr
 Du kannst auch dazu beitragen, Inhalte zu einer bestehenden Lokalisierung hinzuzufügen oder zu verbessern. Trete dem [Slack-Kanal](https://kubernetes.slack.com/messages/C1J0BPD2M/) für die Lokalisierung bei und beginne mit der Eröffnung von PRs, um zu helfen. Bitte beschränke deine Pull-Anfragen auf eine einzige Lokalisierung, da Pull-Anfragen, die Inhalte in mehreren Lokalisierungen ändern, schwer zu überprüfen sein könnten.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Sobald eine Lokalisierung die Anforderungen an den Arbeitsablauf und die Mindestausgabe erfüllt, wird SIG docs:
 - Die Sprachauswahl auf der Website aktivieren
 - Die Verfügbarkeit der Lokalisierung über die Kanäle der [Cloud Native Computing Foundation](https://www.cncf.io/about/) (CNCF), einschließlich des [Kubernetes Blogs](https://kubernetes.io/blog/) veröffentlichen.
-{{% /capture %}}
+
@@ -1,20 +1,20 @@
 ---
 title: Unterstützte Versionen der Kubernetes-Dokumentation
-content_template: templates/concept
+content_type: concept
 card:
  name: about
  weight: 10
  title: Unterstützte Versionen der Dokumentation
 ---
-{{% capture overview %}}
+<!-- overview -->
 Diese Website enthält Dokumentation für die aktuelle Version von Kubernetes
 und die vier vorherigen Versionen von Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Aktuelle Version
@@ -25,6 +25,6 @@ Die aktuelle Version ist
 {{< versions-other >}}
-{{% /capture %}}
+
@@ -5,16 +5,16 @@ approvers:
 linkTitle: "Referenzen"
 main_menu: true
 weight: 70
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Dieser Abschnitt der Kubernetes-Dokumentation enthält Referenzinformationen.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## API-Referenz
@@ -58,4 +58,4 @@ Offiziell unterstützte Clientbibliotheken:
 Ein Archiv der Designdokumente für Kubernetes-Funktionalität. Gute Ansatzpunkte sind [Kubernetes Architektur](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md) und [Kubernetes Design Übersicht](https://git.k8s.io/community/contributors/design-proposals).
-{{% /capture %}}
+
@@ -1,20 +1,20 @@
 ---
 title: kubectl Spickzettel
-content_template: templates/concept
+content_type: concept
 card:
  name: reference
  weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 Siehe auch: [Kubectl Überblick](/docs/reference/kubectl/overview/) und [JsonPath Dokumentation](/docs/reference/kubectl/jsonpath).
 Diese Seite ist eine Übersicht über den Befehl `kubectl`.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 # kubectl - Spickzettel
@@ -335,9 +335,10 @@ Ausführlichkeit | Beschreibung
 `--v=8` | HTTP-Anforderungsinhalt anzeigen
 `--v=9` | HTTP-Anforderungsinhalt anzeigen, ohne den Inhalt zu kürzen.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Lernen Sie mehr im [Überblick auf kubectl](/docs/reference/kubectl/overview/).
@@ -347,4 +348,4 @@ Ausführlichkeit | Beschreibung
 * Entdecken Sie mehr Community [kubectl Spickzettel](https://github.com/dennyzhang/cheatsheet-kubernetes-A4).
-{{% /capture %}}
+
@@ -1,13 +1,13 @@
 ---
 title: Tools
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes enthält mehrere integrierte Tools, die Ihnen bei der Arbeit mit dem Kubernetes System helfen.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Kubectl
 [`kubectl`](/docs/tasks/tools/install-kubectl/) ist ein Kommandozeilenprogramm für Kubernetes. Es steuert den Kubernetes Clustermanager.
@@ -49,4 +49,4 @@ Verwenden Sie Kompose um:
 * Ein Docker Compose Datei in Kubernetes Objekte zu übersetzen
 * Von Ihrer lokalen Docker Entwicklung auf eine Kubernetes verwaltete Entwicklung zu wechseln
 * v1 oder v2 Docker Compose `yaml` Dateien oder [Distributed Application Bundles](https://docs.docker.com/compose/bundles/) zu konvertieren
-{{% /capture %}}
+
@@ -2,10 +2,10 @@
 title: Setup
 main_menu: true
 weight: 30
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Diese Sektion umfasst verschiedene Optionen zum Einrichten und Betrieb von Kubernetes.
@@ -15,9 +15,9 @@ Sie können einen Kubernetes-Cluster auf einer lokalen Maschine, Cloud, On-Prem
 Noch einfacher können Sie einen Kubernetes-Cluster in einer Lern- und Produktionsumgebung erstellen.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Lernumgebung
@@ -99,4 +99,4 @@ Die folgende Tabelle für Produktionsumgebungs-Lösungen listet Anbieter und der
 | [VMware](https://cloud.vmware.com/) | [VMware Cloud PKS](https://cloud.vmware.com/vmware-cloud-pks)              |[VMware Enterprise PKS](https://cloud.vmware.com/vmware-enterprise-pks)        |   [VMware Enterprise PKS](https://cloud.vmware.com/vmware-enterprise-pks)          | [VMware Essential PKS](https://cloud.vmware.com/vmware-essential-pks)      |          |[VMware Essential PKS](https://cloud.vmware.com/vmware-essential-pks)
 | [Z.A.R.V.I.S.](https://zarvis.ai/) | &#x2714; | | | | | |
-{{% /capture %}}
+
@@ -1,15 +1,15 @@
 ---
 title: Kubernetes lokal über Minikube betreiben
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Minikube ist ein Tool, mit dem Kubernetes lokal einfach ausgeführt werden kann. Minikube führt einen Kubernetes-Cluster mit einem einzigen Node in einer VM auf Ihrem Laptop aus, damit Anwender Kubernetes ausprobieren oder täglich damit entwickeln können.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Minikube-Funktionen
@@ -439,4 +439,4 @@ Weitere Informationen zu Minikube finden Sie im [Vorschlag](https://git.k8s.io/c
 Beiträge, Fragen und Kommentare werden begrüßt und ermutigt! Minikube-Entwickler finden Sie in [Slack](https://kubernetes.slack.com) im #minikube Kanal (Erhalten Sie [hier](http://slack.kubernetes.io/) eine Einladung). Wir haben ausserdem die [kubernetes-dev Google Groups-Mailingliste](https://groups.google.com/forum/#!forum/kubernetes-dev). Wenn Sie in der Liste posten, fügen Sie Ihrem Betreff bitte "minikube:" voran.
-{{% /capture %}}
+
@@ -1,19 +1,19 @@
 ---
 title: Release erstellen
-content_template: templates/concept
+content_type: concept
 card:
  name: download
  weight: 20
  title: Release erstellen
 ---
-{{% capture overview %}}
+<!-- overview -->
 Sie können entweder eine Version aus dem Quellcode erstellen oder eine bereits kompilierte Version herunterladen.
 Wenn Sie nicht vorhaben, Kubernetes selbst zu entwickeln, empfehlen wir die Verwendung eines vorkompilierten Builds der aktuellen Version, die Sie in den [Versionshinweisen](/docs/setup/release/notes/) finden.
 Der Kubernetes-Quellcode kann aus dem [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes) repo der heruntergeladen werden.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Aus dem Quellcode kompilieren
@@ -29,4 +29,4 @@ make release
 Mehr Informationen zum Release-Prozess finden Sie im kubernetes/kubernetes [`build`](http://releases.k8s.io/{{< param "githubbranch" >}}/build/) Verzeichnis.
-{{% /capture %}}
+
@@ -2,19 +2,19 @@
 title: Aufgaben
 main_menu: true
 weight: 50
-content_template: templates/concept
+content_type: concept
 ---
 {{< toc >}}
-{{% capture overview %}}
+<!-- overview -->
 Dieser Abschnitt der Kubernetes-Dokumentation enthält Seiten, die zeigen, wie man einzelne Aufgaben erledigt.
 Eine Aufgabenseite zeigt, wie man eine einzelne Aufgabe ausführt, typischerweise durch eine kurze Abfolge von Schritten.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Webbenutzeroberfläche (Dashboard)
@@ -76,10 +76,11 @@ Konfigurieren und planen Sie NVIDIA-GPUs für die Verwendung durch Nodes in eine
 Konfigurieren und verwalten Sie `HugePages` als planbare Ressource in einem Cluster.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Wenn Sie eine Aufgabenseite schreiben möchten, finden Sie weitere Informationen unter [Erstellen einer Pull-Anfrage für Dokumentation](/docs/home/contribute/create-pull-request/).
-{{% /capture %}}
+
@@ -5,11 +5,11 @@ feature:
  description: >
    Skaliere deine Anwendung mit einem einfachen Befehl, über die Benutzeroberfläche oder automatisch, basierend auf der CPU-Auslastung.
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
-{{% capture overview %}}
+<!-- overview -->
 Der Horizontal Pod Autoscaler skaliert automatisch die Anzahl der Pods eines Replication Controller, Deployment oder Replikat Set basierend auf der beobachteten CPU-Auslastung (oder, mit Unterstützung von [benutzerdefinierter Metriken](https://git.k8s.io/community/contributors/design-proposals/instrumentation/custom-metrics-api.md), von der Anwendung bereitgestellten Metriken). Beachte, dass die horizontale Pod Autoskalierung nicht für Objekte gilt, die nicht skaliert werden können, z. B. DaemonSets.
@@ -17,9 +17,9 @@ Der Horizontal Pod Autoscaler ist als Kubernetes API-Ressource und einem Control
 Die Ressource bestimmt das Verhalten des Controllers.
 Der Controller passt die Anzahl der Replikate eines Replication Controller oder Deployments regelmäßig an, um die beobachtete durchschnittliche CPU-Auslastung an das vom Benutzer angegebene Ziel anzupassen.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Wie funktioniert der Horizontal Pod Autoscaler?
@@ -161,12 +161,13 @@ Standardmäßig ruft der HorizontalPodAutoscaler Controller Metriken aus einer R
 * Das Flag `--horizontal-pod-autoscaler-use-rest-clients` ist auf `true` oder ungesetzt. Wird dies auf `false` gesetzt wird die Heapster basierte Autoskalierung aktiviert, welche veraltet ist.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Design Dokument [Horizontal Pod Autoscaling](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md).
 * kubectl autoscale Befehl: [kubectl autoscale](/docs/reference/generated/kubectl/kubectl-commands/#autoscale).
 * Verwenden des [Horizontal Pod Autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/).
-{{% /capture %}}
+
@@ -1,6 +1,6 @@
 ---
 title: Installieren und konfigurieren von kubectl
-content_template: templates/task
+content_type: task
 weight: 10
 card:
  name: tasks
@@ -8,17 +8,18 @@ card:
  title: Kubectl installieren
 ---
-{{% capture overview %}}
+<!-- overview -->
 Verwenden Sie das Kubernetes Befehlszeilenprogramm, [kubectl](/docs/user-guide/kubectl/), um Anwendungen auf Kubernetes bereitzustellen und zu verwalten.
 Mit kubectl können Sie Clusterressourcen überprüfen, Komponenten erstellen, löschen und aktualisieren; Ihren neuen Cluster betrachten; und Beispielanwendungen aufrufen.
 {{% /capture %}}
-{{% capture prerequisites %}}
+
 ## {{% heading "prerequisites" %}}
 Sie müssen eine kubectl-Version verwenden, die innerhalb eines geringfügigen Versionsunterschieds zur Version Ihres Clusters liegt. Ein v1.2-Client sollte beispielsweise mit einem v1.1, v1.2 und v1.3-Master arbeiten. Die Verwendung der neuesten Version von kubectl verhindert unvorhergesehene Probleme.
 {{% /capture %}}
-{{% capture steps %}}
+
 <!-- steps -->
 ## Kubectl installieren
@@ -421,9 +422,10 @@ compinit
 {{% /tab %}}
 {{< /tabs >}}
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 [Erfahren Sie, wie Sie Ihre Anwendung starten und verfügbar machen.](/docs/tasks/access-application-cluster/service-access-application-cluster/)
-{{% /capture %}}
+
@@ -1,28 +1,29 @@
 ---
 title: Installation von Minikube
-content_template: templates/task
+content_type: task
 weight: 20
 card:
  name: tasks
  weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Diese Seite zeigt Ihnen, wie Sie [Minikube](/docs/tutorials/hello-minikube) installieren, ein Programm, das einen Kubernetes-Cluster mit einem einzigen Node in einer virtuellen Maschine auf Ihrem Laptop ausführt.
 {{% /capture %}}
-{{% capture prerequisites %}}
+
 ## {{% heading "prerequisites" %}}
 Die VT-x- oder AMD-v-Virtualisierung muss im BIOS Ihres Computers aktiviert sein. Um dies unter Linux zu überprüfen, führen Sie Folgendes aus und vergewissern Sie sich, dass die Ausgabe nicht leer ist:
 ```shell
 egrep --color 'vmx|svm' /proc/cpuinfo
 ```
 {{% /capture %}}
-{{% capture steps %}}
+
 <!-- steps -->
 ## Einen Hypervisor installieren
@@ -106,13 +107,6 @@ Schließen Sie nach der Installation von Minikube die aktuelle CLI-Sitzung und s
 So installieren Sie Minikube manuell unter Windows mit [Windows Installer](https://docs.microsoft.com/en-us/windows/desktop/msi/windows-installer-portal), laden Sie die Datei [`minikube-installer.exe`](https://github.com/kubernetes/minikube/releases/latest) und führen Sie den Installer aus.
 {{% /capture %}}
 {{% capture whatsnext %}}
 * [Kubernetes lokal über Minikube ausführen](/docs/setup/minikube/)
 {{% /capture %}}
 ## Eine bestehende Installation bereinigen
@@ -130,3 +124,8 @@ Müssen Sie die Konfigurationsdateien löschen:
 ```shell
 rm -rf ~/.minikube
 ```
 ## {{% heading "whatsnext" %}}
 * [Kubernetes lokal über Minikube ausführen](/docs/setup/minikube/)
@@ -2,19 +2,19 @@
 title: Tutorials
 main_menu: true
 weight: 60
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Dieser Abschnitt der Kubernetes-Dokumentation enthält Tutorials.
 Ein Tutorial zeigt, wie Sie ein Ziel erreichen, das größer ist als eine einzelne [Aufgabe](/docs/tasks/).
 Ein Tutorial besteht normalerweise aus mehreren Abschnitten, die jeweils eine Abfolge von Schritten haben.
 Bevor Sie die einzelnen Lernprogramme durchgehen, möchten Sie möglicherweise ein Lesezeichen zur Seite mit dem [Standardisierten Glossar](/docs/reference/glossary/) setzen um später Informationen nachzuschlagen.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Grundlagen
@@ -64,12 +64,13 @@ Bevor Sie die einzelnen Lernprogramme durchgehen, möchten Sie möglicherweise e
 * [Source IP verwenden](/docs/tutorials/services/source-ip/)
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Wenn Sie ein Tutorial schreiben möchten, lesen Sie
 [Seitenvorlagen verwenden](/docs/home/contribute/page-templates/)
 für weitere Informationen zum Typ der Tutorial-Seite und zur Tutorial-Vorlage.
-{{% /capture %}}
+
@@ -1,6 +1,6 @@
 ---
 title: Hallo Minikube
-content_template: templates/tutorial
+content_type: tutorial
 weight: 5
 menu:
  main:
@@ -13,7 +13,7 @@ card:
  weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Dieses Tutorial zeigt Ihnen, wie Sie eine einfache "Hallo Welt" Node.js-Anwendung auf Kubernetes mit [Minikube](/docs/getting-started-guides/minikube) und Katacoda ausführen.
 Katacoda bietet eine kostenlose Kubernetes-Umgebung im Browser.
@@ -22,17 +22,19 @@ Katacoda bietet eine kostenlose Kubernetes-Umgebung im Browser.
 Sie können dieses Tutorial auch verwenden, wenn Sie [Minikube lokal](/docs/tasks/tools/install-minikube/) installiert haben.
 {{< /note >}}
 {{% /capture %}}
-{{% capture objectives %}}
+
 ## {{% heading "objectives" %}}
 * Stellen Sie eine Hallo-Welt-Anwendung für Minikube bereit.
 * Führen Sie die App aus.
 * Betrachten Sie die Log Dateien.
 {{% /capture %}}
-{{% capture prerequisites %}}
+
 ## {{% heading "prerequisites" %}}
 Dieses Lernprogramm enthält ein aus den folgenden Dateien erstelltes Container-Image:
@@ -42,9 +44,9 @@ Dieses Lernprogramm enthält ein aus den folgenden Dateien erstelltes Container-
 Weitere Informationen zum `docker build` Befehl, lesen Sie die [Docker Dokumentation](https://docs.docker.com/engine/reference/commandline/build/).
 {{% /capture %}}
-{{% capture lessoncontent %}}
+
 <!-- lessoncontent -->
 ## Erstellen Sie einen Minikube-Cluster
@@ -260,12 +262,13 @@ Löschen Sie optional die Minikube-VM:
 minikube delete
 ```
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Lernen Sie mehr über [Bereitstellungsobjekte](/docs/concepts/workloads/controllers/deployment/).
 * Lernen Sie mehr über [Anwendungen bereitstellen](/docs/user-guide/deploying-applications/).
 * Lernen Sie mehr über [Serviceobjekte](/docs/concepts/services-networking/service/).
-{{% /capture %}}
+
@@ -1,17 +1,17 @@
 ---
 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.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Overview
@@ -60,12 +60,13 @@ The Kubernetes master is responsible for maintaining the desired state for your
 The nodes in a cluster are the machines (VMs, physical servers, etc) that run your applications and cloud workflows. The Kubernetes master controls each node; you'll rarely interact with nodes directly.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 If you would like to write a concept page, see
-[Using Page Templates](/docs/home/contribute/page-templates/)
+[Page Content Types](/docs/home/contribute/style/page-content-types/#concept)
-for information about the concept page type and the concept template.
+for information about the concept page types.
 {{% /capture %}}
@@ -1,10 +1,10 @@
 ---
 title: Cloud Controller Manager
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="beta" for_k8s_version="v1.11" >}}
@@ -17,9 +17,9 @@ components.
 The cloud-controller-manager is structured using a plugin
 mechanism that allows different cloud providers to integrate their platforms with Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Design
@@ -200,8 +200,9 @@ rules:
  - update
 ```
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 [Cloud Controller Manager Administration](/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)
 has instructions on running and managing the cloud controller manager.
@@ -212,4 +213,3 @@ The cloud controller manager uses Go interfaces to allow implementations from an
 The implementation of the shared controllers highlighted in this document (Node, Route, and Service), and some scaffolding along with the shared cloudprovider interface, is part of the Kubernetes core. Implementations specific to cloud providers are outside the core of Kubernetes and implement the `CloudProvider` interface.
 For more information about developing plugins, see [Developing Cloud Controller Manager](/docs/tasks/administer-cluster/developing-cloud-controller-manager/).
 {{% /capture %}}
@@ -3,19 +3,19 @@ reviewers:
 - dchen1107
 - liggitt
 title: Control Plane-Node Communication
-content_template: templates/concept
+content_type: concept
 weight: 20
 aliases:
 - master-node-communication
 ---
-{{% capture overview %}}
+<!-- overview -->
 This document catalogs the communication paths between the control plane (really the apiserver) and the Kubernetes cluster. The intent is to allow users to customize their installation to harden the network configuration such that the cluster can be run on an untrusted network (or on fully public IPs on a cloud provider).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Node to Control Plane
 All communication paths from the nodes to the control plane terminate at the apiserver (none of the other master components are designed to expose remote services). In a typical deployment, the apiserver is configured to listen for remote connections on a secure HTTPS port (443) with one or more forms of client [authentication](/docs/reference/access-authn-authz/authentication/) enabled.
@@ -1,10 +1,10 @@
 ---
 title: Controllers
-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.
@@ -18,10 +18,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
@@ -150,11 +150,12 @@ You can run your own controller as a set of Pods,
 or externally to Kubernetes. What fits best will depend on what that particular
 controller does.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Read about the [Kubernetes control plane](/docs/concepts/#kubernetes-control-plane)
 * Discover some of the basic [Kubernetes objects](/docs/concepts/#kubernetes-objects)
 * Learn more about the [Kubernetes API](/docs/concepts/overview/kubernetes-api/)
 * If you want to write your own controller, see [Extension Patterns](/docs/concepts/extend-kubernetes/extend-cluster/#extension-patterns) in Extending Kubernetes.
-{{% /capture %}}
+
@@ -3,11 +3,11 @@ reviewers:
 - caesarxuchao
 - dchen1107
 title: Nodes
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes runs your workload by placing containers into Pods to run on _Nodes_.
 A node may be a virtual or physical machine, depending on the cluster. Each node
@@ -23,9 +23,9 @@ The [components](/docs/concepts/overview/components/#node-components) on a node
 {{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}, and the
 {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Management
@@ -332,12 +332,13 @@ the kubelet can use topology hints when making resource assignment decisions.
 See [Control Topology Management Policies on a Node](/docs/tasks/administer-cluster/topology-manager/)
 for more information.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Learn about the [components](/docs/concepts/overview/components/#node-components) that make up a node.
 * Read the [API definition for Node](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#node-v1-core).
 * Read the [Node](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md#the-kubernetes-node)
  section of the architecture design document.
 * Read about [taints and tolerations](/docs/concepts/configuration/taint-and-toleration/).
 * Read about [cluster autoscaling](/docs/tasks/administer-cluster/cluster-management/#cluster-autoscaling).
-{{% /capture %}}
+
@@ -1,9 +1,9 @@
 ---
 title: Installing Addons
-content_template: templates/concept
+content_type: concept
 ---
-{{% capture overview %}}
+<!-- overview -->
 Add-ons extend the functionality of Kubernetes.
@@ -12,10 +12,10 @@ This page lists some of the available add-ons and links to their respective inst
 Add-ons in each section are sorted alphabetically - the ordering does not imply any preferential status.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Networking and Network Policy
@@ -55,4 +55,4 @@ There are several other add-ons documented in the deprecated [cluster/addons](ht
 Well-maintained ones should be linked to here. PRs welcome!
-{{% /capture %}}
+
@@ -1,19 +1,19 @@
 ---
 title: Certificates
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 When using client certificate authentication, you can generate certificates
 manually through `easyrsa`, `openssl` or `cfssl`.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ### easyrsa
@@ -249,4 +249,4 @@ You can use the `certificates.k8s.io` API to provision
 x509 certificates to use for authentication as documented
 [here](/docs/tasks/tls/managing-tls-in-a-cluster).
-{{% /capture %}}
+
@@ -1,16 +1,16 @@
 ---
 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.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ### kubeadm
 [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) is a popular option for creating kubernetes clusters.
 kubeadm has configuration options to specify configuration information for cloud providers. For example a typical
@@ -363,7 +363,7 @@ Kubernetes network plugin and should appear in the `[Route]` section of the
 [kubenet]: /docs/concepts/cluster-administration/network-plugins/#kubenet
-{{% /capture %}}
+
 ## OVirt
@@ -3,16 +3,16 @@ reviewers:
 - davidopp
 - lavalamp
 title: Cluster Administration Overview
-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.
 It assumes some familiarity with core Kubernetes [concepts](/docs/concepts/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Planning a cluster
 See the guides in [Setup](/docs/setup/) for examples of how to plan, set up, and configure Kubernetes clusters. The solutions listed in this article are called *distros*.
@@ -68,6 +68,6 @@ Note: Not all distros are actively maintained. Choose distros which have been te
 * [Logging and Monitoring Cluster Activity](/docs/concepts/cluster-administration/logging/) explains how logging in Kubernetes works and how to implement it.
-{{% /capture %}}
+
@@ -1,10 +1,10 @@
 ---
 title: API Priority and Fairness
-content_template: templates/concept
+content_type: concept
 min-kubernetes-server-version: v1.18
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="alpha"  for_k8s_version="v1.18" >}}
@@ -33,9 +33,9 @@ the `--max-requests-inflight` flag without the API Priority and
 Fairness feature enabled.
 {{< /caution >}}
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Enabling API Priority and Fairness
@@ -366,13 +366,13 @@ poorly-behaved workloads that may be harming system health.
  request and the PriorityLevel to which it was assigned.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 For background information on design details for API priority and fairness, see
 the [enhancement proposal](https://github.com/kubernetes/enhancements/blob/master/keps/sig-api-machinery/20190228-priority-and-fairness.md).
 You can make suggestions and feature requests via [SIG API
 Machinery](https://github.com/kubernetes/community/tree/master/sig-api-machinery).
 {{% /capture %}}
@@ -1,20 +1,20 @@
 ---
 reviewers:
 title: Configuring kubelet Garbage Collection
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
-{{% capture overview %}}
+<!-- overview -->
 Garbage collection is a helpful function of kubelet that will clean up unused images and unused containers. Kubelet will perform garbage collection for containers every minute and garbage collection for images every five minutes.
 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 -->
 ## Image Collection
@@ -77,10 +77,11 @@ Including:
 | `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources |
 | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 See [Configuring Out Of Resource Handling](/docs/tasks/administer-cluster/out-of-resource/) for more details.
-{{% /capture %}}
+
@@ -3,20 +3,20 @@ reviewers:
 - piosz
 - x13n
 title: Logging Architecture
-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.
 However, the native functionality provided by a container engine or runtime is usually not enough for a complete logging solution. For example, if a container crashes, a pod is evicted, or a node dies, you'll usually still want to access your application's logs. As such, logs should have a separate storage and lifecycle independent of nodes, pods, or containers. This concept is called _cluster-level-logging_. Cluster-level logging requires a separate backend to store, analyze, and query logs. Kubernetes provides no native storage solution for log data, but you can integrate many existing logging solutions into your Kubernetes cluster.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 Cluster-level logging architectures are described in assumption that
 a logging backend is present inside or outside of your cluster. If you're
@@ -267,4 +267,4 @@ You can implement cluster-level logging by exposing or pushing logs directly fro
 every application; however, the implementation for such a logging mechanism
 is outside the scope of Kubernetes.
-{{% /capture %}}
+
@@ -2,18 +2,18 @@
 reviewers:
 - janetkuo
 title: Managing Resources
-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/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Organizing resource configurations
@@ -449,11 +449,12 @@ kubectl edit deployment/my-nginx
 That's it! The Deployment will declaratively update the deployed nginx application progressively behind the scene. It ensures that only a certain number of old replicas may be down while they are being updated, and only a certain number of new replicas may be created above the desired number of pods. To learn more details about it, visit [Deployment page](/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/).
 - See [Configuration Best Practices and Tips](/docs/concepts/configuration/overview/).
-{{% /capture %}}
+
@@ -4,21 +4,21 @@ reviewers:
 - brancz
 - logicalhan
 - RainbowMango
-content_template: templates/concept
+content_type: concept
 weight: 60
 aliases:
 - controller-metrics.md
 ---
-{{% 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.
 Metrics in Kubernetes control plane are emitted in [prometheus format](https://prometheus.io/docs/instrumenting/exposition_formats/) and are human readable.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Metrics in Kubernetes
@@ -124,10 +124,11 @@ 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
 * See the list of [stable Kubernetes metrics](https://github.com/kubernetes/kubernetes/blob/master/test/instrumentation/testdata/stable-metrics-list.yaml)
 * Read about the [Kubernetes deprecation policy](https://kubernetes.io/docs/reference/using-api/deprecation-policy/#deprecating-a-feature-or-behavior )
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 reviewers:
 - thockin
 title: Cluster Networking
-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
 problems to address:
@@ -17,10 +17,10 @@ problems to address:
 3. Pod-to-Service communications: this is covered by [services](/docs/concepts/services-networking/service/).
 4. External-to-Service communications: this is covered by [services](/docs/concepts/services-networking/service/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 Kubernetes is all about sharing machines between applications.  Typically,
 sharing machines requires ensuring that two applications do not try to use the
@@ -312,12 +312,13 @@ Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-pl
 or stand-alone.  In either version, it doesn't require any configuration or extra code
 to run, and in both cases, the network provides one IP address per pod - as is standard for Kubernetes.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 The early design of the networking model and its rationale, and some future
 plans are described in more detail in the [networking design
 document](https://git.k8s.io/community/contributors/design-proposals/network/networking.md).
-{{% /capture %}}
+
@@ -1,14 +1,14 @@
 ---
 title: Proxies in Kubernetes
-content_template: templates/concept
+content_type: concept
 weight: 90
 ---
-{{% capture overview %}}
+<!-- overview -->
 This page explains proxies used with Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Proxies
@@ -62,6 +62,6 @@ will typically ensure that the latter types are setup correctly.
 Proxies have replaced redirect capabilities.  Redirects have been deprecated.
-{{% /capture %}}
+
@@ -1,10 +1,10 @@
 ---
 title: ConfigMaps
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< glossary_definition term_id="configmap" prepend="A ConfigMap is" length="all" >}}
@@ -15,9 +15,9 @@ If the data you want to store are confidential, use a
 or use additional (third party) tools to keep your data private.
 {{< /caution >}}
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
 Use a ConfigMap for setting configuration data separately from application code.
@@ -243,12 +243,13 @@ Existing Pods maintain a mount point to the deleted ConfigMap - it is recommende
 these pods.
 {{< /note >}}
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Read about [Secrets](/docs/concepts/configuration/secret/).
 * Read [Configure a Pod to Use a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/).
 * Read [The Twelve-Factor App](https://12factor.net/) to understand the motivation for
  separating code from configuration.
-{{% /capture %}}
+
@@ -1,6 +1,6 @@
 ---
 title: Managing Resources for Containers
-content_template: templates/concept
+content_type: concept
 weight: 40
 feature:
  title: Automatic bin packing
@@ -8,7 +8,7 @@ feature:
    Automatically places containers based on their resource requirements and other constraints, while not sacrificing availability. Mix critical and best-effort workloads in order to drive up utilization and save even more resources.
 ---
-{{% capture overview %}}
+<!-- overview -->
 When you specify a {{< glossary_tooltip term_id="pod" >}}, you can optionally specify how
 much of each resource a {{< glossary_tooltip text="Container" term_id="container" >}} needs.
@@ -21,10 +21,10 @@ allowed to use more of that resource than the limit you set. The kubelet also re
 at least the _request_ amount of that system resource specifically for that container
 to use.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Requests and limits
@@ -740,10 +740,11 @@ You can see that the Container was terminated because of `reason:OOM Killed`, wh
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Get hands-on experience [assigning Memory resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/).
@@ -758,4 +759,4 @@ You can see that the Container was terminated because of `reason:OOM Killed`, wh
 * Read about [project quotas](http://xfs.org/docs/xfsdocs-xml-dev/XFS_User_Guide/tmp/en-US/html/xfs-quotas.html) in XFS
-{{% /capture %}}
+
@@ -1,10 +1,10 @@
 ---
 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
 authentication mechanisms. The `kubectl` command-line tool uses kubeconfig files to
@@ -25,10 +25,10 @@ variable or by setting the
 For step-by-step instructions on creating and specifying kubeconfig files, see
 [Configure Access to Multiple Clusters](/docs/tasks/access-application-cluster/configure-access-multiple-clusters).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Supporting multiple clusters, users, and authentication mechanisms
@@ -143,14 +143,15 @@ File references on the command line are relative to the current working director
 In `$HOME/.kube/config`, relative paths are stored relatively, and absolute paths
 are stored absolutely.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * [Configure Access to Multiple Clusters](/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
 * [`kubectl config`](/docs/reference/generated/kubectl/kubectl-commands#config)
-{{% /capture %}}
+
@@ -2,17 +2,17 @@
 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.
 This is a living document. If you think of something that is not on this list but might be useful to others, please don't hesitate to file an issue or submit a PR.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## General Configuration Tips
 - When defining configurations, specify the latest stable API version.
@@ -105,5 +105,5 @@ The caching semantics of the underlying image provider make even `imagePullPolic
 - Use `kubectl run` and `kubectl expose` to quickly create single-container Deployments and Services. See [Use a Service to Access an Application in a Cluster](/docs/tasks/access-application-cluster/service-access-application-cluster/) for an example.
-{{% /capture %}}
+
@@ -4,11 +4,11 @@ reviewers:
 - egernst
 - tallclair
 title: Pod Overhead
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.18" state="beta" >}}
@@ -19,10 +19,10 @@ _Pod Overhead_ is a feature for accounting for the resources consumed by the Pod
 on top of the container requests & limits.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 In Kubernetes, the Pod's overhead is set at
 [admission](/docs/reference/access-authn-authz/extensible-admission-controllers/#what-are-admission-webhooks)
@@ -188,11 +188,12 @@ running with a defined Overhead. This functionality is not available in the 1.9
 kube-state-metrics, but is expected in a following release. Users will need to build kube-state-metrics
 from source in the meantime.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * [RuntimeClass](/docs/concepts/containers/runtime-class/)
 * [PodOverhead Design](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190226-pod-overhead.md)
-{{% /capture %}}
+
@@ -3,11 +3,11 @@ reviewers:
 - davidopp
 - wojtek-t
 title: Pod Priority and Preemption
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.14" state="stable" >}}
@@ -16,9 +16,9 @@ importance of a Pod relative to other Pods. If a Pod cannot be scheduled, the
 scheduler tries to preempt (evict) lower priority Pods to make scheduling of the
 pending Pod possible.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 {{< warning >}}
@@ -407,7 +407,8 @@ usage does not exceed their requests. If a Pod with lower priority is not
 exceeding its requests, it won't be evicted. Another Pod with higher priority
 that exceeds its requests may be evicted.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Read about using ResourceQuotas in connection with PriorityClasses: [limit Priority Class consumption by default](/docs/concepts/policy/resource-quotas/#limit-priority-class-consumption-by-default)
-{{% /capture %}}
+
@@ -4,19 +4,19 @@ reviewers:
 - k82cn
 - ahg-g
 title: Resource Bin Packing for Extended Resources
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.16" state="alpha" >}}
 The kube-scheduler can be configured to enable bin packing of resources along with extended resources using `RequestedToCapacityRatioResourceAllocation` priority function. Priority functions can be used to fine-tune the kube-scheduler as per custom needs. 
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Enabling Bin Packing using RequestedToCapacityRatioResourceAllocation
@@ -194,4 +194,4 @@ NodeScore   =  (5 * 5) + (7 * 1) + (10 * 3) / (5 + 1 + 3)
 ```
-{{% /capture %}}
+
@@ -2,7 +2,7 @@
 reviewers:
 - mikedanese
 title: Secrets
-content_template: templates/concept
+content_type: concept
 feature:
  title: Secret and configuration management
  description: >
@@ -10,16 +10,16 @@ feature:
 weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes Secrets let you store and manage sensitive information, such
 as passwords, OAuth tokens, and ssh keys. Storing confidential information in a Secret
 is safer and more flexible than putting it verbatim in a
 {{< glossary_tooltip term_id="pod" >}} definition or in a {{< glossary_tooltip text="container image" term_id="image" >}}. See [Secrets design document](https://git.k8s.io/community/contributors/design-proposals/auth/secrets.md) for more information.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Overview of Secrets
@@ -3,18 +3,18 @@ reviewers:
 - mikedanese
 - thockin
 title: Container Environment
-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
@@ -53,12 +53,13 @@ FOO_SERVICE_PORT=<the port the service is running on>
 Services have dedicated IP addresses and are available to the Container via DNS,
 if [DNS addon](http://releases.k8s.io/{{< param "githubbranch" >}}/cluster/addons/dns/) is enabled. 
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Learn more about [Container lifecycle hooks](/docs/concepts/containers/container-lifecycle-hooks/).
 * Get hands-on experience
  [attaching handlers to Container lifecycle events](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/).
-{{% /capture %}}
+
@@ -3,19 +3,19 @@ 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
 to run code triggered by events during their management lifecycle.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Overview
@@ -112,12 +112,13 @@ 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/).
 * Get hands-on experience
  [attaching handlers to Container lifecycle events](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/).
-{{% /capture %}}
+
@@ -3,20 +3,20 @@ 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.
 The `image` property of a container supports the same syntax as the `docker` command does, including private registries and tags.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Updating Images
@@ -370,4 +370,4 @@ common use cases and suggested solutions.
 If you need access to multiple registries, you can create one secret for each registry.
 Kubelet will merge any `imagePullSecrets` into a single virtual `.docker/config.json`
-{{% /capture %}}
+
@@ -3,11 +3,11 @@ reviewers:
 - erictune
 - thockin
 title: Containers overview
-content_template: templates/concept
+content_type: concept
 weight: 1
 ---
-{{% capture overview %}}
+<!-- overview -->
 Containers are a technology for packaging the (compiled) code for an
 application along with the dependencies it needs at run time. Each
@@ -18,10 +18,10 @@ run it.
 Containers decouple applications from underlying host infrastructure.
 This makes deployment easier in different cloud or OS environments.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Container images
 A [container image](/docs/concepts/containers/images/) is a ready-to-run
@@ -38,8 +38,9 @@ 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/)
-{{% /capture %}}
+
@@ -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" >}}
@@ -16,10 +16,10 @@ This page describes the RuntimeClass resource and runtime selection mechanism.
 RuntimeClass is a feature for selecting the container runtime configuration. The container runtime
 configuration is used to run a Pod's containers.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
@@ -180,12 +180,13 @@ Pod overhead is defined in RuntimeClass through the `overhead` fields. Through t
 you can specify the overhead of running pods utilizing this RuntimeClass and ensure these overheads
 are accounted for in Kubernetes.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 - [RuntimeClass Design](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/runtime-class.md)
 - [RuntimeClass Scheduling Design](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/runtime-class-scheduling.md)
 - Read about the [Pod Overhead](/docs/concepts/configuration/pod-overhead/) concept
 - [PodOverhead Feature Design](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/20190226-pod-overhead.md)
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 title: Example Concept Template
 reviewers:
 - chenopis
-content_template: templates/concept
+content_type: concept
 toc_hide: true
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< note >}}
 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.
@@ -14,9 +14,9 @@ Be sure to also [create an entry in the table of contents](/docs/home/contribute
 This page explains ...
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Understanding ...
@@ -26,15 +26,16 @@ Kubernetes provides ...
 To use ...
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 **[Optional Section]**
-* Learn more about [Writing a New Topic](/docs/home/contribute/write-new-topic/).
+* Learn more about [Writing a New Topic](/docs/home/contribute/style/write-new-topic/).
-* See [Using Page Templates - Concept template](/docs/home/contribute/page-templates/#concept_template) for how to use this template.
+* See [Page Content Types - Concept](/docs/home/contribute/style/page-concept-types/#concept).
-
+
-{{% /capture %}}
+
@@ -4,20 +4,20 @@ reviewers:
 - lavalamp
 - cheftako
 - chenopis
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 The aggregation layer allows Kubernetes to be extended with additional APIs, beyond what is offered by the core Kubernetes APIs.
 The additional APIs can either be ready-made solutions such as [service-catalog](/docs/concepts/extend-kubernetes/service-catalog/), or APIs that you develop yourself.
 The aggregation layer is different from [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/), which are a way to make the {{< glossary_tooltip term_id="kube-apiserver" text="kube-apiserver" >}} recognise new kinds of object.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Aggregation layer
@@ -34,13 +34,14 @@ If your extension API server cannot achieve that latency requirement, consider m
 `EnableAggregatedDiscoveryTimeout=false` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) on the kube-apiserver
 to disable the timeout restriction. This deprecated feature gate will be removed in a future release.
 {{% /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/).
 * Then, [setup an extension api-server](/docs/tasks/access-kubernetes-api/setup-extension-api-server/) to work with the aggregation layer.
 * Also, learn how to [extend the Kubernetes API using Custom Resource Definitions](/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/).
 * Read the specification for [APIService](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#apiservice-v1-apiregistration-k8s-io)
-{{% /capture %}}
+
@@ -3,19 +3,19 @@ title: Custom Resources
 reviewers:
 - enisoc
 - deads2k
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 *Custom resources* are extensions of the Kubernetes API. This page discusses when to add a custom
 resource to your Kubernetes cluster and when to use a standalone service. It describes the two
 methods for adding custom resources and how to choose between them.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Custom resources
 A *resource* is an endpoint in the [Kubernetes API](/docs/reference/using-api/api-overview/) that stores a collection of
@@ -246,12 +246,13 @@ When you add a custom resource, you can access it using:
 - A REST client that you write.
 - A client generated using [Kubernetes client generation tools](https://github.com/kubernetes/code-generator) (generating one is an advanced undertaking, but some projects may provide a client along with the CRD or AA).
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Learn how to [Extend the Kubernetes API with the aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/).
 * Learn how to [Extend the Kubernetes API with CustomResourceDefinition](/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/).
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 reviewers:
 title: Device Plugins
 description: Use the Kubernetes device plugin framework to implement plugins for GPUs, NICs, FPGAs, InfiniBand, and similar resources that require vendor-specific setup.
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.10" state="beta" >}}
 Kubernetes provides a [device plugin framework](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/resource-management/device-plugin.md)
@@ -19,9 +19,9 @@ The targeted devices include GPUs, high-performance NICs, FPGAs, InfiniBand adap
 and other similar computing resources that may require vendor specific initialization
 and setup.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Device plugin registration
@@ -225,12 +225,13 @@ Here are some examples of device plugin implementations:
 * The [SR-IOV Network device plugin](https://github.com/intel/sriov-network-device-plugin)
 * The [Xilinx FPGA device plugins](https://github.com/Xilinx/FPGA_as_a_Service/tree/master/k8s-fpga-device-plugin/trunk) for Xilinx FPGA devices
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Learn about [scheduling GPU resources](/docs/tasks/manage-gpus/scheduling-gpus/) using device plugins
 * Learn about [advertising extended resources](/docs/tasks/administer-cluster/extended-resource-node/) on a node
 * Read about using [hardware acceleration for TLS ingress](https://kubernetes.io/blog/2019/04/24/hardware-accelerated-ssl/tls-termination-in-ingress-controllers-using-kubernetes-device-plugins-and-runtimeclass/) with Kubernetes
 * Learn about the [Topology Manager] (/docs/tasks/adminster-cluster/topology-manager/)
-{{% /capture %}}
+
@@ -4,12 +4,12 @@ reviewers:
 - freehan
 - thockin
 title: Network Plugins
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="alpha" >}}
 {{< caution >}}Alpha features can change rapidly. {{< /caution >}}
@@ -19,9 +19,9 @@ Network plugins in Kubernetes come in a few flavors:
 * CNI plugins: adhere to the appc/CNI specification, designed for interoperability.
 * Kubenet plugin: implements basic `cbr0` using the `bridge` and `host-local` CNI plugins
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Installation
@@ -166,8 +166,9 @@ This option is provided to the network-plugin; currently **only kubenet supports
 * `--network-plugin=kubenet` specifies that we use the `kubenet` network plugin with CNI `bridge` and `host-local` plugins placed in `/opt/cni/bin` or `cni-bin-dir`.
 * `--network-plugin-mtu=9001` specifies the MTU to use, currently only used by the `kubenet` network plugin.
 {{% /capture %}}
 {{% capture whatsnext %}}
-{{% /capture %}}
+## {{% heading "whatsnext" %}}
@@ -5,11 +5,11 @@ 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,
 there is rarely a need to fork or submit patches to the Kubernetes
@@ -22,10 +22,10 @@ their work environment. Developers who are prospective {{< glossary_tooltip text
 useful as an introduction to what extension points and patterns
 exist, and their trade-offs and limitations.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Overview
@@ -194,10 +194,11 @@ The scheduler also supports a
 that permits a webhook backend (scheduler extension) to filter and prioritize
 the nodes chosen for a pod.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Learn more about [Custom Resources](/docs/concepts/api-extension/custom-resources/)
 * Learn about [Dynamic admission control](/docs/reference/access-authn-authz/extensible-admission-controllers/)
@@ -207,4 +208,4 @@ the nodes chosen for a pod.
 * Learn about [kubectl plugins](/docs/tasks/extend-kubectl/kubectl-plugins/)
 * Learn about the [Operator pattern](/docs/concepts/extend-kubernetes/operator/)
-{{% /capture %}}
+
@@ -1,20 +1,20 @@
 ---
 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
 resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
 to manage applications and their components. Operators follow
 Kubernetes principles, notably the [control loop](/docs/concepts/#kubernetes-control-plane).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
@@ -113,9 +113,10 @@ Operator.
 You also implement an Operator (that is, a Controller) using any language / runtime
 that can act as a [client for the Kubernetes API](/docs/reference/using-api/client-libraries/).
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Learn more about [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
 * Find ready-made operators on [OperatorHub.io](https://operatorhub.io/) to suit your use case
@@ -129,4 +130,3 @@ that can act as a [client for the Kubernetes API](/docs/reference/using-api/clie
 * Read [CoreOS' original article](https://coreos.com/blog/introducing-operators.html) that introduced the Operator pattern
 * Read an [article](https://cloud.google.com/blog/products/containers-kubernetes/best-practices-for-building-kubernetes-operators-and-stateful-apps) from Google Cloud about best practices for building Operators
 {{% /capture %}}
@@ -1,18 +1,18 @@
 ---
 title: Poseidon-Firmament Scheduler
-content_template: templates/concept
+content_type: concept
 weight: 80
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.6" state="alpha" >}}
 The Poseidon-Firmament scheduler is an alternate scheduler that can be deployed alongside the default Kubernetes scheduler.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -102,10 +102,11 @@ Pod-by-pod schedulers, such as the Kubernetes default scheduler, process Pods in
 These downsides of pod-by-pod schedulers are addressed by batching or bulk scheduling in Poseidon-Firmament scheduler. Processing several pods in a batch allows the scheduler to jointly consider their placement, and thus to find the best trade-off for the whole batch instead of one pod. At the same time it amortizes work across pods resulting in much higher throughput.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * See [Poseidon-Firmament](https://github.com/kubernetes-sigs/poseidon#readme) on GitHub for more information.
 * See the [design document](https://github.com/kubernetes-sigs/poseidon/blob/master/docs/design/README.md) for Poseidon.
 * Read [Firmament: Fast, Centralized Cluster Scheduling at Scale](https://www.usenix.org/system/files/conference/osdi16/osdi16-gog.pdf), the academic paper on the Firmament scheduling design.
 * If you'd like to contribute to Poseidon-Firmament, refer to the [developer setup instructions](https://github.com/kubernetes-sigs/poseidon/blob/master/docs/devel/README.md).
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 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="Service Catalog is" >}}  
 A service broker, as defined by the [Open service broker API spec](https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md), is an endpoint for a set of managed services offered and maintained by a third-party, which could be a cloud provider such as AWS, GCP, or Azure.
@@ -14,10 +14,10 @@ Some examples of managed services are Microsoft Azure Cloud Queue, Amazon Simple
 Using Service Catalog, a {{< glossary_tooltip text="cluster operator" term_id="cluster-operator" >}} can browse the list of managed services offered by a service broker, provision an instance of a managed service, and bind with it to make it available to an application in the Kubernetes cluster.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Example use case
 An {{< glossary_tooltip text="application developer" term_id="application-developer" >}} wants to use message queuing as part of their application running in a Kubernetes cluster.
@@ -222,16 +222,17 @@ 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).
 * Explore the [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) project.
 * View [svc-cat.io](https://svc-cat.io/docs/).
-{{% /capture %}}
+
@@ -2,14 +2,14 @@
 reviewers:
 - lavalamp
 title: Kubernetes Components
-content_template: templates/concept
+content_type: concept
 weight: 20
 card: 
  name: concepts
  weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 When you deploy Kubernetes, you get a cluster.
 {{< glossary_definition term_id="cluster" length="all" prepend="A Kubernetes cluster consists of">}}
@@ -20,9 +20,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
 The control plane's components make global decisions about the cluster (for example, scheduling), as well as detecting and responding to cluster events (for example, starting up a new {{< glossary_tooltip text="pod" term_id="pod">}} when a deployment's `replicas` field is unsatisfied).
@@ -122,10 +122,11 @@ about containers in a central database, and provides a UI for browsing that data
 A [cluster-level logging](/docs/concepts/cluster-administration/logging/) mechanism is responsible for
 saving container logs to a central log store with search/browsing interface.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Learn about [Nodes](/docs/concepts/architecture/nodes/)
 * Learn about [Controllers](/docs/concepts/architecture/controller/)
 * Learn about [kube-scheduler](/docs/concepts/scheduling-eviction/kube-scheduler/)
 * Read etcd's official [documentation](https://etcd.io/docs/)
-{{% /capture %}}
+
@@ -2,14 +2,14 @@
 reviewers:
 - chenopis
 title: The Kubernetes API
-content_template: templates/concept
+content_type: concept
 weight: 30
 card:
  name: concepts
  weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 The core of Kubernetes' {{< glossary_tooltip text="control plane" term_id="control-plane" >}}
 is the {{< glossary_tooltip text="API server" term_id="kube-apiserver" >}}. The API server
@@ -21,9 +21,10 @@ The Kubernetes API lets you query and manipulate the state of objects in the Kub
 API endpoints, resource types and samples are described in the [API Reference](/docs/reference/kubernetes-api/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## API changes
@@ -166,8 +167,9 @@ For example: to enable deployments and daemonsets, set
 Kubernetes stores its serialized state in terms of the API resources by writing them into
 {{< glossary_tooltip term_id="etcd" >}}.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 [Controlling API Access](/docs/reference/access-authn-authz/controlling-access/) describes
 how the cluster manages authentication and authorization for API access.
@@ -176,5 +178,3 @@ Overall API conventions are described in the
 document.
 API endpoints, resource types and samples are described in the [API Reference](/docs/reference/kubernetes-api/).
 {{% /capture %}}
@@ -5,18 +5,18 @@ reviewers:
 title: What is Kubernetes?
 description: >
  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.
-content_template: templates/concept
+content_type: concept
 weight: 10
 card:
  name: concepts
  weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 This page is an overview of 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.
 The name Kubernetes originates from Greek, meaning helmsman or pilot. Google open-sourced the Kubernetes project in 2014. Kubernetes combines [over 15 years of Google's experience](/blog/2015/04/borg-predecessor-to-kubernetes/) running production workloads at scale with best-of-breed ideas and practices from the community.
@@ -86,9 +86,10 @@ Kubernetes:
 * Does not provide nor adopt any comprehensive machine configuration, maintenance, management, or self-healing systems.
 * Additionally, Kubernetes is not a mere orchestration system. In fact, it eliminates the need for orchestration. The technical definition of orchestration is execution of a defined workflow: first do A, then B, then C. In contrast, Kubernetes comprises a set of independent, composable control processes that continuously drive the current state towards the provided desired state. It shouldn’t matter how you get from A to C. Centralized control is also not required. This results in a system that is easier to use and more powerful, robust, resilient, and extensible.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 *   Take a look at the [Kubernetes Components](/docs/concepts/overview/components/)
 *   Ready to [Get Started](/docs/setup/)?
-{{% /capture %}}
+
@@ -1,15 +1,15 @@
 ---
 title: Annotations
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
-{{% capture overview %}}
+<!-- overview -->
 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
 You can use either labels or annotations to attach metadata to Kubernetes
@@ -88,10 +88,11 @@ spec:
 ```
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Learn more about [Labels and Selectors](/docs/concepts/overview/working-with-objects/labels/).
-{{% /capture %}}
+
@@ -1,18 +1,18 @@
 ---
 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
 objects in a common manner that all tools can understand.
 In addition to supporting tooling, the recommended labels describe applications
 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.
 Instead, applications are informal and described with metadata. The definition of
@@ -170,4 +170,4 @@ metadata:
 With the MySQL `StatefulSet` and `Service` you'll notice information about both MySQL and Wordpress, the broader application, are included.
-{{% /capture %}}
+
@@ -1,17 +1,17 @@
 ---
 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.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Understanding Kubernetes objects {#kubernetes-objects}
 *Kubernetes objects* are persistent entities in the Kubernetes system. Kubernetes uses these entities to represent the state of your cluster. Specifically, they can describe:
@@ -87,12 +87,13 @@ For example, the `spec` format for a Pod can be found in
 and the `spec` format for a Deployment can be found in
 [DeploymentSpec v1 apps](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#deploymentspec-v1-apps).
 {{% /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/).
 * Learn about [controllers](/docs/concepts/architecture/controller/) in Kubernetes
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 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.
 Labels are intended to be used to specify identifying attributes of objects that are meaningful and relevant to users, but do not directly imply semantics to the core system.
@@ -24,10 +24,10 @@ Each object can have a set of key/value labels defined. Each Key must be unique
 Labels allow for efficient queries and watches and are ideal for use in UIs and CLIs. Non-identifying information should be recorded using [annotations](/docs/concepts/overview/working-with-objects/annotations/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
@@ -228,4 +228,4 @@ selector:
 One use case for selecting over labels is to constrain the set of nodes onto which a pod can schedule.
 See the documentation on [node selection](/docs/concepts/scheduling-eviction/assign-pod-node/) for more information.
-{{% /capture %}}
+
@@ -3,11 +3,11 @@ reviewers:
 - mikedanese
 - thockin
 title: Object Names and 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.
 Every Kubernetes object also has a [_UID_](#uids) that is unique across your whole cluster.
@@ -16,9 +16,9 @@ For example, you can only have one Pod named `myapp-1234` within the same [names
 For non-unique user-provided attributes, Kubernetes provides [labels](/docs/concepts/overview/working-with-objects/labels/) and [annotations](/docs/concepts/overview/working-with-objects/annotations/).
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Names
@@ -81,8 +81,9 @@ Some resource types have additional restrictions on their names.
 Kubernetes UIDs are universally unique identifiers (also known as UUIDs).
 UUIDs are standardized as ISO/IEC 9834-8 and as 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.
-{{% /capture %}}
+
@@ -4,19 +4,19 @@ 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.
 These virtual clusters are called namespaces.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## When to Use Multiple Namespaces
@@ -112,11 +112,12 @@ 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).
-{{% /capture %}}
+
@@ -1,17 +1,17 @@
 ---
 title: Kubernetes Object Management
-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
 approaches. Read the [Kubectl book](https://kubectl.docs.kubernetes.io) for
 details of managing objects by Kubectl.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Management techniques
@@ -173,9 +173,10 @@ Disadvantages compared to imperative object configuration:
 - Declarative object configuration is harder to debug and understand results when they are unexpected.
 - Partial updates using diffs create complex merge and patch operations.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 - [Managing Kubernetes Objects Using Imperative Commands](/docs/tasks/manage-kubernetes-objects/imperative-command/)
 - [Managing Kubernetes Objects Using Object Configuration (Imperative)](/docs/tasks/manage-kubernetes-objects/imperative-config/)
@@ -185,4 +186,4 @@ Disadvantages compared to imperative object configuration:
 - [Kubectl Book](https://kubectl.docs.kubernetes.io)
 - [Kubernetes API Reference](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/)
-{{% /capture %}}
+
@@ -2,20 +2,20 @@
 reviewers:
 - nelvadas
 title: Limit Ranges
-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.
 With resource quotas, cluster administrators can restrict resource consumption and creation on a {{< glossary_tooltip text="namespace" term_id="namespace" >}} basis.
 Within a namespace, a Pod or Container can consume as much CPU and memory as defined by the namespace's resource quota. There is a concern that one Pod or Container could monopolize all available resources. A LimitRange is a policy to constrain resource allocations (to Pods or Containers) in a namespace.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 A _LimitRange_ provides constraints that can:
@@ -56,9 +56,10 @@ there may be contention for resources. In this case, the Containers or Pods will
 Neither contention nor changes to a LimitRange will affect already created resources.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 Refer to the [LimitRanger design document](https://git.k8s.io/community/contributors/design-proposals/resource-management/admission_control_limit_range.md) for more information.
@@ -72,4 +73,4 @@ For examples on using limits, see:
 - a [detailed example on configuring quota per namespace](/docs/tasks/administer-cluster/quota-memory-cpu-namespace/).
-{{% /capture %}}
+
@@ -3,21 +3,21 @@ reviewers:
 - pweil-
 - tallclair
 title: Pod Security Policies
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state state="beta" >}}
 Pod Security Policies enable fine-grained authorization of pod creation and
 updates.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## What is a Pod Security Policy?
@@ -631,12 +631,13 @@ By default, all safe sysctls are allowed.
 Refer to the [Sysctl documentation](
 /docs/concepts/cluster-administration/sysctl-cluster/#podsecuritypolicy).
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 See [Pod Security Standards](/docs/concepts/security/pod-security-standards/) for policy recommendations.
 Refer to [Pod Security Policy Reference](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicy-v1beta1-policy) for the api details.
-{{% /capture %}}
+
@@ -2,21 +2,21 @@
 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,
 there is a concern that one team could use more than its fair share of resources.
 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
 aggregate resource consumption per namespace.  It can limit the quantity of objects that can
@@ -596,10 +596,11 @@ See [LimitedResources](https://github.com/kubernetes/kubernetes/pull/36765) and
 See a [detailed example for how to use resource quota](/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.
-{{% /capture %}}
+
@@ -4,12 +4,12 @@ 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 
 {{< glossary_tooltip text="Node(s)" term_id="node" >}}, or to prefer to run on particular nodes.
@@ -21,9 +21,9 @@ but there are some circumstances where you may want more control on a node where
 that a pod ends up on a machine with an SSD attached to it, or to co-locate pods from two different
 services that communicate a lot into the same availability zone.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## nodeSelector
@@ -388,9 +388,10 @@ spec:
 The above pod will run on the node kube-01.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 [Taints](/docs/concepts/scheduling-eviction/taint-and-toleration/) allow a Node to *repel* a set of Pods.
@@ -402,4 +403,4 @@ Once a Pod is assigned to a Node, the kubelet runs the Pod and allocates node-lo
 The [topology manager](/docs/tasks/administer-cluster/topology-manager/) can take part in node-level
 resource allocation decisions. 
-{{% /capture %}}
+
@@ -1,18 +1,18 @@
 ---
 title: Kubernetes Scheduler
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 In Kubernetes, _scheduling_ refers to making sure that {{< glossary_tooltip text="Pods" term_id="pod" >}}
 are matched to {{< glossary_tooltip text="Nodes" term_id="node" >}} so that
 {{< glossary_tooltip term_id="kubelet" >}} can run them.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Scheduling overview {#scheduling}
@@ -86,12 +86,13 @@ of the scheduler:
  `QueueSort`, `Filter`, `Score`, `Bind`, `Reserve`, `Permit`, and others. You
  can also configure the kube-scheduler to run different profiles.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Read about [scheduler performance tuning](/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
 * Read about [Pod topology spread constraints](/docs/concepts/workloads/pods/pod-topology-spread-constraints/)
 * Read the [reference documentation](/docs/reference/command-line-tools-reference/kube-scheduler/) for kube-scheduler
 * Learn about [configuring multiple schedulers](/docs/tasks/administer-cluster/configure-multiple-schedulers/)
 * Learn about [topology management policies](/docs/tasks/administer-cluster/topology-manager/)
 * Learn about [Pod Overhead](/docs/concepts/configuration/pod-overhead/)
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 reviewers:
 - bsalamat
 title: Scheduler Performance Tuning
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.14" state="beta" >}}
@@ -24,9 +24,9 @@ in a process called _Binding_.
 This page explains performance tuning optimizations that are relevant for
 large Kubernetes clusters.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 In large clusters, you can tune the scheduler's behaviour balancing
 scheduling outcomes between latency (new Pods are placed quickly) and
@@ -164,4 +164,4 @@ Node 1, Node 5, Node 2, Node 6, Node 3, Node 4
 After going over all the Nodes, it goes back to Node 1.
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 reviewers:
 - ahg-g
 title: Scheduling Framework
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.15" state="alpha" >}}
@@ -20,9 +20,9 @@ framework.
 [kep]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-scheduling/20180409-scheduling-framework.md
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 # Framework workflow
@@ -239,4 +239,3 @@ If you are using Kubernetes v1.18 or later, you can configure a set of plugins a
 a scheduler profile and then define multiple profiles to fit various kinds of workload.
 Learn more at [multiple profiles](/docs/reference/scheduling/profiles/#multiple-profiles).
 {{% /capture %}}
@@ -4,12 +4,12 @@ reviewers:
 - kevin-wangzefeng
 - bsalamat
 title: Taints and Tolerations
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
-{{% capture overview %}}
+<!-- overview -->
 [_Node affinity_](/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity),
 is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attracts* them to
 a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a
@@ -22,9 +22,9 @@ Taints and tolerations work together to ensure that pods are not scheduled
 onto inappropriate nodes. One or more taints are applied to a node; this
 marks that the node should not accept any pods that do not tolerate the taints.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Concepts
@@ -282,9 +282,10 @@ tolerations to all daemons, to prevent DaemonSets from breaking.
 Adding these tolerations ensures backward compatibility. You can also add
 arbitrary tolerations to DaemonSets.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Read about [out of resource handling](/docs/tasks/administer-cluster/out-of-resource/) and how you can configure it
 * Read about [pod priority](/docs/concepts/configuration/pod-priority-preemption/)
-{{% /capture %}}
+
@@ -2,13 +2,13 @@
 reviewers:
 - zparnold
 title: Overview of Cloud Native Security
-content_template: templates/concept
+content_type: concept
 weight: 1
 ---
 {{< toc >}}
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes Security (and security in general) is an immense topic that has many
 highly interrelated parts. In today's era where open source software is
 integrated into many of the systems that help web applications run,
@@ -17,9 +17,9 @@ think about security holistically. This guide will define a mental model
 for some general concepts surrounding Cloud Native Security. The mental model is completely arbitrary
 and you should only use it if it helps you think about where to secure your software
 stack.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## The 4C's of Cloud Native Security
 Let's start with a diagram that may help you understand how you can think about security in layers.
@@ -153,12 +153,13 @@ Most of the above mentioned suggestions can actually be automated in your code
 delivery pipeline as part of a series of checks in security. To learn about a
 more "Continuous Hacking" approach to software delivery, [this article](https://thenewstack.io/beyond-ci-cd-how-continuous-hacking-of-docker-containers-and-pipeline-driven-security-keeps-ygrene-secure/) provides more detail.
-{{% /capture %}}
+
-{{% capture whatsnext %}}
+## {{% heading "whatsnext" %}}
 * Read about [network policies for Pods](/docs/concepts/services-networking/network-policies/)
 * Read about [securing your cluster](/docs/tasks/administer-cluster/securing-a-cluster/)
 * Read about [API access control](/docs/reference/access-authn-authz/controlling-access/)
 * Read about [data encryption in transit](/docs/tasks/tls/managing-tls-in-a-cluster/) for the control plane
 * Read about [data encryption at rest](/docs/tasks/administer-cluster/encrypt-data/)
 * Read about [Secrets in Kubernetes](/docs/concepts/configuration/secret/)
-{{% /capture %}}
+
@@ -2,11 +2,11 @@
 reviewers:
 - tallclair
 title: Pod Security Standards
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 Security settings for Pods are typically applied by using [security
 contexts](/docs/tasks/configure-pod-container/security-context/). Security Contexts allow for the
@@ -21,9 +21,9 @@ However, numerous means of policy enforcement have arisen that augment or replac
 PodSecurityPolicy. The intent of this page is to detail recommended Pod security profiles, decoupled
 from any specific instantiation.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Policy Types
@@ -322,4 +322,4 @@ kernel. This allows for workloads requiring heightened permissions to still be i
 Additionally, the protection of sandboxed workloads is highly dependent on the method of
 sandboxing. As such, no single ‘recommended’ policy is recommended for all sandboxed workloads.
-{{% /capture %}}
+
@@ -3,19 +3,19 @@ reviewers:
 - rickypai
 - thockin
 title: Adding entries to Pod /etc/hosts with HostAliases
-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.
 Modification not using HostAliases is not suggested because the file is managed by Kubelet and can be overwritten on during Pod creation/restart.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Default Hosts File Content
@@ -125,5 +125,5 @@ overwritten whenever the `hosts` file is remounted by Kubelet in the event of
 a container restart or a Pod reschedule. Thus, it is not suggested to modify
 the contents of the file.
-{{% /capture %}}
+
@@ -4,12 +4,12 @@ reviewers:
 - lavalamp
 - thockin
 title: Connecting Applications with Services
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
-{{% capture overview %}}
+<!-- overview -->
 ## The Kubernetes model for connecting containers
@@ -21,9 +21,9 @@ Coordinating port allocations across multiple developers or teams that provide c
 This guide uses a simple nginx server to demonstrate proof of concept.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Exposing pods to the cluster
@@ -418,12 +418,13 @@ LoadBalancer Ingress:   a320587ffd19711e5a37606cf4a74574-1142138393.us-east-1.el
 ...
 ```
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Learn more about [Using a Service to Access an Application in a Cluster](/docs/tasks/access-application-cluster/service-access-application-cluster/)
 * Learn more about [Connecting a Front End to a Back End Using a Service](/docs/tasks/access-application-cluster/connecting-frontend-backend/)
 * Learn more about [Creating an External Load Balancer](/docs/tasks/access-application-cluster/create-external-load-balancer/)
-{{% /capture %}}
+
@@ -3,14 +3,14 @@ reviewers:
 - davidopp
 - thockin
 title: DNS for Services and Pods
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 This page provides an overview of DNS support by Kubernetes.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -262,11 +262,11 @@ The availability of Pod DNS Config and DNS Policy "`None`" is shown as below.
 | 1.10 | Beta (on by default)|
 | 1.9 | Alpha |
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 For guidance on administering DNS configurations, check
 [Configure DNS Service](/docs/tasks/administer-cluster/dns-custom-nameservers/)
 {{% /capture %}}
@@ -9,11 +9,11 @@ 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" >}}
@@ -21,9 +21,9 @@ weight: 70
 If you enable IPv4/IPv6 dual-stack networking for your Kubernetes cluster, the cluster will support the simultaneous assignment of both IPv4 and IPv6 addresses.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Supported Features
@@ -103,10 +103,11 @@ The use of publicly routable and non-publicly routable IPv6 address blocks is ac
   * Kubenet forces IPv4,IPv6 positional reporting of IPs (--cluster-cidr)
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * [Validate IPv4/IPv6 dual-stack](/docs/tasks/network/validate-dual-stack) networking
-{{% /capture %}}
+
@@ -2,12 +2,12 @@
 reviewers:
 - freehan
 title: EndpointSlices
-content_template: templates/concept
+content_type: concept
 weight: 15
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.17" state="beta" >}}
@@ -15,9 +15,9 @@ _EndpointSlices_ provide a simple way to track network endpoints within a
 Kubernetes cluster. They offer a more scalable and extensible alternative to
 Endpoints.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
@@ -175,11 +175,12 @@ necessary soon anyway. Rolling updates of Deployments also provide a natural
 repacking of EndpointSlices with all pods and their corresponding endpoints
 getting replaced.
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * [Enabling EndpointSlices](/docs/tasks/administer-cluster/enabling-endpointslices)
 * Read [Connecting Applications with Services](/docs/concepts/services-networking/connect-applications-service/)
-{{% /capture %}}
+
@@ -1,11 +1,11 @@
 ---
 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. 
@@ -16,9 +16,9 @@ that best fits your cluster.
 Kubernetes as a project currently supports and maintains [GCE](https://git.k8s.io/ingress-gce/README.md) and
  [nginx](https://git.k8s.io/ingress-nginx/README.md) controllers.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Additional controllers
@@ -64,11 +64,12 @@ controllers operate slightly differently.
 Make sure you review your ingress controller's documentation to understand the caveats of choosing it.
 {{< /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).
-{{% /capture %}}
+
@@ -2,16 +2,16 @@
 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
@@ -542,10 +542,11 @@ You can expose a Service in multiple ways that don't directly involve the Ingres
 * Use [Service.Type=LoadBalancer](/docs/concepts/services-networking/service/#loadbalancer)
 * Use [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/)
 * [Set up Ingress on Minikube with the NGINX Controller](/docs/tasks/access-application-cluster/ingress-minikube)
-{{% /capture %}}
+
@@ -4,20 +4,20 @@ 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.
 NetworkPolicy resources use {{< glossary_tooltip text="labels" term_id="label">}} to select pods and define rules which specify what traffic is allowed to the selected pods.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Prerequisites
 Network policies are implemented by the [network plugin](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/). To use network policies, you must be using a networking solution which supports NetworkPolicy. Creating a NetworkPolicy resource without a controller that implements it will have no effect.
@@ -215,12 +215,13 @@ 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/)
  walkthrough for further examples.
 - See more [recipes](https://github.com/ahmetb/kubernetes-network-policy-recipes) for common scenarios enabled by the NetworkPolicy resource.
-{{% /capture %}}
+
@@ -8,12 +8,12 @@ feature:
  description: >
    Routing of service traffic based upon cluster topology.
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
-{{% capture overview %}}
+<!-- overview -->
 {{< feature-state for_k8s_version="v1.17" state="alpha" >}}
@@ -22,9 +22,9 @@ topology of the cluster. For example, a service can specify that traffic be
 preferentially routed to endpoints that are on the same Node as the client, or
 in the same availability zone.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -192,11 +192,12 @@ spec:
 ```
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Read about [enabling Service Topology](/docs/tasks/administer-cluster/enabling-service-topology)
 * Read [Connecting Applications with Services](/docs/concepts/services-networking/connect-applications-service/)
-{{% /capture %}}
+
@@ -7,12 +7,12 @@ feature:
  description: >
    No need to modify your application to use an unfamiliar service discovery mechanism. Kubernetes gives Pods their own IP addresses and a single DNS name for a set of Pods, 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" >}}
@@ -20,9 +20,9 @@ With Kubernetes you don't need to modify your application to use an unfamiliar s
 Kubernetes gives Pods their own IP addresses and a single DNS name for a set of Pods,
 and can load-balance across them.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Motivation
@@ -1227,12 +1227,13 @@ SCTP is not supported on Windows based nodes.
 The kube-proxy does not support the management of SCTP associations when it is in userspace mode.
 {{< /warning >}}
 {{% /capture %}}
-{{% capture whatsnext %}}
+
 ## {{% heading "whatsnext" %}}
 * Read [Connecting Applications with Services](/docs/concepts/services-networking/connect-applications-service/)
 * Read about [Ingress](/docs/concepts/services-networking/ingress/)
 * Read about [EndpointSlices](/docs/concepts/services-networking/endpoint-slices/)
-{{% /capture %}}
+
@@ -5,11 +5,11 @@ 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.
 Without dynamic provisioning, cluster administrators have to manually make
@@ -19,10 +19,10 @@ to represent them in Kubernetes. The dynamic provisioning feature eliminates
 the need for cluster administrators to pre-provision storage. Instead, it
 automatically provisions storage when it is requested by users.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Background
@@ -133,4 +133,4 @@ Zones in a Region. Single-Zone storage backends should be provisioned in the Zon
 Pods are scheduled. This can be accomplished by setting the [Volume Binding
 Mode](/docs/concepts/storage/storage-classes/#volume-binding-mode).
-{{% /capture %}}
+
@@ -11,18 +11,18 @@ feature:
  description: >
    Automatically mount the storage system of your choice, whether from local storage, a public cloud provider such as <a href="https://cloud.google.com/storage/">GCP</a> or <a href="https://aws.amazon.com/products/storage/">AWS</a>, or a network storage system such as NFS, iSCSI, Gluster, Ceph, Cinder, or Flocker.
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
-{{% capture overview %}}
+<!-- overview -->
 This document describes the current state of _persistent volumes_ in Kubernetes. Familiarity with [volumes](/docs/concepts/storage/volumes/) is suggested.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -746,8 +746,9 @@ and need persistent storage, it is recommended that you use the following patter
  dynamic storage support (in which case the user should create a matching PV)
  or the cluster has no storage system (in which case the user cannot deploy
  config requiring PVCs).
-{{% /capture %}}
+
-  {{% capture whatsnext %}}
+  ## {{% heading "whatsnext" %}}
 * Learn more about [Creating a PersistentVolume](/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolume).
 * Learn more about [Creating a PersistentVolumeClaim](/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim).
@@ -759,4 +760,3 @@ and need persistent storage, it is recommended that you use the following patter
 * [PersistentVolumeSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#persistentvolumespec-v1-core)
 * [PersistentVolumeClaim](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#persistentvolumeclaim-v1-core)
 * [PersistentVolumeClaimSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#persistentvolumeclaimspec-v1-core)
 {{% /capture %}}
@@ -5,19 +5,19 @@ 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
 with [volumes](/docs/concepts/storage/volumes/) and
 [persistent volumes](/docs/concepts/storage/persistent-volumes) is suggested.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -821,4 +821,4 @@ Delaying volume binding allows the scheduler to consider all of a Pod's
 scheduling constraints when choosing an appropriate PersistentVolume for a
 PersistentVolumeClaim.
-{{% /capture %}}
+
@@ -5,10 +5,10 @@ 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.
@@ -18,9 +18,9 @@ how many volumes can be attached to a Node. It is important for Kubernetes to
 respect those limits. Otherwise, Pods scheduled on a Node could get stuck
 waiting for volumes to attach.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Kubernetes default limits
@@ -78,4 +78,4 @@ Refer to the [CSI specifications](https://github.com/container-storage-interface
 * For volumes managed by in-tree plugins that have been migrated to a CSI driver, the maximum number of volumes will be the one reported by the CSI driver.
-{{% /capture %}}
+
@@ -5,18 +5,18 @@ 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.
 {{% /capture %}}
-{{% capture body %}}
+
 <!-- body -->
 ## Introduction
@@ -70,4 +70,4 @@ The result is a new PVC with the name `clone-of-pvc-1` that has the exact same c
 Upon availability of the new PVC, the cloned PVC is consumed the same as other PVC.  It's also expected at this point that the newly created PVC is an independent object.  It can be consumed, cloned, snapshotted, or deleted independently and without consideration for it's original dataSource PVC.  This also implies that the source is not linked in any way to the newly created clone, it may also be modified or deleted without affecting the newly created clone.
-{{% /capture %}}
+
--- a/Show More
+++ b/Show More