[or-cvs] r14875: (ticket:82) Adding proper Tor trademark references (in torstatus/trunk: . web)

[kasimir@xxxxxxxx]

Author: kasimir
Date: 2008-05-31 20:26:24 -0400 (Sat, 31 May 2008)
New Revision: 14875

Modified:
   torstatus/trunk/LICENSE
   torstatus/trunk/web/LICENSE
   torstatus/trunk/web/config_template.php
Log:
(ticket:82) Adding proper Tor trademark references

Modified: torstatus/trunk/LICENSE
===================================================================
--- torstatus/trunk/LICENSE	2008-05-31 19:10:09 UTC (rev 14874)
+++ torstatus/trunk/LICENSE	2008-06-01 00:26:24 UTC (rev 14875)
@@ -3,6 +3,9 @@
 These files come with their own licenses, and you must agree to those
 licenses to use those files.
 
+The Tor(TM) trademark and Tor Onion Logo are trademarks of The Tor Project. 
+More information about the Tor project can be found at the Tor website,
+http://www.torproject.org/
 
 ==============================================================================
 The 'TorStatus' Web Application and DNSEL Server are distributed

Modified: torstatus/trunk/web/LICENSE
===================================================================
--- torstatus/trunk/web/LICENSE	2008-05-31 19:10:09 UTC (rev 14874)
+++ torstatus/trunk/web/LICENSE	2008-06-01 00:26:24 UTC (rev 14875)
@@ -3,6 +3,9 @@
 These files come with their own licenses, and you must agree to those
 licenses to use those files.
 
+The Tor(TM) trademark and Tor Onion Logo are trademarks of The Tor Project. 
+More information about the Tor project can be found at the Tor website,
+http://www.torproject.org/
 
 ==============================================================================
 The 'TorStatus' Web Application and DNSEL Server are distributed

Modified: torstatus/trunk/web/config_template.php
===================================================================
--- torstatus/trunk/web/config_template.php	2008-05-31 19:10:09 UTC (rev 14874)
+++ torstatus/trunk/web/config_template.php	2008-06-01 00:26:24 UTC (rev 14875)
@@ -83,7 +83,13 @@
 // Set this to 0 if you wish to use JPGraph's libraries
 $usePerlGraphs = 1;
 
-$footerText = "<b><a class='plainbox' href='/CHANGES' target='_new'>View Complete Change History</a><br/>Source code is available under <a class='plainbox' href='/LICENSE' target='_new'>BSD license</a> at <a class='plainbox' href='http://project.torstatus.kgprog.com/' target='_new'>project.torstatus.kgprog.com</a></b>";
+$footerText = "<b>
+<a class='plainbox' href='/CHANGES' target='_new'>View Complete Change History</a>
+<br/>
+Source code is available under <a class='plainbox' href='/LICENSE' target='_new'>BSD license</a> at <a class='plainbox' href='http://project.torstatus.kgprog.com/' target='_new'>project.torstatus.kgprog.com</a>
+<br/>
+The Tor<small><sup>TM</sup></small> trademark and Tor Onion Logo are trademarks of <a class='plainbox' href='http://www.torproject.org/'>The Tor Project</a>.
+</b>";
 $ColumnHeaderInterval = 20;
 $ColumnList_ACTIVE_DEFAULT = array
 (