Merge pull request #19576 from celestehorgan/temporary-branch-2

Restructure and consolidate information in Contribute section

Author: k8s-ci-robot

content/en/docs/contribute/_index.md

@@ -4,59 +4,74 @@ title: Contribute to Kubernetes docs
 linktitle: Contribute
 main_menu: true
 weight: 80
+card:
+  name: contribute
+  weight: 10
+  title: Start contributing
 ---
 
 {{% capture overview %}}
 
-If you would like to help contribute to the Kubernetes documentation or website,
-we're happy to have your help! Anyone can contribute, whether you're new to the
-project or you've been around a long time, and whether you self-identify as a
-developer, an end user, or someone who just can't stand seeing typos.
+This website is maintained by [Kubernetes SIG Docs](/docs/contribute/#get-involved-with-sig-docs).
+
+Kubernetes documentation contributors:
+
+- Improve existing content
+- Create new content
+- Translate the documentation
+- Manage and publish the documentation parts of the Kubernetes release cycle
+
+Kubernetes documentation welcomes improvements from all contributors, new and experienced!
 
 {{% /capture %}}
 
 {{% capture body %}}
 
-## Getting Started
+## Getting started
 
-Anyone can open an issue describing problems or desired improvements with documentation, or contribute a change with a pull request (PR).
-Some tasks require more trust and need more access in the Kubernetes organization.
-See [Participating in SIG Docs](/docs/contribute/participating/) for more details about
-of roles and permissions.
-
-Kubernetes documentation resides in a GitHub repository. While we welcome
-contributions from anyone, you do need basic comfort with git and GitHub to
-operate effectively in the Kubernetes community.
+Anyone can open an issue about documentation, or contribute a change with a pull request (PR) to the [`kubernetes/website` GitHub repository](https://github.com/kubernetes/website). You need to be comfortable with [git](https://git-scm.com/) and [GitHub](https://lab.github.com/) to operate effectively in the Kubernetes community.
 
 To get involved with documentation:
 
 1. Sign the CNCF [Contributor License Agreement](https://github.com/kubernetes/community/blob/master/CLA.md).
 2. Familiarize yourself with the [documentation repository](https://github.com/kubernetes/website) and the website's [static site generator](https://gohugo.io).
-3. Make sure you understand the basic processes for [improving content](https://kubernetes.io/docs/contribute/start/#improve-existing-content) and [reviewing changes](https://kubernetes.io/docs/contribute/start/#review-docs-pull-requests).
+3. Make sure you understand the basic processes for [opening a pull request](/docs/contribute/new-content/open-a-pr/) and [reviewing changes](/docs/contribute/review/reviewing-prs/).
 
-## Contributions best practices
+Some tasks require more trust and more access in the Kubernetes organization.
+See [Participating in SIG Docs](/docs/contribute/participating/) for more details about
+roles and permissions.
 
-- Do write clear and meaningful GIT commit messages.
-- Make sure to include _Github Special Keywords_ which references the issue and automatically closes the issue when PR is merged.
-- When you make a small change to a PR like fixing a typo, any style change, or changing grammar. Make sure you squash your commits so that you dont get a large number of commits for a relatively small change.
-- Make sure you include a nice PR description depicting the code you have changes, why to change a following piece of code and ensuring there is sufficient information for the reviewer to understand your PR.
-- Additional Readings : 
-    - [chris.beams.io/posts/git-commit/](https://chris.beams.io/posts/git-commit/)
-    - [github.com/blog/1506-closing-issues-via-pull-requests ](https://github.com/blog/1506-closing-issues-via-pull-requests )
-    - [davidwalsh.name/squash-commits-git ](https://davidwalsh.name/squash-commits-git )
+## Your first contribution
 
-## Other ways to contribute
+- Read the [Contribution overview](/docs/contribute/new-content/overview/) to learn about the different ways you can contribute.
+- [Open a pull request using GitHub](/docs/contribute/new-content/new-content/#changes-using-github) to existing documentation and learn more about filing issues in GitHub.
+- [Review pull requests](/docs/contribute/review/reviewing-prs/) from other Kubernetes community members for accuracy and language.
+- Read the Kubernetes [content](/docs/contribute/style/content-guide/) and [style guides](/docs/contribute/style/style-guide/) so you can leave informed comments.
+- Learn how to [use page templates](/docs/contribute/style/page-templates/) and [Hugo shortcodes](/docs/contribute/style/hugo-shortcodes/) to make bigger changes.
 
-- To contribute to the Kubernetes community through online forums like Twitter or Stack Overflow, or learn about local meetups and Kubernetes events, visit the [Kubernetes community site](/community/).
-- To contribute to feature development, read the [contributor cheatsheet](https://github.com/kubernetes/community/tree/master/contributors/guide/contributor-cheatsheet) to get started.
+## Next steps
 
-{{% /capture %}}
+- Learn to [work from a local clone](/docs/contribute/new-content/open-a-pr/#fork-the-repo) of the repository.
+- Document [features in a release](/docs/contribute/new-content/new-features/).
+- Participate in [SIG Docs](/docs/contribute/participating/), and become a [member or reviewer](/docs/contribute/participating/#roles-and-responsibilities).
+- Start or help with a [localization](/docs/contribute/localization/).
 
-{{% capture whatsnext %}}
+## Get involved with SIG Docs
 
-- For more information about the basics of contributing to documentation, read [Start contributing](/docs/contribute/start/).
-- Follow the [Kubernetes documentation style guide](/docs/contribute/style/style-guide/) when proposing changes.
-- For more information about SIG Docs, read [Participating in SIG Docs](/docs/contribute/participating/).
-- For more information about localizing Kubernetes docs, read [Localizing Kubernetes documentation](/docs/contribute/localization/).
+[SIG Docs](/docs/contribute/participating/) is the group of contributors who publish and maintain Kubernetes documentation and the webwsite. Getting involved with SIG Docs is a great way for Kubernetes contributors (feature development or otherwise) to have a large impact on the Kubernetes project.
 
-{{% /capture %}}
+SIG Docs communicates with different methods:
+
+- [Join `#sig-docs` on the Kubernetes Slack instance](http://slack.k8s.io/). Make sure to
+  introduce yourself!
+- [Join the `kubernetes-sig-docs` mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-docs),
+  where broader discussions take place and official decisions are recorded.
+- Join the [weekly SIG Docs video meeting](https://github.com/kubernetes/community/tree/master/sig-docs). Meetings are always announced on `#sig-docs` and added to the [Kubernetes community meetings calendar](https://calendar.google.com/calendar/embed?src=cgnt364vd8s86hr2phapfjc6uk%40group.calendar.google.com&ctz=America/Los_Angeles). You'll need to download the [Zoom client](https://zoom.us/download) or dial in using a phone.
+
+## Other ways to contribute
+
+- Visit the [Kubernetes community site](/community/). Participate on Twitter or Stack Overflow, learn about local Kubernetes meetups and events, and more.
+- Read the [contributor cheatsheet](https://github.com/kubernetes/community/tree/master/contributors/guide/contributor-cheatsheet) to get involved with Kubernetes feature development.
+- Submit a [blog post or case study](/docs/contribute/new-content/blogs-case-studies/).
+
+{{% /capture %}}

content/en/docs/contribute/advanced.md

@@ -2,14 +2,14 @@
 title: Advanced contributing
 slug: advanced
 content_template: templates/concept
-weight: 30
+weight: 98
 ---
 
 {{% capture overview %}}
 
-This page assumes that you've read and mastered the
-[Start contributing](/docs/contribute/start/) and
-[Intermediate contributing](/docs/contribute/intermediate/) topics and are ready
+This page assumes that you understand how to
+[contribute to new content](/docs/contribute/new-content/overview) and
+[review others' work](/docs/contribute/review/reviewing-prs/), and are ready
 to learn about more ways to contribute. You need to use the Git command line
 client and other tools for some of these tasks.
 
@@ -19,7 +19,7 @@ client and other tools for some of these tasks.
 
 ## Be the PR Wrangler for a week
 
-SIG Docs [approvers](/docs/contribute/participating/#approvers) take regular turns as the PR wrangler for the repository and are added to the [PR Wrangler rotation scheduler](https://github.com/kubernetes/website/wiki/PR-Wranglers#2019-schedule-q1q2) for weekly rotations. 
+SIG Docs [approvers](/docs/contribute/participating/#approvers) take week-long turns [wrangling PRs](https://github.com/kubernetes/website/wiki/PR-Wranglers) for the repository.
 
 The PR wrangler’s duties include:
 
@@ -37,9 +37,9 @@ The PR wrangler’s duties include:
     - Assign `Docs Review` and `Tech Review` labels to indicate the PR's review status.
     - Assign`Needs Doc Review` or `Needs Tech Review` for PRs that haven't yet been reviewed.
     - Assign `Doc Review: Open Issues` or `Tech Review: Open Issues` for PRs that have been reviewed and require further input or action before merging.
-    - Assign `/lgtm` and `/approve` labels to PRs that can be merged. 
+    - Assign `/lgtm` and `/approve` labels to PRs that can be merged.
 - Merge PRs when they are ready, or close PRs that shouldn’t be accepted.
-- Triage and tag incoming issues daily. See [Intermediate contributing](/docs/contribute/intermediate/) for guidelines on how SIG Docs uses metadata.
+- Triage and tag incoming issues daily. See [Triage and categorize issues](/docs/contribute/review/for-approvers/#triage-and-categorize-issues) for guidelines on how SIG Docs uses metadata.
 
 ### Helpful GitHub queries for wranglers
 
@@ -60,9 +60,9 @@ reviewed is usually small. These queries specifically exclude localization PRs,
 
 ### When to close Pull Requests
 
-Reviews and approvals are one tool to keep our PR queue short and current. Another tool is closure. 
+Reviews and approvals are one tool to keep our PR queue short and current. Another tool is closure.
 
-- Close any PR where the CLA hasn’t been signed for two weeks. 
+- Close any PR where the CLA hasn’t been signed for two weeks.
 PR authors can reopen the PR after signing the CLA, so this is a low-risk way to make sure nothing gets merged without a signed CLA.
 
 - Close any PR where the author has not responded to comments or feedback in 2 or more weeks.
@@ -82,7 +82,7 @@ An automated service, [`fejta-bot`](https://github.com/fejta-bot) automatically
 SIG Docs [members](/docs/contribute/participating/#members) can propose improvements.
 
 After you've been contributing to the Kubernetes documentation for a while, you
-may have ideas for improvement to the [Style Guide](/docs/contribute/style/style-guide/) 
+may have ideas for improving the [Style Guide](/docs/contribute/style/style-guide/)
 , the [Content Guide](/docs/contribute/style/content-guide/), the toolchain used to build
 the documentation, the website style, the processes for reviewing and merging
 pull requests, or other aspects of the documentation. For maximum transparency,
@@ -134,21 +134,21 @@ rotated among SIG Docs approvers.
 ## Serve as a New Contributor Ambassador
 
 SIG Docs [approvers](/docs/contribute/participating/#approvers) can serve as
-New Contributor Ambassadors. 
+New Contributor Ambassadors.
 
-New Contributor Ambassadors work together to welcome new contributors to SIG-Docs, 
+New Contributor Ambassadors welcome new contributors to SIG-Docs,
 suggest PRs to new contributors, and mentor new contributors through their first
-few PR submissions.  
+few PR submissions.
 
-Responsibilities for New Contributor Ambassadors include: 
+Responsibilities for New Contributor Ambassadors include:
 
-- Being available on the [Kubernetes #sig-docs channel](https://kubernetes.slack.com) to answer questions from new contributors.
-- Working with PR wranglers to identify good first issues for new contributors. 
-- Mentoring new contributors through their first few PRs to the docs repo. 
+- Monitoring the [#sig-docs Slack channel](https://kubernetes.slack.com) for questions from new contributors.
+- Working with PR wranglers to identify good first issues for new contributors.
+- Mentoring new contributors through their first few PRs to the docs repo.
 - Helping new contributors create the more complex PRs they need to become Kubernetes members.
-- [Sponsoring contributors](/docs/contribute/advanced/#sponsor-a-new-contributor) on their path to becoming Kubernetes members. 
+- [Sponsoring contributors](/docs/contribute/advanced/#sponsor-a-new-contributor) on their path to becoming Kubernetes members.
 
-Current New Contributor Ambassadors are announced at each SIG-Docs meeting, and in the [Kubernetes #sig-docs channel](https://kubernetes.slack.com). 
+Current New Contributor Ambassadors are announced at each SIG-Docs meeting, and in the [Kubernetes #sig-docs channel](https://kubernetes.slack.com).
 
 ## Sponsor a new contributor
 
@@ -180,12 +180,12 @@ Approvers must meet the following requirements to be a co-chair:
 - Have been a SIG Docs approver for at least 6 months
 - Have [led a Kubernetes docs release](/docs/contribute/advanced/#coordinate-docs-for-a-kubernetes-release) or shadowed two releases
 - Understand SIG Docs workflows and tooling: git, Hugo, localization, blog subproject
-- Understand how other Kubernetes SIGs and repositories affect the SIG Docs workflow, including: [teams in k/org](https://github.com/kubernetes/org/blob/master/config/kubernetes/sig-docs/teams.yaml), [process in k/community](https://github.com/kubernetes/community/tree/master/sig-docs), plugins in [k/test-infra](https://github.com/kubernetes/test-infra/), and the role of [SIG Architecture](https://github.com/kubernetes/community/tree/master/sig-architecture). 
+- Understand how other Kubernetes SIGs and repositories affect the SIG Docs workflow, including: [teams in k/org](https://github.com/kubernetes/org/blob/master/config/kubernetes/sig-docs/teams.yaml), [process in k/community](https://github.com/kubernetes/community/tree/master/sig-docs), plugins in [k/test-infra](https://github.com/kubernetes/test-infra/), and the role of [SIG Architecture](https://github.com/kubernetes/community/tree/master/sig-architecture).
 - Commit at least 5 hours per week (and often more) to the role for a minimum of 6 months
 
 ### Responsibilities
 
-The role of co-chair is primarily one of service: co-chairs handle process and policy, schedule and run meetings, schedule PR wranglers, and generally do the things that no one else wants to do in order to build contributor capacity. 
+The role of co-chair is one of service: co-chairs build contributor capacity, handle process and policy, schedule and run meetings, schedule PR wranglers, advocate for docs in the Kubernetes community, make sure that docs succeed in Kubernetes release cycles, and keep SIG Docs focused on effective priorities.
 
 Responsibilities include:
 
@@ -228,7 +228,7 @@ For weekly meetings, copypaste the previous week's notes into the "Past meetings
 
 **Honor folks' time**:
 
-- Begin and end meetings punctually 
+Begin and end meetings on time.
 
 **Use Zoom effectively**:
 
@@ -240,9 +240,9 @@ For weekly meetings, copypaste the previous week's notes into the "Past meetings
 ### Recording meetings on Zoom
 
 When you’re ready to start the recording, click Record to Cloud.
-    
+
 When you’re ready to stop recording, click Stop.
 
 The video uploads automatically to YouTube.
 
-{{% /capture %}}
+{{% /capture %}}