summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wiki/src/blueprint/Social_Contract.mdwn25
1 files changed, 14 insertions, 11 deletions
diff --git a/wiki/src/blueprint/Social_Contract.mdwn b/wiki/src/blueprint/Social_Contract.mdwn
index 4047135..69a71eb 100644
--- a/wiki/src/blueprint/Social_Contract.mdwn
+++ b/wiki/src/blueprint/Social_Contract.mdwn
@@ -10,37 +10,40 @@ This is a promise from our developer community to the rest of the world, affirmi
## 1. By developing Tails and publishing related documentation we try to provide usable tools for anonymity and privacy
-We believe that privacy, the free exchange of ideas, and equal access to information are essential to free and open societies. Through our community standards and the code we write and deploy, we provide tools that empower all people to protect and advance these rights.
+We believe that privacy, the free exchange of ideas, and equal access to information are essential to free and open societies. Through our community standards and the tools we write and deploy, we provide tools that empower all people to protect and advance these concepts.
## 2. Tails and the related documentation is and will remain free software
Equal access to information includes the free availability of our code and documentation as well as the transparency of our decision making processes. Tails will always be free to use, remix, adapt and distribute.
-When we write new components of the Tails system, we will license them in a manner consistent with the [Debian Free Software Guidelines](https://www.debian.org/social_contract).
+All the components of Tails that we create ourselves are, and will be, licensed them in a manner consistent with the [Debian Free Software Guidelines](https://www.debian.org/social_contract).
-##3. We will give back to the Free Software community
+However, Tails includes a minor part of non-free firmware in order to work on as much hardware as possible.
+
+## 3. We will give back to the Free Software community
Tails is a privacy-oriented [Debian Derivative](https://wiki.debian.org/Derivatives).
We want usable security and privacy-oriented tools to become a standard for the Free Software community as a whole.
-Bugfixes, code improvements, Debian packaging, as well as work on usability issues which we include in Tails will be upstreamed whenever possible. This way, our modifications will benefit others and can be improved upon further by a wider audience of people.
+Bugfixes, code improvements, Debian packaging, as well as work on usability issues will be upstreamed whenever possible. This way, our modifications will benefit others and can be improved upon further by a wider audience of people.
-## 4. We will never harm our users intentionally.
+## 4. We encourage participation and transparency
-We will always do our best to write secure code and make the right decisions. We will never willingly include backdoors or malicious software nor will we cooperate with any entity wanting us to harm our users.
+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.
-As Tails is created in a transparent manner, anyone is encouraged to participate, review it and point out problems. Mistakes sometimes happen. We will be honest about them and fix them when they are reported to us.
+## 5. We will never harm our users intentionally.
-## 5. We will not hide problems
+We will always do our best to write secure code and make the right decisions. We will never willingly include backdoors or malicious software nor will we cooperate with any entity wanting us to harm our users.
-Our entire bug report database is and will stay open for public view at all times. Reports that are filed here will promptly become visible to others.
+Mistakes sometimes happen. We will be honest about them and fix those that affect the safety of Tails users when they are reported to us.
Whenever severe security issues are reported to us in private, we will test them and ensure we promptly fix these issues. We will notify our users whenever such an issue has been reported to us. However, for the security of our users, we might not disclose such a severe issue immediately, before releasing a fix.
-## 6. We are honest about the capabilities and limits of Tails and related technologies
+## 6. We are honest about the capabilities and limits of Tails and technologies it relies upon
-We encourage users to inform themselves and decide if Tails is suitable for their use case, fits their security needs and whether it can and should be trusted. We work diligently to keep our community up-to-date through our various communication channels about the current state of our software and its limitations. We encourage users to read our documentation as well as third-party documentation in order to make an informed decision and engage in a learning process about the tools we ship.
+We encourage users to inform themselves and decide if Tails is suitable for their use case and how much they can trust it. We work diligently to keep our community up-to-date through our various communication channels about the current state of our software and its limitations. We encourage users to read our documentation as well as third-party documentation in order to make an informed decision and engage in a learning process about the tools we ship.
We provide and explain methods of verification so that anyone can ensure that they downloaded a genuine copy of Tails.