summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-03-14 11:22:46 +0000
committersajolida <sajolida@pimienta.org>2017-03-14 11:27:27 +0000
commitc2ac428536584a57951f124934d22f74dfa2cd62 (patch)
treecd30cdd24bc80b4afdc6738f069cd91f5b12565e
parent6dee10b6f8a718d18b59bd3ec20be2f0c9f1fd8b (diff)
Link Code of Conduct and Social Contract together
-rw-r--r--wiki/src/blueprint/Social_Contract.mdwn2
-rw-r--r--wiki/src/contribute/working_together/code_of_conduct.mdwn3
2 files changed, 4 insertions, 1 deletions
diff --git a/wiki/src/blueprint/Social_Contract.mdwn b/wiki/src/blueprint/Social_Contract.mdwn
index 6f7482c..3988942 100644
--- a/wiki/src/blueprint/Social_Contract.mdwn
+++ b/wiki/src/blueprint/Social_Contract.mdwn
@@ -34,6 +34,8 @@ Bugfixes, code improvements, Debian packaging, as well as work on usability issu
We want to produce Tails in a way that encourages participation, which requires publicly documenting what can be improved.
As Tails is created in such a transparent manner, anyone is encouraged to participate, review it and point out problems.
+To make our community a welcoming place for everybody we agreed on a [[Code of Conduct|contribute/working_together/code_of_conduct]].
+
## 5. We will never harm our users intentionally.
We will always do our best to create secure and usable tools. We will never willingly include backdoors or malicious software nor will we cooperate with any entity wanting us to harm our users.
diff --git a/wiki/src/contribute/working_together/code_of_conduct.mdwn b/wiki/src/contribute/working_together/code_of_conduct.mdwn
index 054e346..eee53d2 100644
--- a/wiki/src/contribute/working_together/code_of_conduct.mdwn
+++ b/wiki/src/contribute/working_together/code_of_conduct.mdwn
@@ -3,7 +3,8 @@
Like the technical community as a whole, the Tails team and community
is made up of a mixture of people from all over the world, working on
every aspect of the mission &mdash; including mentorship, teaching, and
-connecting people.
+connecting people. <!-- The commitments that we stand by as a community
+are described in the [[Tails Social Contract|XXX-Fix-this-link]]. -->
Diversity is one of our huge strengths, but it can also lead to
communication issues and unhappiness. To that end, we have a few