[tor-commits] [spec/master] Make some changes to the wording of some of the texts

[art at torproject.org]

commit f5ee53e52ffb450acca5905770dc897dc1fa7759
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Mar 16 13:24:20 2015 +0100

    Make some changes to the wording of some of the texts
---
 informed-consent/inform-users-long.md  |   22 ++++++++++++++--------
 informed-consent/inform-users-short.md |   18 ++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/informed-consent/inform-users-long.md b/informed-consent/inform-users-long.md
index fdfebbd..e76cfd2 100644
--- a/informed-consent/inform-users-long.md
+++ b/informed-consent/inform-users-long.md
@@ -1,7 +1,11 @@
 # LEGALITY
 
-OONI does several things which may be illegal in your country, and/or
-banned by your ISP.
+Before running OONI inside of a country with controversial internet access
+related laws you should consult a lawyer. You may also reach out to us with
+specific inquiries at legal at ooni.nu.
+
+Some things that OONI does may be against the terms of service of your ISP or
+legally questionable by your country.
 
 OONI's http test will download data from controversial websites,
 specifically targeting those which may be censored in your country.
@@ -16,8 +20,11 @@ using Tor.
 In the most extreme case, any form of network monitoring could be
 illegal or banned, or even considered a form of espionage.
 
-[Include link to some resource on relevant laws globally. Someone like
-the EFF must have one of these; does anybody have a link?]
+Some useful resources may be:
+
+* [Tor Legal FAQ](https://www.eff.org/torchallenge/faq.html)
+
+* [EFF Know Your Rights](https://www.eff.org/issues/know-your-rights)
 
 # PRIVACY
 
@@ -37,11 +44,10 @@ content based on your network location.
 
 You can see what information OONI releases to the public at
 https://ooni.torproject.org/reports/. You should expect this information
-to remain online PERMANENTLY. [include details of retention policy, once
-we have one]
+to remain online PERMANENTLY.
 
-THE OONI PROJECT will also be able to see your IP address [What other
-info do we get?]
+THE OONI PROJECT when running some tests against our backends will be able to
+see your IP address.
 
 ORGANIZATIONS MONITORING YOUR INTERNET CONNECTION will be able to see
 all web traffic generated by OONI, including your IP address, and will
diff --git a/informed-consent/inform-users-short.md b/informed-consent/inform-users-short.md
index 0422d5a..1a6ac0c 100644
--- a/informed-consent/inform-users-short.md
+++ b/informed-consent/inform-users-short.md
@@ -1,10 +1,8 @@
-WARNING: Running OONI may be illegal in your country, or forbidden by
-your ISP. By running OONI you will connect to web services which may be
-banned, and use web censorship circumvention methods such as Tor. The
-OONI project will publish data submitted by probes, possibly including
-your IP address or other identifying information. In addition, your use
-of OONI will be clear to anybody who has access to your computer, and to
-anybody who can monitor your internet connection (such as your employer,
-ISP or government).
-
-[link to long version]
+WARNING: Running OONI may be against the terms of service of your ISP 
+or legally questionable in your country.
+By running OONI you will connect to web services which may be banned, and use
+web censorship circumvention methods such as Tor. The OONI project will publish
+data submitted by probes, possibly including your IP address or other
+identifying information. In addition, your use of OONI will be clear to anybody
+who has access to your computer, and to anybody who can monitor your internet
+connection (such as your employer, ISP or government).