merge master to 1.10, with fixes (#7682)
This commit is contained in:
committed by
k8s-ci-robot
parent
bb8c59a640
commit
44b51d6056
+6
-8
@@ -1,19 +1,16 @@
|
||||
bigheader: "Documentation Home"
|
||||
bigheader: "About"
|
||||
abstract: "Documentation for using and learning about Kubernetes."
|
||||
toc:
|
||||
- docs/home/index.md
|
||||
- docs/home/supported-doc-versions.md
|
||||
|
||||
- title: Release Notes
|
||||
path: https://git.k8s.io/kubernetes/CHANGELOG.md
|
||||
- title: Release Roadmap
|
||||
path: https://github.com/kubernetes/kubernetes/milestones/
|
||||
|
||||
- docs/tasks/debug-application-cluster/troubleshooting.md
|
||||
- title: Supported Doc Versions
|
||||
path: /docs/home/supported-doc-versions/
|
||||
|
||||
- title: Contributing to the Kubernetes Docs
|
||||
landing_page: /editdocs/
|
||||
section:
|
||||
- editdocs.md
|
||||
- docs/home/contribute/participating.md
|
||||
- docs/home/contribute/create-pull-request.md
|
||||
- docs/home/contribute/write-new-topic.md
|
||||
- docs/home/contribute/stage-documentation-changes.md
|
||||
@@ -21,6 +18,7 @@ toc:
|
||||
- docs/home/contribute/review-issues.md
|
||||
- docs/home/contribute/style-guide.md
|
||||
- docs/home/contribute/includes.md
|
||||
- docs/home/contribute/localization.md
|
||||
|
||||
- title: Updating Automatically Generated Reference Pages
|
||||
section:
|
||||
|
||||
Reference in New Issue
Block a user