tor-webwml.git

@@ -11,6 +11,13 @@

   </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>

@@ -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