Merge pull request #23459 from savitharaghunathan/merged-master-release-1.18

Branch sync: Merge `master` into `release 1.18`
2020-08-26 14:27:00 -05:00
parent bdce54543f 46446654d0
commit 169627295a
3 changed files with 4 additions and 2 deletions
@@ -42,7 +42,6 @@ Kubernetes ist Open Source und bietet Dir die Freiheit, die Infrastruktur vor Or
        <button id="desktopShowVideoButton" onclick="kub.showVideo()">Video ansehen</button>
        <br>
        <br>
-        <br>
        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu20" button id="desktopKCButton">Besuche die KubeCon - 13-16 August 2020 in Amsterdam</a>
        <br>
        <br>
@@ -544,6 +544,6 @@ Events:

 ## {{% heading "whatsnext" %}}

-* [인그레스] API](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#ingress-v1beta1-networking-k8s-io)에 대해 배우기
+* [인그레스 API](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#ingress-v1beta1-networking-k8s-io)에 대해 배우기
 * [인그레스 컨트롤러](/ko/docs/concepts/services-networking/ingress-controllers/)에 대해 배우기
 * [NGINX 컨트롤러로 Minikube에서 인그레스 구성하기](/docs/tasks/access-application-cluster/ingress-minikube)
@@ -176,6 +176,9 @@ other = "Objetivos"
 [prerequisites_heading]
 other = "Antes de você começar"

+[subscribe_button]
+other = "Se inscrever"
+
 [ui_search_placeholder]
 other = "Procurar"