diff --git a/Makefile b/Makefile index 64ceef89a0..3657cb577a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PONY: all build build-preview help serve +.PHONY: all build build-preview help serve help: ## Show this help. @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) diff --git a/_data/concepts.yml b/_data/concepts.yml index a9a7c3eb29..71c6512909 100644 --- a/_data/concepts.yml +++ b/_data/concepts.yml @@ -2,9 +2,16 @@ bigheader: "Concepts" abstract: "Detailed explanations of Kubernetes system concepts and abstractions." toc: - docs/concepts/index.md +- title: Kubectl Command Line + section: + - docs/concepts/tools/kubectl/object-management-overview.md +- title: Kubernetes Objects + section: + - docs/concepts/abstractions/overview.md + - docs/concepts/abstractions/pod.md + - title: Controllers + section: + - docs/concepts/abstractions/controllers/statefulsets.md - title: Object Metadata section: - docs/concepts/object-metadata/annotations.md -- title: Controllers - section: - - docs/concepts/abstractions/controllers/statefulsets.md diff --git a/_data/guides.yml b/_data/guides.yml index c1bdd99a4e..f66d0706ee 100644 --- a/_data/guides.yml +++ b/_data/guides.yml @@ -8,6 +8,7 @@ toc: - docs/whatisk8s.md - docs/getting-started-guides/kubeadm.md - docs/getting-started-guides/kops.md + - docs/getting-started-guides/kargo.md - docs/hellonode.md - docs/getting-started-guides/kubectl.md - docs/getting-started-guides/binary_release.md @@ -65,11 +66,8 @@ toc: - title: Containers and Pods section: - - docs/user-guide/simple-nginx.md - - docs/user-guide/pods/single-container.md - docs/user-guide/pods/multi-container.md - docs/user-guide/pods/init-container.md - - docs/user-guide/configuring-containers.md - docs/user-guide/pod-templates.md - docs/user-guide/containers.md - docs/user-guide/environment-guide/index.md diff --git a/_data/support.yml b/_data/support.yml index c25faa70f8..a6b13e9d09 100644 --- a/_data/support.yml +++ b/_data/support.yml @@ -3,17 +3,6 @@ abstract: "Troubleshooting resources, frequently asked questions, and community toc: - docs/troubleshooting.md -- title: Contributing to the Kubernetes Docs - section: - - editdocs.md - - docs/contribute/create-pull-request.md - - docs/contribute/write-new-topic.md - - docs/contribute/stage-documentation-changes.md - - docs/contribute/page-templates.md - - docs/contribute/review-issues.md - - docs/contribute/style-guide.md - - - title: Troubleshooting section: - docs/user-guide/debugging-pods-and-replication-controllers.md @@ -31,6 +20,16 @@ toc: - title: Services FAQ path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/ +- title: Contributing to the Kubernetes Docs + section: + - editdocs.md + - docs/contribute/create-pull-request.md + - docs/contribute/write-new-topic.md + - docs/contribute/stage-documentation-changes.md + - docs/contribute/page-templates.md + - docs/contribute/review-issues.md + - docs/contribute/style-guide.md + - title: Other Resources section: - title: Kubernetes Issue Tracker on GitHub @@ -40,6 +39,6 @@ toc: path: https://github.com/kubernetes/kubernetes/releases/ - title: Release Roadmap path: https://github.com/kubernetes/kubernetes/milestones/ - + - title: Deprecation Policy path: /docs/deprecation-policy.md diff --git a/_data/tasks.yml b/_data/tasks.yml index 13315bf5ed..231a583524 100644 --- a/_data/tasks.yml +++ b/_data/tasks.yml @@ -1,5 +1,5 @@ bigheader: "Tasks" -abstract: "Step-by-step instructions for performing operations with Kuberentes." +abstract: "Step-by-step instructions for performing operations with Kubernetes." toc: - docs/tasks/index.md diff --git a/_includes/case-study-styles.html b/_includes/case-study-styles.html deleted file mode 100644 index 48058bd27b..0000000000 --- a/_includes/case-study-styles.html +++ /dev/null @@ -1,313 +0,0 @@ - - diff --git a/_includes/code.html b/_includes/code.html index ce653054e8..59a27ebf1a 100644 --- a/_includes/code.html +++ b/_includes/code.html @@ -7,5 +7,20 @@ ``` {: id="{{include.file | handleize}}"} {% endcapture %} -
{% if ghlink %}{% endif %}{{include.file}} |
---|
{{ mysample | markdownify }} |
+ {% if ghlink %}{% endif %}
+ {{include.file}}
+ {% if ghlink %}{% endif %}
+ |
+
---|
{{ mysample | markdownify }} | +