summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Williams <owilliams@mixxx.org>2016-04-30 11:22:50 -0400
committerOwen Williams <owilliams@mixxx.org>2016-04-30 11:24:24 -0400
commit7298ea2f64594f8e7aae878ad0ffe311420668b9 (patch)
tree1e350ea08f0d4e59ff57e59af6d18b01831b12bd
parent386bfa128bc23c4b85f02d8d859d9780777d7944 (diff)
Code of Conduct: mixxx-specific edits
We've stripped the paragraph about escalating above the community managers because we're a small organization and there's no one else to escalate to. A list of community managers will be created on the wiki
-rw-r--r--CODE_OF_CONDUCT.md33
1 files changed, 16 insertions, 17 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 08bac73245..7577cad829 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,15 +1,16 @@
-# Chromium Code of Conduct
+# Mixxx Code of Conduct
-Google and the Chromium team are committed to preserving and fostering a
+The Mixxx team is committed to preserving and fostering a
diverse, welcoming community. Below is our community code of conduct, which
-applies to our repos and organizations, mailing lists, blog content, and any
-other Chromium-supported communication group, as well as any private
+applies to our repos and organizations, mailing lists, forums, IRC channels,
+blog content, and any
+other Mixxx-supported communication group, as well as any private
communication initiated in the context of these spaces.
Simply put, community discussions should be
* respectful and kind;
- * about Chromium;
+ * about Mixxx;
* about features and code, not the individuals involved.
## Be respectful and constructive.
@@ -17,7 +18,7 @@ Simply put, community discussions should be
Treat everyone with respect. Build on each other's ideas. Each of us has the
right to enjoy our experience and participate without fear of harassment,
discrimination, or condescension, whether blatant or subtle. Remember that
-Chromium is a geographically distributed team and that you may not be
+Mixxx is a geographically distributed team and that you may not be
communicating with someone in their primary language. We all get frustrated
when working on hard problems, but we cannot allow that frustration to turn
into personal attacks.
@@ -30,14 +31,14 @@ they are doing - politely bringing their behavior to their attention is
encouraged.
If you are uncomfortable speaking up, or feel that your concerns are not being
-duly considered, you can email community@chromium.org to request involvement
+duly considered, you can email community@mixxx.org to request involvement
from a community manager. You may also email any of the community managers
directly. All concerns shared with community managers will be kept
confidential. In cases where a public response is deemed necessary, the
identities of victims and reporters will remain confidential unless those
individuals instruct us otherwise.
-While all reports will be taken seriously, the Chromium community managers may
+While all reports will be taken seriously, the Mixxx community managers may
not act on complaints that they feel are not violations of this code of
conduct.
@@ -57,27 +58,25 @@ conduct.
## Consequences for failing to comply with this policy
Consequences for failing to comply with this policy may include, at the sole
-discretion of the Chromium community managers:
+discretion of the Mixxx community managers:
* a request for an apology;
* a private or public warning or reprimand;
- * a temporary ban from the mailing list, blog, Chromium repository or
- organization, or other Chromium-supported communication group, including
+ * a temporary ban from the mailing list, blog, Mixxx repository or
+ organization, or other Mixxx-supported communication group, including
loss of committer status;
* a permanent ban from any of the above, or from all current and future
- Chromium-supported or Google-supported communities, including loss of
+ Mixxx-supported communities, including loss of
committer status.
Participants warned to stop any harassing behavior are expected to comply
immediately; failure to do so will result in an escalation of consequences.
-The decisions of the Chromium community managers may be appealed via
-community-appeals@chromium.org.
-
## Acknowledgements
-This Code of Conduct is based on the Geek Feminism Code of Conduct, the Django
-Code of Conduct and the Geek Feminism Wiki "Effective codes of conduct" guide.
+This Code of Conduct is based on the Chromium Code of Conduct, which credits
+the Geek Feminism Code of Conduct, the Django Code of Conduct and the Geek
+Feminism Wiki "Effective codes of conduct" guide.
## License