Browse code

Updated the url to www.tp.o, added trademark-faq

Andrew Lewman authored on16/10/2007 04:19:46
Showing9 changed files
... ...
@@ -75,8 +75,8 @@ href="http://paypal.com/">PayPal</a> account):<br />
75 75
 <input type="hidden" name="cmd" value="_xclick-subscriptions" />
76 76
 <input type="hidden" name="business" value="donations@torproject.org" />
77 77
 <input type="hidden" name="item_name" value="Tor Project Membership" />
78
-<input type="hidden" name="return" value="https://torproject.org/">
79
-<input type="hidden" name="cancel_return" value="https://torproject.org/donate">
78
+<input type="hidden" name="return" value="https://www.torproject.org/">
79
+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate">
80 80
 </p>
81 81
 </form>
82 82
 
... ...
@@ -93,8 +93,8 @@ href="http://paypal.com/">PayPal</a> account):<br />
93 93
 <input type="hidden" name="cmd" value="_xclick" />
94 94
 <input type="hidden" name="business" value="donations@torproject.org" />
95 95
 <input type="hidden" name="item_name" value="Tor" />
96
-<input type="hidden" name="return" value="https://torproject.org/">
97
-<input type="hidden" name="cancel_return" value="https://torproject.org/donate">
96
+<input type="hidden" name="return" value="https://www.torproject.org/">
97
+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate">
98 98
 </p>
99 99
 </form>
100 100
 
... ...
@@ -104,7 +104,7 @@ href="http://paypal.com/">PayPal</a> account):<br />
104 104
 way to donate (such as a European-style bank transfer), <a
105 105
 href="mailto:donations@torproject.org">let us know</a> and we'll work
106 106
 something out. Donations of $65 or more qualify you for a <a
107
-href="https://torproject.org/tshirt.html">bright green Tor t-shirt</a>.
107
+href="https://www.torproject.org/tshirt.html">bright green Tor t-shirt</a>.
108 108
 </p>
109 109
 
110 110
 <p>Help us keep Tor under <a
... ...
@@ -9,7 +9,7 @@
9 9
 <hr />
10 10
 
11 11
 <p>
12
-The canonical URL of this site is <a href="https://torproject.org/">https://torproject.org</a>,
12
+The canonical URL of this site is <a href="https://www.torproject.org/">https://www.torproject.org</a>,
13 13
 but there are a few mirrors of it in other places.
14 14
 </p>
15 15
 
... ...
@@ -44,7 +44,7 @@ fundraising, PR, and community relations.</dd>
44 44
 runs one of the directory authorities, runs the wiki, and generally
45 45
 helps out a lot.</dd>
46 46
 <dt>Mike Perry</dt><dd>Author of <a
47
-href="https://torproject.org/svn/torflow/README">TorFlow</a>, a Tor
47
+href="https://www.torproject.org/svn/torflow/README">TorFlow</a>, a Tor
48 48
 controller that builds paths through the Tor network and
49 49
 measures various properties and behaviors. Working now on a <a
50 50
 href="https://torbutton.torproject.org/dev/">much more comprehensive
... ...
@@ -83,7 +83,7 @@ Coders:</a></h3>
83 83
 
84 84
 <dl>
85 85
 <dt>Benedikt Boss</dt><dd>Worked on <a
86
-href="https://torproject.org/svn/topf/README">TOPF</a>, a fuzzer for Tor;
86
+href="https://www.torproject.org/svn/topf/README">TOPF</a>, a fuzzer for Tor;
87 87
 mentored by Roger.</dd>
88 88
 <dt>Christian King</dt><dd> Worked on making Tor servers stable on
89 89
 Windows; mentored by Nick.</dd>
... ...
@@ -99,23 +99,23 @@ properties of the Tor network; mentored by Mike Perry.</dd>
99 99
 
100 100
 <dl>
101 101
 <dt>Bogdan Drozdowski</dt><dd><a
102
-href="https://torproject.org/index.html.pl">Polish</a>.</dd>
102
+href="https://www.torproject.org/index.html.pl">Polish</a>.</dd>
103 103
 <dt>fredzupy</dt><dd><a
