Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some /tos and /privacy issues

This commit is contained in:
Jeff Atwood 2013-05-31 16:43:29 -07:00
parent a06b33e171
commit 0606725b29
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/views/static/privacy.en.html.erb
View File

@ -11,7 +11,11 @@ We collect information from you when you register on our site and gather data wh
</p>
<p>
When participating on our site, you may be asked to enter your: name, age and or e-mail address. You may, however, visit our site anonymously.
When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
</p>
<p>
When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
</p>
<div id="use"></div>
@ -27,14 +31,26 @@ We collect information from you when you register on our site and gather data wh
<div id="protect"></div>
<h2><a href="#use">How do we protect your information?</a></h2>
<p>
We implement a variety of security measures to maintain the safety of your personal
information when you enter, submit, or access your personal information.
We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
</p>
<div id="data-retention"></div>
<h2><a href="#data-retention">What is your data retention policy?</a></h2>
<p>
We will make a good faith effort to:
</p>
<ul>
<li>Retain server logs containing the IP address of all requests to this server no more than 90 days.</li>
<li>Retain the IP addresses associated with registered users and their posts no more than 5 years.</li>
</ul>
</p>
<div id="cookies"></div>
<h2><a href="#cookies">Do we use cookies?</a></h2>
<p>
Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow) that enables the sites or service providers systems to recognize your browser and capture and remember certain information.
Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
</p>
<p>
@ -56,7 +72,7 @@ We do not sell, trade, or otherwise transfer to outside parties your personally
<div id="coppa"></div>
<h2><a href="#coppa">Children's Online Privacy Protection Act Compliance</a></h2>
<p>
We are in compliance with the requirements of COPPA (<a href="http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), we do not collect any information from anyone under 13 years of age. Our site, products and services are all directed to people who are at least 13 years old or older.
Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>), do not use this site.
</p>
<div id="online"></div>
@ -76,3 +92,7 @@ By using our site, you consent to our web site privacy policy.
<p>
If we decide to change our privacy policy, we will post those changes on this page.
</p>
<p>
This document is CC-BY-SA. It was last updated May 31, 2013.
</p>

11
app/views/static/tos.en.html.erb
View File

@ -42,16 +42,16 @@
<h2><a href="#4">4. Payment and Renewal</a></h2>
<h3>General Terms</h3>
<p>
Optional paid services such as extra storage, or domain purchases are available on the Website (any such services, an “Upgrade”). By selecting an Upgrade you agree to pay <%= SiteSetting.company_short_name %> the monthly or annual subscription fees indicated for that service. Payments will be charged on a pre-pay basis on the day you sign up for an Upgrade and will cover the use of that service for a monthly or annual subscription period as indicated. Upgrade fees are not refundable.
Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay <%= SiteSetting.company_short_name %> the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
</p>
<h3>Automatic Renewal</h3>
<p>Unless you notify <%= SiteSetting.company_short_name %> before the end of the applicable subscription period that you want to cancel an Upgrade, your Upgrade subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee for such Upgrade (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Upgrades can be canceled at any time in the Upgrades section of your site’s dashboard.
<p>Unless you notify <%= SiteSetting.company_short_name %> before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
</p>
<div id="5"></div>
<h2><a href="#5">5. Services</a></h2>
<h3>Hosting, Support Services</h3>
<p>Hosting and Support services are provided by <%= SiteSetting.company_short_name %> under the terms and conditions for each such service, which are located at /hosting-tos and /support-tos, respectively. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
<p>Optional Hosting and Support services may be provided by <%= SiteSetting.company_short_name %> under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
</p>
<div id="6"></div>
@ -124,3 +124,8 @@ You agree to indemnify and hold harmless <%= SiteSetting.company_short_name %>,
<div id="18"></div>
<h2><a href="#18">18. Miscellaneous</a></h2>
<%= markdown_content(:tos_miscellaneous) %>
<p>
This document is CC-BY-SA. It was last updated May 31, 2013.<br/>
Originally adapted from the <a href="http://en.wordpress.com/tos/">WordPress Terms of Service</a>.
</p>