From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 3 Dec 2013 17:31:09 +0000 (-0600)
Subject: Removing the assertion that this site is run by StatusNet (major oops) and adding... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=94658aba1dbd1bc627c5f985e1a83b37c85c8647;p=mediagoblin.git

Removing the assertion that this site is run by StatusNet (major oops) and adding <p> tags

The StatusNet one was a pretty goofy mistake.  But at least now it's fixed! :)

This commit sponsored by Jon Buckley.  Thank you!
---

diff --git a/mediagoblin/templates/mediagoblin/terms_of_service.html b/mediagoblin/templates/mediagoblin/terms_of_service.html
index 4247f5b8..610afd25 100644
--- a/mediagoblin/templates/mediagoblin/terms_of_service.html
+++ b/mediagoblin/templates/mediagoblin/terms_of_service.html
@@ -29,16 +29,19 @@
 
 <h2>Terms of Service</h2>
 
+<p>
 The following terms and conditions govern all use of the
 {{ app_config['html_title'] }} website and all content, services and products
-available at or through the website (taken together, the Website). The Website
-is owned and operated by Status.net (“Operator”). The Website is offered
-subject to your acceptance without modification of all of the terms and
-conditions contained herein and all other operating rules, policies
-(including, without limitation, Operator’s Privacy Policy) and procedures
-that may be published from time to time on this Site by Operator (collectively,
- the “Agreement”).
+available at or through the website (taken together, the Website).
+"Operator" means the owners and operators of this website.
+The Website is offered subject to your acceptance without modification of all
+of the terms and conditions contained herein and all other operating rules,
+policies (including, without limitation, Operator’s Privacy Policy) and
+procedures that may be published from time to time on this Site by Operator
+(collectively, the “Agreement”).
+</p>
 
+<p>
 Please read this Agreement carefully before accessing or using the Website.
 By accessing or using any part of the web site, you agree to become bound by
 the terms and conditions of this agreement. If you do not agree to all the
@@ -46,6 +49,7 @@ terms and conditions of this agreement, then you may not access the Website
 or use any services. If these terms and conditions are considered an offer by
 Operator, acceptance is expressly limited to these terms. The Website is
 available only to individuals who are at least 13 years old.
+</p>
 
 <ol id="code_of_conduct_list">
   <li><strong>Your {{ app_config['html_title'] }} Account and Site.</strong>
@@ -287,11 +291,13 @@ available only to individuals who are at least 13 years old.
   </li>
 </ol>
 
+<p>
 Originally published by Automattic, Inc. as the WordPress.com Terms of Service
 and made available by them under the Creative Commons Attribution-
 ShareAlike 3.0 License. Modifications to remove reference to "VIP services",
 rename "blog" to "notice stream", remove the choice-of-venue clause, and add
 variables specific to instances of this software made by Control Yourself, Inc.
 and made available under the terms of the same license.
+</p>
 
 {% endblock -%}