From e46b00d4c47a7118d2db20bea0cd1d9faf224ef0 Mon Sep 17 00:00:00 2001 From: Brian Hulette Date: Mon, 22 Feb 2021 13:41:57 -0800 Subject: [PATCH 1/4] Revert "Revert 'become a committer' changes, remove 'attributes' page." This reverts commit 5a6620ddff91a4bf15d56eaedcbbac6f1d7c5f30. --- .../site/content/en/contribute/attributes.md | 66 +++++++++++++++ .../en/contribute/become-a-committer.md | 83 +++---------------- .../partials/section-menu/en/contribute.html | 1 + 3 files changed, 78 insertions(+), 72 deletions(-) create mode 100644 website/www/site/content/en/contribute/attributes.md diff --git a/website/www/site/content/en/contribute/attributes.md b/website/www/site/content/en/contribute/attributes.md new file mode 100644 index 000000000000..27598eb58a9b --- /dev/null +++ b/website/www/site/content/en/contribute/attributes.md @@ -0,0 +1,66 @@ +--- +title: "Attributes of a Beam community member" +layout: "arrow_template" +--- + + + +# Attributes of a Beam community member + +{{< figure src="/images/community/messages-icon.svg" >}} + +## Knows, upholds, and reinforces the Beam community’s practices + +- They have a proven commitment to the project +- They share their intentions with the community +- They accept and integrate community feedback in their plans, designs, code, etc. +- They earnestly try to make Beam better with their contributions + +In particular, if a code contributor: + +- They earnestly try to make Beam better with their own code +- They earnestly try to make Beam better with code review +- They accept and integrate feedback on their code +- They know, follow, and enforce Beam’s practices while reviewing/merging code - style, documentation, testing, backward compatibility, etc. + +{{< figure src="/images/community/beam-logo-icon.svg" >}} + +## Knows, upholds, and reinforces the Apache Software Foundation code of conduct + +In particular, we manifestly strive to: + +- Be open +- Be empathetic +- Be welcoming +- Be friendly +- Be patient +- Be collaborative +- Be inquisitive +- Be careful in the words that they choose + +[To learn more see the ASF documentation.](https://httpd.apache.org/docs/) + +{{< figure src="/images/community/diamond-icon.svg" >}} + +## Knows, upholds, and reinforces the responsibilities of an Apache Software Foundation committer + +- They help create a product that will outlive the interest of any particular volunteer (including themselves) +- They grow and maintain the health of the Apache community +- They help out with surrounding work, such as the website & documentation +- They help users +- They can be trusted to decide when code is ready for release, or when to ask someone else to make the judgment +- They can be trusted to decide when to merge code (if a code contributor) or when to ask someone else to make the judgment + +[To learn more see the ASF documentation.](https://httpd.apache.org/docs/) diff --git a/website/www/site/content/en/contribute/become-a-committer.md b/website/www/site/content/en/contribute/become-a-committer.md index 5d86beb471e0..822ee62a56c4 100644 --- a/website/www/site/content/en/contribute/become-a-committer.md +++ b/website/www/site/content/en/contribute/become-a-committer.md @@ -1,6 +1,7 @@ --- title: "Become A Committer" --- + -# Become a Committer - -An Apache Beam -[committer](https://www.apache.org/foundation/how-it-works.html#committers) has -write access to the repository for merging pull requests, but you don't have -to be a code contributor to become a committer. Becoming a committer means that -you have the project's trust. Read the [ASF -documentation](https://www.apache.org/dev/committers.html#committer-responsibilities) -for more about being a committer in the Apache Software Foundation. - -The [PMC](https://www.apache.org/foundation/how-it-works.html#pmc-members) -makes someone a committer via nomination, discussion, and then majority vote. -We use data from as many sources as possible to inform our reasoning. Here are -some examples: - - - [dev@ archives](https://lists.apache.org/list.html?dev@beam.apache.org) and [statistics](https://lists.apache.org/trends.html?dev@beam.apache.org) - - [user@ archives](https://lists.apache.org/list.html?user@beam.apache.org) and [statistics](https://lists.apache.org/trends.html?user@beam.apache.org) - - [`apache-beam` StackOverflow tag](https://stackoverflow.com/questions/tagged/apache-beam) - - Git metrics for [Beam](https://github.com/apache/beam/graphs/contributors) - - Code reviews given and received on - [Beam](https://github.com/apache/beam/pulls) - - Clear areas of ownership (a runner, a DSL, IO connector, documentation, - etc.) - - Public events - - Firsthand PMC testimonials - -The PMC has assembled the following set of guidelines for becoming a committer. - -## An Apache Beam committer... - -### Takes many forms - -There are many actions other than coding that build the trust we place in a -committer - code review, design discussion, user support, community outreach, improving -infrastructure, documentation, project management, etc. - -### Knows, upholds, and reinforces the Apache Software Foundation code of conduct +# Become a Beam Committer -See the [ASF -documentation](https://www.apache.org/foundation/policies/conduct.html). In -particular, they manifestly strive to: +An Apache Beam [committer](https://www.apache.org/foundation/how-it-works.html#committers) takes many forms. There are many actions other than coding that build the trust we place in a committer - code review, design discussion, user support, community outreach, improving infrastructure, documentation, project management, etc. - - Be open - - Be empathetic - - Be welcoming - - Be friendly - - Be patient - - Be collaborative - - Be inquisitive - - Be careful in the words that they choose +### What does it mean being a commiter? -### Knows, upholds, and reinforces the responsibilities of an Apache Software Foundation committer +An Apache Beam committer has write access to the repository for merging pull requests, but you don’t have to be a code contributor to become a committer. Becoming a committer means that you have the project’s trust. Read the [ASF documentation](https://www.apache.org/dev/committers.html#committer-responsibilities) for more about being a committer in the Apache Software Foundation. -See the [ASF documentation](https://www.apache.org/dev/committers.html#committer-responsibilities). +The [PMC](https://www.apache.org/foundation/how-it-works.html#pmc-members) makes someone a committer via nomination, discussion, and then majority vote. We use data from as many sources as possible to inform our reasoning. - - They help create a product that will outlive the interest of any particular - volunteer (including themselves) - - They grow and maintain the health of the Apache community - - They help out with surrounding work, such as the website & documentation - - They help users - - They can be trusted to decide when code is ready for release, or when to ask - someone else to make the judgment - - They can be trusted to decide when to merge code (if a code contributor) or - when to ask someone else to make the judgment +### Different Ways you can contribute +Everyone is welcome to join and contribute to the project in many ways, not only with code contributions. Things like asking questions, reporting bugs, proposing new features, improving documentation or the website, organizing events or writing blog posts, are also welcome and recognized. -### Knows, upholds, and reinforces the Beam community’s practices +{{< contributor/list_with_icons ways_of_contribution >}} - - They have a proven commitment to the project - - They share their intentions with the community - - They accept and integrate community feedback in their plans, designs, - code, etc. - - They earnestly try to make Beam better with their contributions - - In particular, if a code contributor: - - They earnestly try to make Beam better with their own code - - They earnestly try to make Beam better with code review - - They accept and integrate feedback on their code - - They know, follow, and enforce Beam’s practices while - reviewing/merging code - style, documentation, testing, backward - compatibility, etc. +### What are the traits of an Apache Beam Committer? +{{< contributor/row_of_traits committer_traits >}} diff --git a/website/www/site/layouts/partials/section-menu/en/contribute.html b/website/www/site/layouts/partials/section-menu/en/contribute.html index 8cae5b106464..d276460e8e5b 100644 --- a/website/www/site/layouts/partials/section-menu/en/contribute.html +++ b/website/www/site/layouts/partials/section-menu/en/contribute.html @@ -13,6 +13,7 @@
  • Contribute
  • Get started contributing
  • Get Help
    • +
  • Attributes of a Beam community member
  • Technical Docs From 6d7a797db83f831509408776980e1d272b59a2d6 Mon Sep 17 00:00:00 2001 From: Brian Hulette Date: Wed, 24 Feb 2021 09:31:58 -0800 Subject: [PATCH 2/4] Fix order, images --- website/www/site/content/en/contribute/attributes.md | 4 ++-- website/www/site/data/en/committer_traits.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/www/site/content/en/contribute/attributes.md b/website/www/site/content/en/contribute/attributes.md index 27598eb58a9b..6fdb4b8b8f82 100644 --- a/website/www/site/content/en/contribute/attributes.md +++ b/website/www/site/content/en/contribute/attributes.md @@ -19,7 +19,7 @@ limitations under the License. # Attributes of a Beam community member -{{< figure src="/images/community/messages-icon.svg" >}} +{{< figure src="/images/community/beam-logo-icon.svg" >}} ## Knows, upholds, and reinforces the Beam community’s practices @@ -35,7 +35,7 @@ In particular, if a code contributor: - They accept and integrate feedback on their code - They know, follow, and enforce Beam’s practices while reviewing/merging code - style, documentation, testing, backward compatibility, etc. -{{< figure src="/images/community/beam-logo-icon.svg" >}} +{{< figure src="/images/community/messages-icon.svg" >}} ## Knows, upholds, and reinforces the Apache Software Foundation code of conduct diff --git a/website/www/site/data/en/committer_traits.yaml b/website/www/site/data/en/committer_traits.yaml index b9c83621f3fd..c7f1ea3d48a0 100644 --- a/website/www/site/data/en/committer_traits.yaml +++ b/website/www/site/data/en/committer_traits.yaml @@ -10,12 +10,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +- body: { text: "Learn more.", link: /contribute/attributes/#knows-upholds-and-reinforces-the-beam-communitys-practices } + bolded: Knows, upholds, and reinforces the Beam community’s practices. + icon: icons/contributor/become a committer/beam-logo-icon.svg - body: { text: "Learn more.", link: /contribute/attributes#knows-upholds-and-reinforces-the-apache-software-foundation-code-of-conduct } bolded: Knows, upholds, and reinforces the Apache Software Foundation code of conduct. icon: icons/contributor/become a committer/messages-icon.svg - body: { text: "Learn more.", link: /contribute/attributes#knows-upholds-and-reinforces-the-responsibilities-of-an-apache-software-foundation-committer } bolded: Knows, upholds, and reinforces the responsibilities of an Apache Software Foundation committer. - icon: icons/contributor/become a committer/beam-logo-icon.svg -- body: { text: "Learn more.", link: /contribute/attributes/#knows-upholds-and-reinforces-the-beam-communitys-practices } - bolded: Knows, upholds, and reinforces the Beam community’s practices. icon: icons/contributor/become a committer/diamond-icon.svg From f00a5eb30fa898b564373a7cb9bd646ee1e49788 Mon Sep 17 00:00:00 2001 From: Brian Hulette Date: Wed, 24 Feb 2021 09:36:39 -0800 Subject: [PATCH 3/4] Add process section --- .../en/contribute/become-a-committer.md | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/website/www/site/content/en/contribute/become-a-committer.md b/website/www/site/content/en/contribute/become-a-committer.md index 822ee62a56c4..5aa165a559f1 100644 --- a/website/www/site/content/en/contribute/become-a-committer.md +++ b/website/www/site/content/en/contribute/become-a-committer.md @@ -24,9 +24,7 @@ An Apache Beam [committer](https://www.apache.org/foundation/how-it-works.html#c An Apache Beam committer has write access to the repository for merging pull requests, but you don’t have to be a code contributor to become a committer. Becoming a committer means that you have the project’s trust. Read the [ASF documentation](https://www.apache.org/dev/committers.html#committer-responsibilities) for more about being a committer in the Apache Software Foundation. -The [PMC](https://www.apache.org/foundation/how-it-works.html#pmc-members) makes someone a committer via nomination, discussion, and then majority vote. We use data from as many sources as possible to inform our reasoning. - -### Different Ways you can contribute +### Ways you can contribute Everyone is welcome to join and contribute to the project in many ways, not only with code contributions. Things like asking questions, reporting bugs, proposing new features, improving documentation or the website, organizing events or writing blog posts, are also welcome and recognized. {{< contributor/list_with_icons ways_of_contribution >}} @@ -34,3 +32,20 @@ Everyone is welcome to join and contribute to the project in many ways, not only ### What are the traits of an Apache Beam Committer? {{< contributor/row_of_traits committer_traits >}} + +### Process +The [PMC](https://www.apache.org/foundation/how-it-works.html#pmc-members) +makes someone a committer via nomination, discussion, and then majority vote. +We use data from as many sources as possible to inform our reasoning. Here are +some examples: + + - [dev@ archives](https://lists.apache.org/list.html?dev@beam.apache.org) and [statistics](https://lists.apache.org/trends.html?dev@beam.apache.org) + - [user@ archives](https://lists.apache.org/list.html?user@beam.apache.org) and [statistics](https://lists.apache.org/trends.html?user@beam.apache.org) + - [`apache-beam` StackOverflow tag](https://stackoverflow.com/questions/tagged/apache-beam) + - Git metrics for [Beam](https://github.com/apache/beam/graphs/contributors) + - Code reviews given and received on + [Beam](https://github.com/apache/beam/pulls) + - Clear areas of ownership (a runner, a DSL, IO connector, documentation, + etc.) + - Public events + - Firsthand PMC testimonials From 23129c8f2eedd95bb2c377da47206cf57595ddc4 Mon Sep 17 00:00:00 2001 From: Brian Hulette Date: Wed, 24 Feb 2021 09:36:52 -0800 Subject: [PATCH 4/4] fix typo --- website/www/site/content/en/contribute/become-a-committer.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/www/site/content/en/contribute/become-a-committer.md b/website/www/site/content/en/contribute/become-a-committer.md index 5aa165a559f1..126010fb7b6d 100644 --- a/website/www/site/content/en/contribute/become-a-committer.md +++ b/website/www/site/content/en/contribute/become-a-committer.md @@ -20,7 +20,7 @@ limitations under the License. An Apache Beam [committer](https://www.apache.org/foundation/how-it-works.html#committers) takes many forms. There are many actions other than coding that build the trust we place in a committer - code review, design discussion, user support, community outreach, improving infrastructure, documentation, project management, etc. -### What does it mean being a commiter? +### What does it mean to be a committer? An Apache Beam committer has write access to the repository for merging pull requests, but you don’t have to be a code contributor to become a committer. Becoming a committer means that you have the project’s trust. Read the [ASF documentation](https://www.apache.org/dev/committers.html#committer-responsibilities) for more about being a committer in the Apache Software Foundation. @@ -29,7 +29,7 @@ Everyone is welcome to join and contribute to the project in many ways, not only {{< contributor/list_with_icons ways_of_contribution >}} -### What are the traits of an Apache Beam Committer? +### What are the traits of an Apache Beam committer? {{< contributor/row_of_traits committer_traits >}}