diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 8782db5414..09acdedcd8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -17,89 +17,4 @@ under the License. --> -# Contributor Code of Conduct - -This is a copy of the [Contributor Covenant v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct.html). No changes have been made. - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience -* Focusing on what is best not just for us as individuals, but for the overall community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at . -All complaints will be reviewed and investigated promptly and fairly. -All community leaders are obligated to respect the privacy and security of the reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series of actions. - -**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC]. - -For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations +We as a community follow [The ASF Code of Conduct](https://www.apache.org/foundation/policies/conduct). diff --git a/site/content/code-of-conduct.md b/site/content/code-of-conduct.md deleted file mode 120000 index a3613c99f0..0000000000 --- a/site/content/code-of-conduct.md +++ /dev/null @@ -1 +0,0 @@ -../../CODE_OF_CONDUCT.md \ No newline at end of file diff --git a/site/content/community/_index.adoc b/site/content/community/_index.adoc index cd782eb84c..07e510ec58 100644 --- a/site/content/community/_index.adoc +++ b/site/content/community/_index.adoc @@ -42,9 +42,6 @@ cascade: | link:https://github.com/apache/polaris[GitHub] | Development takes place here! -| link:{{% ref "code-of-conduct" %}}[Code of Conduct] -| Code of Conduct - | link:{{% ref "chat-bylaws" %}}[Chat Bylaws] | A few rules around our public chat as a collaboration tool for the project. diff --git a/site/content/community/code-of-conduct.md b/site/content/community/code-of-conduct.md deleted file mode 100644 index 060fe605ea..0000000000 --- a/site/content/community/code-of-conduct.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -linkTitle: Code Of Conduct -type: docs -weight: 300 ---- - -{{< readfile "/code-of-conduct.md" >}} diff --git a/site/hugo.yaml b/site/hugo.yaml index 8af27df8f5..44defa840f 100644 --- a/site/hugo.yaml +++ b/site/hugo.yaml @@ -136,34 +136,30 @@ menu: parent: "community" url: "/community/proposals" weight: 30 - - name: "Code Of Conduct" - parent: "community" - url: "/community/code-of-conduct" - weight: 40 - name: "Chat Bylaws" parent: "community" url: "/community/chat-bylaws" - weight: 50 + weight: 40 - name: "Contributing Guidelines" parent: "community" url: "/community/contributing-guidelines" - weight: 60 + weight: 50 - name: "Community Guidelines" parent: "community" url: "/community/community-guidelines" - weight : 70 + weight : 60 - name: "Security Report" parent: "community" url: "/community/security-report" - weight: 80 + weight: 70 - name: "Release Guide" parent: "community" url: "/community/release-guide" - weight: 90 + weight: 80 - name: "Blogs" parent: "community" url: "/blog" - weight: 100 + weight: 00 - name: "GitHub" url: "https://github.com/apache/polaris" @@ -190,38 +186,45 @@ menu: params: rel: "external" external: true + - name: "Code of Conduct" + parent: "asf" + url: "https://www.apache.org/foundation/policies/conduct" + weight: 43 + params: + rel: "external" + external: true - name: "Events" parent: "asf" url: "https://www.apache.org/events/current-event.html" - weight: 43 + weight: 44 params: rel: "external" external: true - name: "Privacy" parent: "asf" url: "https://privacy.apache.org/policies/privacy-policy-public.html" - weight: 44 + weight: 45 params: rel: "external" external: true - name: "Security" parent: "asf" url: "https://github.com/apache/polaris/blob/main/SECURITY.md" - weight: 45 + weight: 46 params: rel: "external" external: true - name: "Sponsorship" parent: "asf" url: "https://www.apache.org/foundation/sponsorship.html" - weight: 46 + weight: 47 params: rel: "external" external: true - name: "Thanks" parent: "asf" url: "https://www.apache.org/foundation/thanks.html" - weight: 47 + weight: 48 params: rel: "external" external: true