104
-href="https://torproject.org/index.html.fr">French</a>.</dd>
104
+href="https://www.torproject.org/index.html.fr">French</a>.</dd>
105 105
 <dt>Ruben Garcia</dt><dd><a
106
-href="https://torproject.org/index.html.es">Spanish</a>.</dd>
106
+href="https://www.torproject.org/index.html.es">Spanish</a>.</dd>
107 107
 <dt>Jens Kubieziel</dt><dd><a
108
-href="https://torproject.org/index.html.de">German</a>.</dd>
108
+href="https://www.torproject.org/index.html.de">German</a>.</dd>
109 109
 <dt>Pei Hanru</dt><dd><a
110
-href="https://torproject.org/index.html.zh-cn">Simplified Chinese</a>.</dd>
110
+href="https://www.torproject.org/index.html.zh-cn">Simplified Chinese</a>.</dd>
111 111
 <dt>Jan Reister</dt><dd><a
112
-href="https://torproject.org/index.html.it">Italian</a>.</dd>
112
+href="https://www.torproject.org/index.html.it">Italian</a>.</dd>
113 113
 <dt>Masaki Taniguchi</dt><dd><a
114
-href="https://torproject.org/index.html.ja">Japanese</a>.</dd>
114
+href="https://www.torproject.org/index.html.ja">Japanese</a>.</dd>
115 115
 <dt>Jan Woning</dt><dd><a
116
-href="https://torproject.org/index.html.nl">Dutch</a>.</dd>
116
+href="https://www.torproject.org/index.html.nl">Dutch</a>.</dd>
117 117
 <dt>ygrek</dt><dd><a
118
-href="https://torproject.org/index.html.ru">Russian</a>.</dd>
118
+href="https://www.torproject.org/index.html.ru">Russian</a>.</dd>
119 119
 </dl>
120 120
 
121 121
 <a id="Volunteers"></a>
122 122
new file mode 100644
... ...
@@ -0,0 +1,52 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor Trademark FAQ"
5
+<div class="main-column">
6
+
7
+<!-- PUT CONTENT AFTER THIS TAG -->
8
+<h1>Tor Trademark Frequently Asked Questions</h1>
9
+<hr />
10
+
11
+<h2>How can I use the name “Tor”?</h2>
12
+<p>The Tor Project encourages developers to use the name Tor in ways that
13
+do not confuse the public about the source of anonymity software and
14
+services.  If you are building open-source non-commercial software or
15
+services that incorporate or work with the Tor Project's code, you may
16
+use the name “Tor” in an accurate description of your work.  We ask you
17
+to include a link to the official Tor website,
18
+<a href="https://www.torproject.org/">https://www.torproject.org</a> so users can verify the original source of
19
+Tor for themselves, and a note indicating that your project is not
20
+sponsored by the Tor Project. For example, “This product is produced
21
+independently from the Tor™ anonymity software and carries no guarantee
22
+from the Tor Project about quality, suitability or anything else.”</p>
23
+
24
+<h2>Can I use the Tor onion logo?</h2>
25
+<p>If you're making non-commercial use of Tor software, you may also use
26
+the Tor onion logo (as an illustration, not as a brand for your
27
+products).  Please don't modify the design or colors of the logo.  You
28
+can use items that look like the Tor onion logo to illustrate a point
29
+(e.g. an exploded onion with layers, for instance), so long as they're
30
+not used as logos in ways that would confuse people.</p>
31
+
32
+<h2>Does this mean you're enforcing trademark rights?</h2>
33
+<p>The Tor Project is a non-profit corporation organized to research and
34
+develop the Tor anonymity software and network.  We don't want to be
35
+trademark bullies, but we will use trademark to protect the public's
36
+ability to recognize Tor Project software.  Trademark helps us to assure
37
+that the name is used only in connection with genuine Tor anonymity
38
+software and for accurate description of software and services.  
39
+After all, to protect their anonymity securely, computer users must be
40
+able to identify the software they are using, so they can account
41
+properly for its strengths and weaknesses.  Tor has become well-known as
42
+a software package and associated network of onion-routing anonymizing
43
+proxies, with online documentation, instructions for strengthening
44
+anonymity protection, and warnings that even at this stage it remains
45
+experimental software.  We work with developers to improve the software
46
+and network and actively encourage researchers to document attacks to
47
+help us strengthen its anonymity protection further.  We distribute the
48
+software itself freely, but require correct attribution. </p>
49
+
50
+</div><!-- #main -->
51
+
52
+#include <foot.wmi>
... ...
@@ -46,7 +46,7 @@ sub do_status($$) {
46 46
 	print "<th>File</th>\n";
47 47
 	printf("<th>%s (%s)</th>\n", $_, $LANGUAGES{$_}) for ('en', grep { $_ ne 'en' } @LANGUAGES);
48 48
 	print "</tr>\n";
49
-	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'https://torproject.org/') . ($dir eq '.' ? '' : $dir.'/');
49
+	my $HTMLBASE = (defined $ENV{'HTMLBASE'} ? $ENV{'HTMLBASE'} : 'https://www.torproject.org/') . ($dir eq '.' ? '' : $dir.'/');
50 50
 
