[tor-commits] [community/master] Update Response template for Tor relay operator to ISP - 2020 edition

2020-04-21 Thread gus
commit cd10fedd51e66b005d8fe043821c4c8748d6fdc8
Author: gus 
Date:   Tue Apr 21 13:00:53 2020 -0400

Update Response template for Tor relay operator to ISP - 2020 edition
---
 .../tor-dmca-response/contents.lr  | 27 ++
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git 
a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
 
b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
index 1bbccb8..847ce19 100644
--- 
a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
+++ 
b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
@@ -6,15 +6,23 @@ title: Response template for Tor relay operator to ISP
 ---
 body:
 
-Written by the Electronic Frontier Foundation ([EFF](https://www.eff.org/)). 
Last updated May 31, 2011.
+Written by the Electronic Frontier Foundation ([EFF](https://www.eff.org/)). 
Last updated March 27, 2020.
 
-Note to Tor relay operators: In this litigious era, anyone providing routing 
services may face copyright complaints for transmitted content. Fortunately, 
the Digital Millennium Copyright Act safe harbors should provide protections 
from many of them both to you and to your upstream provider. If your Internet 
host forwards a DMCA copyright complaint to you, you can use this template to 
write a response, though you will need to customize it to your situation. 
Please also ensure all the statements are true for you. (The Tor Project has an 
[abuse collection of 
templates](/relay/community-resources/tor-abuse-templates/) to help you respond 
to other types of abuse complaints, too.) Before sending any response to your 
ISP, you may want to seek the advice of an attorney licensed to practice in 
your jurisdiction.
+Note to Tor relay operators: In this litigious era, anyone providing routing 
services may face copyright complaints for transmitted content.
+Fortunately, copyright law should provide protections from many of them both 
to you and to your upstream provider.
+If your Internet host forwards a copyright complaint to you, you can use this 
template to write a response, though you will need to customize it to your 
situation.
+Please also ensure all the statements are true for you.
+(The Tor Project has an [abuse collection of 
templates](/relay/community-resources/tor-abuse-templates/) to help you respond 
to other types of abuse complaints, too.)
+Before sending any response to your ISP, you may want to seek the advice of an 
attorney licensed to practice in your jurisdiction.
 
-This template letter is for informational purposes only and does not 
constitute legal advice. Whether and how you should respond when you or your 
ISP has received a DMCA notice will turn on the particular facts of your 
situation. This template is intended as a starting point, but you should tailor 
it to your own circumstances. In addition, it's up to you to comply with your 
ISP's terms of service. If you're not comfortable including so much legal 
explanation, feel free to invite the ISP to contact EFF for a fuller discussion.
+This template letter is for informational purposes only and does not 
constitute legal advice.
+Whether and how you should respond when you or your ISP has received a 
copyright notice will turn on the particular facts of your situation.
+This template is intended as a starting point, but you should tailor it to 
your own circumstances.
+In addition, it's up to you to comply with your ISP's terms of service.
+If you're not comfortable including so much legal explanation, feel free to 
invite the ISP to contact EFF for a fuller discussion.
 
-If you do not believe the safe harbors apply to your particular situation, 
don't use this template as a basis for your response. Specific information 
about safe harbor qualification for "transitory digital network communications" 
is provided on the Chilling Effects website 
[here](https://www.chillingeffects.org/dmca512/faq.cgi#QID586) and also in the 
template, below.
-
-Also, if you received this document from anywhere other than the EFF web site 
or 
[tor-dmca-response](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response),
 it may be out of date. Follow the link to get the latest version.
+Also, if you received this document from anywhere other than the EFF web site 
or 
[tor-dmca-response](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response),
 it may be out of date. 
+Follow the link to get the latest version.
 
 ```
 
@@ -22,14 +30,13 @@ Dear [ISP]:
 
 Thank you for forwarding me the notice you received from [copyright claimant] 
regarding [content]. I would like to assure you that I am not hosting the 
claimed infringing materials, and furthermore, the Digital Millennium Copyright 
Act's ("DMCA") safe harbors likely protect you from liability arising from this 
complaint. The notice is likely 

[tor-commits] [community/master] Update to template

2019-03-15 Thread hiro
commit 9c91091c70cd28ca87cc3f6d807ba2f2d465d77b
Author: hiro 
Date:   Fri Mar 15 16:54:59 2019 +0100

Update to template
---
 content/localization/contents+en.lr   |  2 +-
 content/localization/contents+es.lr   |  2 +-
 content/localization/contents+fr.lr   |  2 +-
 content/localization/contents.lr  |  2 +-
 content/onion-services/contents+en.lr |  2 +-
 content/onion-services/contents+es.lr |  2 +-
 content/onion-services/contents+fr.lr |  2 +-
 content/onion-services/contents.lr|  2 +-
 content/outreach/contents+en.lr   |  2 +-
 content/outreach/contents+es.lr   |  2 +-
 content/outreach/contents+fr.lr   |  2 +-
 content/outreach/contents.lr  |  2 +-
 content/relay-operations/contents+en.lr   |  2 +-
 content/relay-operations/contents+es.lr   |  2 +-
 content/relay-operations/contents+fr.lr   |  2 +-
 content/relay-operations/contents.lr  |  2 +-
 content/training/contents+en.lr   |  2 +-
 content/training/contents+es.lr   |  2 +-
 content/training/contents+fr.lr   |  2 +-
 content/training/contents.lr  |  2 +-
 content/user-testing/contents+en.lr   |  2 +-
 content/user-testing/contents+es.lr   |  2 +-
 content/user-testing/contents+fr.lr   |  2 +-
 content/user-testing/contents.lr  |  2 +-
 databags/about+fr.ini | 19 ---
 databags/pagenav+en.ini   | 23 +++
 databags/{about+en.ini => pagenav+es.ini} |  0
 databags/{about+es.ini => pagenav+fr.ini} |  0
 templates/header.html |  3 ---
 templates/layout.html |  1 +
 templates/pagenav.html|  9 +
 31 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/content/localization/contents+en.lr 
b/content/localization/contents+en.lr
index b60915f..b483d03 100644
--- a/content/localization/contents+en.lr
+++ b/content/localization/contents+en.lr
@@ -4,7 +4,7 @@ section_id: localization
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: Join the Tor Community
 ---
diff --git a/content/localization/contents+es.lr 
b/content/localization/contents+es.lr
index b60915f..b483d03 100644
--- a/content/localization/contents+es.lr
+++ b/content/localization/contents+es.lr
@@ -4,7 +4,7 @@ section_id: localization
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: Join the Tor Community
 ---
diff --git a/content/localization/contents+fr.lr 
b/content/localization/contents+fr.lr
index b60915f..b483d03 100644
--- a/content/localization/contents+fr.lr
+++ b/content/localization/contents+fr.lr
@@ -4,7 +4,7 @@ section_id: localization
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: Join the Tor Community
 ---
diff --git a/content/localization/contents.lr b/content/localization/contents.lr
index b60915f..b483d03 100644
--- a/content/localization/contents.lr
+++ b/content/localization/contents.lr
@@ -4,7 +4,7 @@ section_id: localization
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: Join the Tor Community
 ---
diff --git a/content/onion-services/contents+en.lr 
b/content/onion-services/contents+en.lr
index b828b52..b862a5d 100644
--- a/content/onion-services/contents+en.lr
+++ b/content/onion-services/contents+en.lr
@@ -4,7 +4,7 @@ section_id: onion-services
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: .onion Services
 ---
diff --git a/content/onion-services/contents+es.lr 
b/content/onion-services/contents+es.lr
index b828b52..b862a5d 100644
--- a/content/onion-services/contents+es.lr
+++ b/content/onion-services/contents+es.lr
@@ -4,7 +4,7 @@ section_id: onion-services
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: .onion Services
 ---
diff --git a/content/onion-services/contents+fr.lr 
b/content/onion-services/contents+fr.lr
index b828b52..b862a5d 100644
--- a/content/onion-services/contents+fr.lr
+++ b/content/onion-services/contents+fr.lr
@@ -4,7 +4,7 @@ section_id: onion-services
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: .onion Services
 ---
diff --git a/content/onion-services/contents.lr 
b/content/onion-services/contents.lr
index b828b52..b862a5d 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -4,7 +4,7 @@ section_id: onion-services
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: .onion Services
 ---
diff --git a/content/outreach/contents+en.lr b/content/outreach/contents+en.lr
index a3ec8da..b93634f 100644
--- a/content/outreach/contents+en.lr
+++ b/content/outreach/contents+en.lr
@@ -4,7 +4,7 @@ section_id: outreach
 ---
 color: primary
 ---
-_template: jumbotron.html
+_template: layout.html
 ---
 title: Outreach