summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-11-29 18:47:06 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-29 18:47:06 +0100
commita822fcc7cc990959569332b23da982b2093992d4 (patch)
tree7a37918c6597569cd94ba3708cd7017206e03e02
parentc47787c92de238b4608487c0667d1ed067490c76 (diff)
parentc356526351833c039dc60cf2bcc1f110e99c8c28 (diff)
downloadalpine-mksite-a822fcc7cc990959569332b23da982b2093992d4.tar.bz2
alpine-mksite-a822fcc7cc990959569332b23da982b2093992d4.tar.xz
Merge branch 'master' into production
-rw-r--r--community/code-of-conduct.md53
-rw-r--r--community/index.md2
2 files changed, 55 insertions, 0 deletions
diff --git a/community/code-of-conduct.md b/community/code-of-conduct.md
new file mode 100644
index 0000000..2d7b8b6
--- /dev/null
+++ b/community/code-of-conduct.md
@@ -0,0 +1,53 @@
+---
+title: Alpine Linux Code of Conduct
+---
+
+Alpine Linux Code of Conduct
+============================
+
+This Code of Conduct applies to participants in Alpine projects, such as the
+Alpine Linux distribution.
+
+Diversity and inclusion make the Alpine community strong. Anybody who wishes
+to participate in the Alpine community are welcome as long as they follow this
+Code of Conduct.
+
+Our goal is to maintain a safe, helpful and friendly Alpine community for
+everyone, regardless of individuality such as experience, gender identity
+and expression, sexual orientation, disability, personal appearance, body
+size, race, ethnicity, age, religion, nationality or any other protected
+categories under applicable law.
+
+
+Community Guidelines
+--------------------
+
+1. The Alpine community is a public space. Remember that actions influence the
+ public perception of the project.
+
+2. Be respectful, tolerant and forgiving towards others.
+
+3. Do not make things personal and do not take things personally.
+
+4. Avoid foul or abusive language. As cultural standards differ, what may seem
+ as a very mild statement can be perceived by others as highly abusive.
+
+5. Avoid controversial topics unless directly relevant to the project.
+
+6. While conflict is inevitable, please work through the conflict using a
+ neutral third party in a transparent manner, so that all participants
+ understand the resolution.
+
+
+Explicitly Disallowed Conduct
+-----------------------------
+
+1. Discrimination based on, but not limited to, individuality or
+ technological preference is not allowed.
+
+2. Bullying or systematic harassment of other participants is not allowed.
+
+3. Encouraging or otherwise supporting any form of discrimination or harassment
+ within the project or towards specific project participants is not allowed.
+
+
diff --git a/community/index.md b/community/index.md
index 3de4d18..b14fc9b 100644
--- a/community/index.md
+++ b/community/index.md
@@ -4,6 +4,8 @@ title: Alpine Linux Community
# Alpine Linux Community
+Participation in the Alpine community requires adherence to the [Code of Conduct](code-of-conduct.html).
+
<h2><i class="fa fa-hashtag" aria-hidden="true"></i>IRC</h2>
* [\#alpine-linux](irc://irc.freenode.net/alpine-linux) - For general discussion and quick support questions.