From 5db4b83a662ba5f8bde82a415978bf3879e2fa5a Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Mon, 20 Aug 2018 11:31:27 -0400 Subject: [PATCH] Refactor Setup and Imported sections (#9916) * Fix link order in Setup section * fix merge conflict * Co-authored-by: Jennifer Rondeau * flip front matter order * Remove Imported section and add Community section * revert flip * change section weights * revert case study change --- content/en/docs/community/_index.md | 6 ++++++ content/en/docs/{imported => }/community/devel.md | 0 content/en/docs/{imported => }/community/guide.md | 0 content/en/docs/{imported => }/community/keps.md | 0 content/en/docs/{imported => }/community/mentoring.md | 0 content/en/docs/home/_index.md | 2 +- content/en/docs/imported/_index.md | 9 --------- content/en/docs/imported/community/_index.md | 5 ----- content/en/docs/reference/_index.md | 2 +- content/en/docs/setup/_index.md | 2 +- content/en/docs/setup/cluster-large.md | 1 + content/en/docs/setup/custom-cloud/_index.md | 1 + content/en/docs/setup/independent/_index.md | 2 +- content/en/docs/setup/multiple-zones.md | 1 + content/en/docs/setup/on-premises-vm/_index.md | 1 + content/en/docs/setup/pick-right-solution.md | 1 + content/en/docs/{imported => setup}/release/_index.md | 2 +- content/en/docs/{imported => setup}/release/notes.md | 0 content/en/docs/setup/salt.md | 1 + content/en/docs/setup/turnkey/_index.md | 1 + update-imported-docs/community.yml | 8 ++++---- update-imported-docs/release.yml | 2 +- 22 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 content/en/docs/community/_index.md rename content/en/docs/{imported => }/community/devel.md (100%) rename content/en/docs/{imported => }/community/guide.md (100%) rename content/en/docs/{imported => }/community/keps.md (100%) rename content/en/docs/{imported => }/community/mentoring.md (100%) delete mode 100644 content/en/docs/imported/_index.md delete mode 100755 content/en/docs/imported/community/_index.md rename content/en/docs/{imported => setup}/release/_index.md (78%) rename content/en/docs/{imported => setup}/release/notes.md (100%) diff --git a/content/en/docs/community/_index.md b/content/en/docs/community/_index.md new file mode 100644 index 0000000000..f3bad1fbe4 --- /dev/null +++ b/content/en/docs/community/_index.md @@ -0,0 +1,6 @@ +--- +title: "Community" +weight: 80 +--- + +This section of the Kubernetes documentation surfaces key topics imported from the [kubernetes/community](https://github.com/kubernetes/community) repo. It is the starting point for becoming a contributor -- improving docs, improving code, giving talks etc. diff --git a/content/en/docs/imported/community/devel.md b/content/en/docs/community/devel.md similarity index 100% rename from content/en/docs/imported/community/devel.md rename to content/en/docs/community/devel.md diff --git a/content/en/docs/imported/community/guide.md b/content/en/docs/community/guide.md similarity index 100% rename from content/en/docs/imported/community/guide.md rename to content/en/docs/community/guide.md diff --git a/content/en/docs/imported/community/keps.md b/content/en/docs/community/keps.md similarity index 100% rename from content/en/docs/imported/community/keps.md rename to content/en/docs/community/keps.md diff --git a/content/en/docs/imported/community/mentoring.md b/content/en/docs/community/mentoring.md similarity index 100% rename from content/en/docs/imported/community/mentoring.md rename to content/en/docs/community/mentoring.md diff --git a/content/en/docs/home/_index.md b/content/en/docs/home/_index.md index c309f2fdb6..f1a176f39d 100644 --- a/content/en/docs/home/_index.md +++ b/content/en/docs/home/_index.md @@ -10,5 +10,5 @@ js: /js/user-journeys/home.js, https://use.fontawesome.com/4bcc658a89.js display_browse_numbers: true linkTitle: "Documentation" main_menu: true -weight: 5 +weight: 80 --- diff --git a/content/en/docs/imported/_index.md b/content/en/docs/imported/_index.md deleted file mode 100644 index 2c9888d98b..0000000000 --- a/content/en/docs/imported/_index.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Imported Docs ---- - -This section of the Kubernetes documentation surfaces key topics imported from various repos in the broader Kubernetes community for better findability. - -## Community - -[kubernetes/community](https://github.com/kubernetes/community) is the starting point for becoming a contributor -- improving docs, improving code, giving talks etc. diff --git a/content/en/docs/imported/community/_index.md b/content/en/docs/imported/community/_index.md deleted file mode 100755 index 6180924f0b..0000000000 --- a/content/en/docs/imported/community/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Community" -weight: 20 ---- - diff --git a/content/en/docs/reference/_index.md b/content/en/docs/reference/_index.md index 1821d1ced9..654ab4356c 100644 --- a/content/en/docs/reference/_index.md +++ b/content/en/docs/reference/_index.md @@ -1,5 +1,5 @@ --- -title: Reference Documentation +title: Reference approvers: - chenopis linkTitle: "Reference" diff --git a/content/en/docs/setup/_index.md b/content/en/docs/setup/_index.md index 344d013f53..f2cced9b6e 100644 --- a/content/en/docs/setup/_index.md +++ b/content/en/docs/setup/_index.md @@ -4,9 +4,9 @@ reviewers: - erictune - mikedanese no_issue: true +weight: 30 title: Setup main_menu: true -weight: 30 --- This section provides instructions for installing Kubernetes and setting diff --git a/content/en/docs/setup/cluster-large.md b/content/en/docs/setup/cluster-large.md index 1428b105e0..54ca167d92 100644 --- a/content/en/docs/setup/cluster-large.md +++ b/content/en/docs/setup/cluster-large.md @@ -3,6 +3,7 @@ reviewers: - davidopp - lavalamp title: Building Large Clusters +weight: 80 --- ## Support diff --git a/content/en/docs/setup/custom-cloud/_index.md b/content/en/docs/setup/custom-cloud/_index.md index b31ce1aca8..e675c1a339 100644 --- a/content/en/docs/setup/custom-cloud/_index.md +++ b/content/en/docs/setup/custom-cloud/_index.md @@ -1,3 +1,4 @@ --- title: Custom Cloud Solutions +weight: 50 --- diff --git a/content/en/docs/setup/independent/_index.md b/content/en/docs/setup/independent/_index.md index d5332e7516..f5698df388 100755 --- a/content/en/docs/setup/independent/_index.md +++ b/content/en/docs/setup/independent/_index.md @@ -1,5 +1,5 @@ --- title: "Bootstrapping Clusters with kubeadm" -weight: 20 +weight: 30 --- diff --git a/content/en/docs/setup/multiple-zones.md b/content/en/docs/setup/multiple-zones.md index fb6c313fca..2a9c097cb1 100644 --- a/content/en/docs/setup/multiple-zones.md +++ b/content/en/docs/setup/multiple-zones.md @@ -4,6 +4,7 @@ reviewers: - justinsb - quinton-hoole title: Running in Multiple Zones +weight: 90 --- ## Introduction diff --git a/content/en/docs/setup/on-premises-vm/_index.md b/content/en/docs/setup/on-premises-vm/_index.md index d824259ab6..96054a37cd 100644 --- a/content/en/docs/setup/on-premises-vm/_index.md +++ b/content/en/docs/setup/on-premises-vm/_index.md @@ -1,3 +1,4 @@ --- title: On-Premises VMs +weight: 60 --- diff --git a/content/en/docs/setup/pick-right-solution.md b/content/en/docs/setup/pick-right-solution.md index 331202dbfa..ac8fb06ae7 100644 --- a/content/en/docs/setup/pick-right-solution.md +++ b/content/en/docs/setup/pick-right-solution.md @@ -4,6 +4,7 @@ reviewers: - erictune - mikedanese title: Picking the Right Solution +weight: 10 content_template: templates/concept --- diff --git a/content/en/docs/imported/release/_index.md b/content/en/docs/setup/release/_index.md similarity index 78% rename from content/en/docs/imported/release/_index.md rename to content/en/docs/setup/release/_index.md index 5d2ebd4bc2..7187379fee 100755 --- a/content/en/docs/imported/release/_index.md +++ b/content/en/docs/setup/release/_index.md @@ -1,5 +1,5 @@ --- title: "Downloading Kubernetes" -weight: 30 +weight: 20 --- diff --git a/content/en/docs/imported/release/notes.md b/content/en/docs/setup/release/notes.md similarity index 100% rename from content/en/docs/imported/release/notes.md rename to content/en/docs/setup/release/notes.md diff --git a/content/en/docs/setup/salt.md b/content/en/docs/setup/salt.md index 1fbedacba3..738d7e6c08 100644 --- a/content/en/docs/setup/salt.md +++ b/content/en/docs/setup/salt.md @@ -2,6 +2,7 @@ reviewers: - davidopp title: Configuring Kubernetes with Salt +weight: 70 --- The Kubernetes cluster can be configured using Salt. diff --git a/content/en/docs/setup/turnkey/_index.md b/content/en/docs/setup/turnkey/_index.md index da6af45f1f..a5781ada14 100644 --- a/content/en/docs/setup/turnkey/_index.md +++ b/content/en/docs/setup/turnkey/_index.md @@ -1,3 +1,4 @@ --- title: Turnkey Cloud Solutions +weight: 40 --- diff --git a/update-imported-docs/community.yml b/update-imported-docs/community.yml index b812d53007..9834200093 100644 --- a/update-imported-docs/community.yml +++ b/update-imported-docs/community.yml @@ -5,10 +5,10 @@ repos: gen-absolute-links: true files: - src: contributors/devel/README.md - dst: docs/imported/community/devel.md + dst: content/en/docs/community/devel.md - src: contributors/guide/README.md - dst: docs/imported/community/guide.md + dst: content/en/docs/community/guide.md - src: mentoring/README.md - dst: docs/imported/community/mentoring.md + dst: content/en/docs/community/mentoring.md - src: keps/0001-kubernetes-enhancement-proposal-process.md - dst: docs/imported/community/keps.md + dst: content/en/docs/community/keps.md diff --git a/update-imported-docs/release.yml b/update-imported-docs/release.yml index 68fbe684f0..71cd1c25d8 100644 --- a/update-imported-docs/release.yml +++ b/update-imported-docs/release.yml @@ -5,4 +5,4 @@ repos: gen-absolute-links: true files: - src: CHANGELOG-1.11.md - dst: content/en/docs/imported/release/notes.md + dst: content/en/docs/setup/release/notes.md