From 00d0072d2d336bb840423773927750ad53fcadd9 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 14 Apr 2013 12:12:04 -0700 Subject: [PATCH] make ToS clear that USA stuff applies to USA only --- app/views/static/tos.cs.html.erb | 4 ++-- app/views/static/tos.en.html.erb | 4 ++-- app/views/static/tos.zh_CN.html.erb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/static/tos.cs.html.erb b/app/views/static/tos.cs.html.erb index 79a4c916ae1..5fbfcf7c1bc 100644 --- a/app/views/static/tos.cs.html.erb +++ b/app/views/static/tos.cs.html.erb @@ -68,7 +68,7 @@

8. Copyright Infringement and DMCA Policy

- As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>. + As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, and if this website resides in the USA, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>.

@@ -112,7 +112,7 @@

16. General Representation and Warranty

- You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. + You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.

diff --git a/app/views/static/tos.en.html.erb b/app/views/static/tos.en.html.erb index 9f1862b797b..b5857b1bfb6 100644 --- a/app/views/static/tos.en.html.erb +++ b/app/views/static/tos.en.html.erb @@ -68,7 +68,7 @@

8. Copyright Infringement and DMCA Policy

- As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>. + As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, and if this website resides in the USA, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>.

@@ -112,7 +112,7 @@ In no event will <%= SiteSetting.company_short_name %>, or its suppliers or lice

16. General Representation and Warranty

-You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. +You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.

diff --git a/app/views/static/tos.zh_CN.html.erb b/app/views/static/tos.zh_CN.html.erb index 8bdc4541a86..20cb14604f4 100644 --- a/app/views/static/tos.zh_CN.html.erb +++ b/app/views/static/tos.zh_CN.html.erb @@ -68,7 +68,7 @@

8. Copyright Infringement and DMCA Policy

- As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>. + As <%= SiteSetting.company_short_name %> asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by <%= SiteSetting.company_domain %> violates your copyright, and if this website resides in the USA, you are encouraged to notify <%= SiteSetting.company_short_name %> in accordance with <%= SiteSetting.company_short_name %>’s Digital Millennium Copyright Act (“DMCA”) Policy. <%= SiteSetting.company_short_name %> will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. <%= SiteSetting.company_short_name %> will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of <%= SiteSetting.company_short_name %> or others. In the case of such termination, <%= SiteSetting.company_short_name %> will have no obligation to provide a refund of any amounts previously paid to <%= SiteSetting.company_short_name %>.

@@ -112,7 +112,7 @@ In no event will <%= SiteSetting.company_short_name %>, or its suppliers or lice

16. General Representation and Warranty

-You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. +You represent and warrant that (i) your use of the Website will be in strict accordance with the <%= SiteSetting.company_short_name %> Privacy Policy, Community Guidelines, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.