51 51
 	for my $file (sort {$a cmp $b} keys %{$files{'en'}}) {
52 52
 		my $obs = file_is_obsolete($dir, 'en', $file);
... ...
@@ -67,7 +67,7 @@ new versions of the pictures.</li>
67 67
 appropriate language: "Neither the Tor developers nor EFF have reviewed
68 68
 this translation for accuracy and correctness. It may be out of date
69 69
 or wrong. The official Tor web site is the English version, available
70
-at https://torproject.org/"</li>
70
+at <a href="https://www.torproject.org">https://www.torproject.org/</a>"</li>
71 71
 
72 72
 <li>Use valid <a href="http://roselli.org/adrian/articles/character_charts.asp">character entities</a>.
73 73
 Even though most browsers display the characters correctly these days, we want
... ...
@@ -181,10 +181,10 @@ runs stably and efficiently on Windows?</li>
181 181
 but it would be great to have a script that starts up a Tor network, uses
182 182
 it for a while, and verifies that at least parts of it are working.</li>
183 183
 <li>Help Mike Perry on his <a
184
-href="https://torproject.org/svn/torflow/">TorFlow</a>
185
-library (<a href="https://torproject.org/svn/torflow/TODO">TODO</a>):
184
+href="https://www.torproject.org/svn/torflow/">TorFlow</a>
185
+library (<a href="https://www.torproject.org/svn/torflow/TODO">TODO</a>):
186 186
 it's a python library that uses the <a
187
-href="https://torproject.org/svn/torctl/doc/howto.txt">Tor controller
187
+href="https://www.torproject.org/svn/torctl/doc/howto.txt">Tor controller
188 188
 protocol</a> to instruct Tor to build circuits in a variety of ways,
189 189
 and then it measures performance and tries to detect anomalies.</li>
190 190
 <!--
... ...
@@ -25,7 +25,7 @@
25 25
 <div class="center">
26 26
 <table class="banner" border="0" cellpadding="0" cellspacing="0">
27 27
     <tr>
28
-        <td class="banner-left"><a href="https://torproject.org/"><img src="$(DOCROOT)/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
28
+        <td class="banner-left"><a href="https://www.torproject.org/"><img src="$(DOCROOT)/images/top-left.png" alt="Click to go to home page" width="193" height="79"></a></td>
29 29
         <td class="banner-middle">
30 30
 	<:{
31 31
 	    my %navigation;
... ...
@@ -1,6 +1,6 @@
1 1
 #!wml
2 2
 
3
-#<define-tag cvssandbox whitespace=delete>https://torproject.org/cvs/</define-tag>
3
+#<define-tag cvssandbox whitespace=delete>https://www.torproject.org/cvs/</define-tag>
4 4
 <define-tag cvssandbox whitespace=delete>cvs/</define-tag>
5 5
 <define-tag svnsandbox whitespace=delete>svn/trunk/</define-tag>
6 6
 <define-tag svnwebsite whitespace=delete>svn/website/</define-tag>