[tor-commits] r26239: {website} update copyright and trademark links/statement, see ticket 9 (in website/trunk: docs/en include)

[Andrew Lewman]

Author: phobos
Date: 2013-07-06 02:35:51 +0000 (Sat, 06 Jul 2013)
New Revision: 26239

Modified:
   website/trunk/docs/en/trademark-faq.wml
   website/trunk/include/foot.wmi
Log:
update copyright and trademark links/statement, see ticket 9203


Modified: website/trunk/docs/en/trademark-faq.wml
===================================================================
--- website/trunk/docs/en/trademark-faq.wml	2013-07-05 17:23:26 UTC (rev 26238)
+++ website/trunk/docs/en/trademark-faq.wml	2013-07-06 02:35:51 UTC (rev 26239)
@@ -11,9 +11,16 @@
   </div>
   <div id="maincol">
     <!-- PUT CONTENT AFTER THIS TAG -->
+
+    <h1>General Statement of Trademark and Copyright</h1>
+
+    <p>Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 United States License</a>. All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to revoke the foregoing licenses and permissions at any time in its sole discretion.</p>
+
+    <p>The Tor&#174 software is licensed in various ways. Learn more about the <a href="<page docs/faq>#DistributingTor">various licenses</a>.
+
     <h1>Tor Trademark Frequently Asked Questions</h1>
     <hr>
-    
+
     <a id="usage"></a>
     <h2>How can I use the name "Tor"?</h2>
     <p>The Tor Project encourages developers to use the name Tor in ways that
@@ -27,7 +34,7 @@
     sponsored by The Tor Project. For example, “This product is produced
     independently from the Tor® anonymity software and carries no guarantee
     from The Tor Project about quality, suitability or anything else.”</p>
-    
+
     <a id="onionlogo"></a>
     <h2>Can I use the Tor onion logo?</h2>
     <p>If you're making non-commercial use of Tor software, you may also use
@@ -36,7 +43,7 @@
     can use items that look like the Tor onion logo to illustrate a point
     (e.g. an exploded onion with layers, for instance), so long as they're
     not used as logos in ways that would confuse people.</p>
-    
+
     <a id="combining"></a>
     <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2>
     <p>Please don't use Tor in your product name or domain name. Instead,
@@ -91,12 +98,12 @@
     and network and actively encourage researchers to document attacks to
     help us strengthen its anonymity protection further.  We distribute the
     software itself freely, but require correct attribution. </p>
-    
+
     <a id="commercial"></a>
     <h2>What if I produce non-open source, commercial products based on
     Tor?</h2>
     <p>Contact us, and let's talk.</p>
-    
+
     <a id="licensee"></a>
     <h2>Are there official licensees of the Tor trademarks?</h2>
     <p>Yes.  A few open source, non-commercial projects are Tor trademark
@@ -115,4 +122,4 @@
   <!-- END SIDECOL -->
 </div>
 <!-- END CONTENT -->
-#include <foot.wmi>  
+#include <foot.wmi>

Modified: website/trunk/include/foot.wmi
===================================================================
--- website/trunk/include/foot.wmi	2013-07-05 17:23:26 UTC (rev 26238)
+++ website/trunk/include/foot.wmi	2013-07-06 02:35:51 UTC (rev 26239)
@@ -4,12 +4,8 @@
     <div id="footer">
     	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div>
       <div class="about">
-    <p>"Tor" and the "Onion Logo" are registered trademarks of
-    <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
-    Content on this site is licensed under a <a
-    href="http://creativecommons.org/licenses/by/3.0/us/">Creative
-    Commons Attribution 3.0 United States License</a>, unless
-    otherwise noted.</p>
+    <p>Trademark, copyright notices, and rules for use by third parties can be found
+    <a href="<page docs/trademark-faq>">in our FAQ</a>.</p>
 <!--
         # This will grab the date from svn info/git
         # REQUIRES svn or git for this to work
@@ -82,7 +78,7 @@
 #	<: }; :>
 #	</div>
 
-# LANGUAGE SWITCH CGI 
+# LANGUAGE SWITCH CGI
 #      <div class="col wider">
 #      	<h4>Languages</h4>
 #        # this is a cgi trampoline to bounce us to the right page
@@ -90,7 +86,7 @@
 #        # noscript does not block onclick but clients may have disabled javascript completely
 #        #
 #        # for this to work we need to know the relative path from the document root
-#        # to the current directory that wml is in. 
+#        # to the current directory that wml is in.
 #        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
 #          <select name="Language" id="lang">
 #          <:{