Merge pull request #24686 from eagleusb/merged-master-dev-1.20

Merge master into dev-1.20 to keep in sync

Author: k8s-ci-robot

CONTRIBUTING.md

@@ -18,7 +18,7 @@ The [Kubernetes SIG Docs Discussion Group](https://groups.google.com/forum/#!for
 
 ### Style Guides and Templates
 
-Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/).
+Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](https://kubernetes.io/docs/contribute/style/page-content-types/).
 
 
 ## Contributing to Documentation

OWNERS

@@ -9,6 +9,7 @@ approvers:
 emeritus_approvers:
 # - chenopis, commented out to disable PR assignments
 # - jaredbhatti, commented out to disable PR assignments
+# - steveperry-53, commented out to disable PR assignments
 - stewart-yu 
 - zacharysarah
 

OWNERS_ALIASES

@@ -34,7 +34,6 @@ aliases:
     - sftim
     - steveperry-53
     - tengqm
-    - xiangpengzhao
     - zacharysarah
     - zparnold
   sig-docs-en-reviews: # PR reviews for English content
@@ -49,7 +48,6 @@ aliases:
     - sftim
     - steveperry-53
     - tengqm
-    - xiangpengzhao
     - zparnold
   sig-docs-es-owners: # Admins for Spanish content
     - raelga
@@ -156,7 +154,6 @@ aliases:
     - SataQiu
     - tanjunchen
     - tengqm
-    - xiangpengzhao
     - xichengliudui
     # zhangxiaoyu-zidif
   sig-docs-zh-reviews: # PR reviews for Chinese content
@@ -167,7 +164,6 @@ aliases:
     - SataQiu
     - tanjunchen
     - tengqm
-    - xiangpengzhao
     - xichengliudui
     # zhangxiaoyu-zidif
   sig-docs-pt-owners: # Admins for Portuguese content

README-hi.md

@@ -17,7 +17,7 @@
 
 * [योगदान देना शुरू करें](https://kubernetes.io/docs/contribute/start/)
 * [परिवर्तनों को अंतिम चरण में लेजाएं](http://kubernetes.io/docs/contribute/intermediate#view-your-changes-locally)
-* [पेज टेम्पलेट](http://kubernetes.io/docs/contribute/style/page-templates/)
+* [पेज टेम्पलेट](https://kubernetes.io/docs/contribute/style/page-content-types/)
 * [प्रलेखन शैली गाइड](http://kubernetes.io/docs/contribute/style/style-guide/)
 * [स्थानीयकरण कुबरनेट्स प्रलेखन](https://kubernetes.io/docs/contribute/localization/)
 
@@ -81,4 +81,4 @@ make serve
 
 कुबरनेट्स सामुदायिक भागीदारी पर पनपती है, और हम वास्तव में हमारी साइट और हमारे प्रलेखन में आपके योगदान की सराहना करते हैं!
 
-कुबरनेट्स आपकी भागीदारी पर निर्भर है, और हम हमारी साइट और प्रलेखन में आपके योगदान का मान करते हैं!
+कुबरनेट्स आपकी भागीदारी पर निर्भर है, और हम हमारी साइट और प्रलेखन में आपके योगदान का मान करते हैं!

README-ko.md

@@ -15,7 +15,7 @@
 
 * [기여 시작하기](https://kubernetes.io/docs/contribute/start/)
 * [문서화 변경 사항 스테이징하기](http://kubernetes.io/docs/contribute/intermediate#view-your-changes-locally)
-* [페이지 템플릿 사용하기](http://kubernetes.io/docs/contribute/style/page-templates/)
+* [페이지 템플릿 사용하기](https://kubernetes.io/docs/contribute/style/page-content-types/)
 * [문서화 스타일 가이드](http://kubernetes.io/docs/contribute/style/style-guide/)
 * [쿠버네티스 문서화 로컬라이징](https://kubernetes.io/docs/contribute/localization/)
 

README.md

@@ -6,7 +6,7 @@ This repository contains the assets required to build the [Kubernetes website an
 
 # Using this repository
 
-You can run the website locally using Hugo, or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
+You can run the website locally using Hugo (Extended version), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
 
 ## Prerequisites
 
@@ -15,7 +15,7 @@ To use this repository, you need the following installed locally:
 - [yarn](https://yarnpkg.com/)
 - [npm](https://www.npmjs.com/)
 - [Go](https://golang.org/)
-- [Hugo](https://gohugo.io/)
+- [Hugo (Extended version)](https://gohugo.io/)
 - A container runtime, like [Docker](https://www.docker.com/).
 
 Before you start, install the dependencies. Clone the repository and navigate to the directory:
@@ -58,6 +58,11 @@ make serve
 
 This will start the local Hugo server on port 1313. Open up your browser to http://localhost:1313 to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
 
+## Troubleshooting
+### error: failed to transform resource: TOCSS: failed to transform "scss/main.scss" (text/x-scss): this feature is not available in your current Hugo version
+
+Hugo is shipped in two set of binaries for technical reasons. The current website runs based on the **Hugo Extended** version only. In the [release page](https://github.com/gohugoio/hugo/releases) look for archives with `extended` in the name. To confirm, run `hugo version` and look for the word `extended`.
+
 ### Troubleshooting macOS for too many open files
 
 If you run `make serve` on macOS and receive the following error:

assets/scss/_case-studies.scss

@@ -2,6 +2,7 @@
 
 hr {
   background-color: #999999;
+  margin-top: 0;
 }
 
 h2 {
@@ -10,7 +11,7 @@ h2 {
 
 .subhead {
   padding-bottom: 2% !important;
-  padding-top: 0% !important;
+  padding-top: 0.75em !important;
 }
 
 .details {

assets/scss/_custom.scss

@@ -11,11 +11,6 @@ $announcement-size-adjustment: 8px;
       max-width: 100%;
     }
 
-    table {
-      margin-bottom: 1rem;
-      display: initial;
-    }
-
     @media only screen and (min-width: 768px) {
       padding-top: 2rem !important;
     }