Browse code

Remove Vidalia more thoroughly

Sebastian Hahn authored on08/02/2015 18:03:04
Showing1 changed files
... ...
@@ -118,7 +118,7 @@
118 118
     <ul>
119 119
     <li><a href="https://tails.boum.org/">The Amnesic Incognito Live
120 120
     System</a></li>
121
-    <li><a href="<page projects/vidalia>">Vidalia</a></li>
121
+    <li>Vidalia</li>
122 122
     </ul>
123 123
   </div>
124 124
   <!-- END MAINCOL -->
Browse code

Add useful links to the trademark faq section headers.

Matthew Finkel authored on28/07/2014 05:20:31
Showing1 changed files
... ...
@@ -22,7 +22,7 @@
22 22
     <hr>
23 23
 
24 24
     <a id="usage"></a>
25
-    <h2>How can I use the name "Tor"?</h2>
25
+    <h2><a class="anchor" href="#usage">How can I use the name "Tor"?</a></h2>
26 26
     <p>The Tor Project encourages developers to use the name Tor in ways that
27 27
     do not confuse the public about the source of anonymity software and
28 28
     services.  If you are building open-source non-commercial software or
... ...
@@ -36,7 +36,7 @@
36 36
     from The Tor Project about quality, suitability or anything else.”</p>
37 37
 
38 38
     <a id="onionlogo"></a>
39
-    <h2>Can I use the Tor onion logo?</h2>
39
+    <h2><a class="anchor" href="#onionlogo">Can I use the Tor onion logo?</a></h2>
40 40
     <p>If you're making non-commercial use of Tor software, you may also use
41 41
     the Tor onion logo (as an illustration, not as a brand for your
42 42
     products).  Please don't modify the design or colors of the logo.  You
... ...
@@ -45,7 +45,7 @@
45 45
     not used as logos in ways that would confuse people.</p>
46 46
 
47 47
     <a id="combining"></a>
48
-    <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2>
48
+    <h2><a class="anchor" href="#combining">Can I use the word "Tor" as part of the name of my product or my domain name?</a></h2>
49 49
     <p>Please don't use Tor in your product name or domain name. Instead,
50 50
     find a name that will accurately identify <i>your</i> products
51 51
     or services. Remember that our goal
... ...
@@ -55,7 +55,7 @@
55 55
     and commercial confusion is a sign of trademark infringement.</p>
56 56
 
57 57
     <a id="researchpapers"></a>
58
-    <h2>What about cute Tor-derived names in research paper titles?</h2>
58
+    <h2><a class="anchor" href="#researchpapers">What about cute Tor-derived names in research paper titles?</a></h2>
59 59
 
60 60
     <p>Tor enjoys a vibrant <a
61 61
     href="https://research.torproject.org/">research community</a>
... ...
@@ -81,7 +81,7 @@
81 81
     back to the <a href="#combining">above scenario</a>.</p>
82 82
 
83 83
     <a id="enforcing"></a>
84
-    <h2>Does this mean you're enforcing trademark rights?</h2>
84
+    <h2><a class="anchor" href="#enforcing">Does this mean you're enforcing trademark rights?</a></h2>
85 85
     <p>The Tor Project is a non-profit corporation organized to research and
86 86
     develop the Tor anonymity software and network.  We don't want to be
87 87
     trademark bullies, but we will use trademark to protect the public's
... ...
@@ -107,12 +107,12 @@
107 107
     </p>
108 108
 
109 109
     <a id="commercial"></a>
110
-    <h2>What if I produce non-open source, commercial products based on
111
-    Tor?</h2>
110
+    <h2><a class="anchor" href="#commercial">What if I produce non-open source, commercial products based on
111
+    Tor?</a></h2>
112 112
     <p>Contact us, and let's talk.</p>
113 113
 
114 114
     <a id="licensee"></a>
115
-    <h2>Are there official licensees of the Tor trademarks?</h2>
115
+    <h2><a class="anchor" href="#licensee">Are there official licensees of the Tor trademarks?</a></h2>
116 116
     <p>Yes.  A few open source, non-commercial projects are Tor trademark
117 117
     licensees:</p>
118 118
     <ul>
Browse code

add the trademark registrations to the faq.

Andrew Lewman authored on06/02/2014 05:51:50
Showing1 changed files
... ...
@@ -99,6 +99,13 @@
99 99
     help us strengthen its anonymity protection further.  We distribute the
100 100
     software itself freely, but require correct attribution. </p>
101 101
 
102
+    <p>We hold two trademarks in the United States:
103
+    <ul>
104
+    <li>Tor Onion Logo, U.S. Trademark Registration No. 3,465,433</li>
105
+    <li>Tor, U.S. Registration No. 3,465,432.</li>
106
+    </ul>
107
+    </p>
108
+
102 109
     <a id="commercial"></a>
103 110
     <h2>What if I produce non-open source, commercial products based on
104 111
     Tor?</h2>
Browse code

clarify right to change our minds

Andrew Lewman authored on17/07/2013 04:07:18
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 14
 
15 15
     <h1>General Statement of Trademark and Copyright</h1>
16 16
 
17
-    <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>
17
+    <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 change licenses and permissions at any time in its sole discretion.</p>
18 18
 
19 19
     <p>The Tor&#174 software is licensed in various ways. Learn more about the <a href="<page docs/faq>#DistributingTor">various licenses</a>.
20 20
 
Browse code

update copyright and trademark links/statement, see ticket 9203

Andrew Lewman authored on06/07/2013 04:35:51
Showing1 changed files
... ...
@@ -11,9 +11,16 @@
11 11
   </div>
12 12
   <div id="maincol">
13 13
     <!-- PUT CONTENT AFTER THIS TAG -->
14
+
15
+    <h1>General Statement of Trademark and Copyright</h1>
16
+
17
+    <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>
18
+
19
+    <p>The Tor&#174 software is licensed in various ways. Learn more about the <a href="<page docs/faq>#DistributingTor">various licenses</a>.
20
+
14 21
     <h1>Tor Trademark Frequently Asked Questions</h1>
15 22
     <hr>
16
-    
23
+
17 24
     <a id="usage"></a>
18 25
     <h2>How can I use the name "Tor"?</h2>
19 26
     <p>The Tor Project encourages developers to use the name Tor in ways that
... ...
@@ -27,7 +34,7 @@
27 34
     sponsored by The Tor Project. For example, “This product is produced
28 35
     independently from the Tor&#174; anonymity software and carries no guarantee
29 36
     from The Tor Project about quality, suitability or anything else.”</p>
30
-    
37
+
31 38
     <a id="onionlogo"></a>
32 39
     <h2>Can I use the Tor onion logo?</h2>
33 40
     <p>If you're making non-commercial use of Tor software, you may also use
... ...
@@ -36,7 +43,7 @@
36 43
     can use items that look like the Tor onion logo to illustrate a point
37 44
     (e.g. an exploded onion with layers, for instance), so long as they're
38 45
     not used as logos in ways that would confuse people.</p>
39
-    
46
+
40 47
     <a id="combining"></a>
41 48
     <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2>
42 49
     <p>Please don't use Tor in your product name or domain name. Instead,
... ...
@@ -91,12 +98,12 @@
91 98
     and network and actively encourage researchers to document attacks to
92 99
     help us strengthen its anonymity protection further.  We distribute the
93 100
     software itself freely, but require correct attribution. </p>
94
-    
101
+
95 102
     <a id="commercial"></a>
96 103
     <h2>What if I produce non-open source, commercial products based on
97 104
     Tor?</h2>
98 105
     <p>Contact us, and let's talk.</p>
99
-    
106
+
100 107
     <a id="licensee"></a>
101 108
     <h2>Are there official licensees of the Tor trademarks?</h2>
102 109
     <p>Yes.  A few open source, non-commercial projects are Tor trademark
... ...
@@ -115,4 +122,4 @@
115 122
   <!-- END SIDECOL -->
116 123
 </div>
117 124
 <!-- END CONTENT -->
118
-#include <foot.wmi>  
125
+#include <foot.wmi>
Browse code

clarify wording in our trademark faq

Roger Dingledine authored on03/02/2013 19:02:47
Showing1 changed files
... ...
@@ -39,11 +39,13 @@
39 39
     
40 40
     <a id="combining"></a>
41 41
     <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2>
42
-    <p>We recommend that you don't do this, but rather find a name that will
43
-    accurately identify <i>your</i> products or services.  Remember that our goal
42
+    <p>Please don't use Tor in your product name or domain name. Instead,
43
+    find a name that will accurately identify <i>your</i> products
44
+    or services. Remember that our goal
44 45
     is to make sure that people aren't confused about whether your product
45 46
     or project is made or endorsed by The Tor Project. Creating a new brand
46
-    that incorporates the Tor brand is likely to lead to confusion.</p>
47
+    that incorporates the Tor brand is likely to lead to confusion,
48
+    and commercial confusion is a sign of trademark infringement.</p>
47 49
 
48 50
     <a id="researchpapers"></a>
49 51
     <h2>What about cute Tor-derived names in research paper titles?</h2>
Browse code

state a position on using the tor mark in research paper titles

Roger Dingledine authored on05/12/2012 18:10:05
Showing1 changed files
... ...
@@ -44,7 +44,33 @@
44 44
     is to make sure that people aren't confused about whether your product
45 45
     or project is made or endorsed by The Tor Project. Creating a new brand
46 46
     that incorporates the Tor brand is likely to lead to confusion.</p>
47
-    
47
+
48
+    <a id="researchpapers"></a>
49
+    <h2>What about cute Tor-derived names in research paper titles?</h2>
50
+
51
+    <p>Tor enjoys a vibrant <a
52
+    href="https://research.torproject.org/">research community</a>
53
+    that examines anonymity attacks and defenses, design improvements,
54
+    impact on society, and so on. We think it's great that professors
55
+    and other researchers continue to contribute to our community,
56
+    and we've even gotten funding from the National Science Foundation
57
+    to help keep the Tor design and code researcher-friendly. The <a
58
+    href="http://freehaven.net/anonbib/">anonymity bibliography</a> lists
59
+    many research papers that use Tor-derived names in their titles:
60
+    Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus,
61
+    and more.</p>
62
+
63
+    <p>Since the authors of these research papers aren't trying to make
64
+    a profit from them, and (because they're just papers, not products)
65
+    the papers aren't confusing Tor users into running potentially unsafe
66
+    software, we believe that the use of the Tor mark in these research
67
+    paper titles is acceptable non-trademark or fair use.</p>
68
+
69
+    <p>That said, if the research paper comes with software, and that
70
+    software could potentially confuse people (users or other researchers)
71
+    about whether it's written or endorsed by The Tor Project, then we're
72
+    back to the <a href="#combining">above scenario</a>.</p>
73
+
48 74
     <a id="enforcing"></a>
49 75
     <h2>Does this mean you're enforcing trademark rights?</h2>
50 76
     <p>The Tor Project is a non-profit corporation organized to research and
Browse code

clean up some obvious dead links that are frequently hit by users.

Andrew Lewman authored on21/03/2012 04:33:49
Showing1 changed files
... ...
@@ -76,10 +76,7 @@
76 76
     <ul>
77 77
     <li><a href="https://tails.boum.org/">The Amnesic Incognito Live
78 78
     System</a></li>
79
-    <li>Portable Tor</li>
80
-    <li><a href="http://torstatus.kgprog.com/">Kprog Tor Status</a></li>
81 79
     <li><a href="<page projects/vidalia>">Vidalia</a></li>
82
-    <li><a href="http://www.anonymityanywhere.com/tork/">TorK</a></li>
83 80
     </ul>
84 81
   </div>
85 82
   <!-- END MAINCOL -->
Browse code

More changes requested by intrigeri (replacing amnesia.boum.org with tails.boum.org and stripping the parenthesis from "Amnesic")

Damian Johnson authored on12/03/2011 23:04:22
Showing1 changed files
... ...
@@ -74,7 +74,7 @@
74 74
     <p>Yes.  A few open source, non-commercial projects are Tor trademark
75 75
     licensees:</p>
76 76
     <ul>
77
-    <li><a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live
77
+    <li><a href="https://tails.boum.org/">The Amnesic Incognito Live
78 78
     System</a></li>
79 79
     <li>Portable Tor</li>
80 80
     <li><a href="http://torstatus.kgprog.com/">Kprog Tor Status</a></li>
Browse code

get rid of a 404 before somebody registers a new sourceforge project named portable tor.

Roger Dingledine authored on28/10/2010 10:28:47
Showing1 changed files
... ...
@@ -76,7 +76,7 @@
76 76
     <ul>
77 77
     <li><a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live
78 78
     System</a></li>
79
-    <li><a href="http://portabletor.sourceforge.net/">Portable Tor</a></li>
79
+    <li>Portable Tor</li>
80 80
     <li><a href="http://torstatus.kgprog.com/">Kprog Tor Status</a></li>
81 81
     <li><a href="<page projects/vidalia>">Vidalia</a></li>
82 82
     <li><a href="http://www.anonymityanywhere.com/tork/">TorK</a></li>
Browse code

looks like we never set the keywords either

Roger Dingledine authored on27/10/2010 12:31:57
Showing1 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 ## translation metadata
2
-# Revision: $Revision: 22138 $
2
+# Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5 5
 #include "head.wmi" TITLE="Tor Project: Trademark FAQ" CHARSET="UTF-8"
Browse code

We decided to go with HTML in favor of XHTML.

Sebastian Hahn authored on10/10/2010 03:34:47
Showing1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
   <div id="maincol">
13 13
     <!-- PUT CONTENT AFTER THIS TAG -->
14 14
     <h1>Tor Trademark Frequently Asked Questions</h1>
15
-    <hr />
15
+    <hr>
16 16
     
17 17
     <a id="usage"></a>
18 18
     <h2>How can I use the name "Tor"?</h2>
Browse code

change all of the breadcrumbs from page home to page index.

Andrew Lewman authored on12/08/2010 17:17:47
Showing1 changed files
... ...
@@ -5,7 +5,7 @@
5 5
 #include "head.wmi" TITLE="Tor Project: Trademark FAQ" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8
-    <a href="<page home>">Home &raquo; </a>
8
+    <a href="<page index>">Home &raquo; </a>
9 9
     <a href="<page docs/documentation>">Documentation &raquo; </a>
10 10
     <a href="<page docs/trademark-faq>">Trademark FAQ</a>
11 11
   </div>
Browse code

first cut of the new, shiny tor website as wml.

Andrew Lewman authored on09/07/2010 03:55:22
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,93 @@
1
+## translation metadata
2
+# Revision: $Revision: 22138 $
3
+# Translation-Priority: 3-low
4
+
5
+#include "head.wmi" TITLE="Tor Project: Trademark FAQ" CHARSET="UTF-8"
6
+<div id="content" class="clearfix">
7
+  <div id="breadcrumbs">
8
+    <a href="<page home>">Home &raquo; </a>
9
+    <a href="<page docs/documentation>">Documentation &raquo; </a>
10
+    <a href="<page docs/trademark-faq>">Trademark FAQ</a>
11
+  </div>
12
+  <div id="maincol">
13
+    <!-- PUT CONTENT AFTER THIS TAG -->
14
+    <h1>Tor Trademark Frequently Asked Questions</h1>
15
+    <hr />
16
+    
17
+    <a id="usage"></a>
18
+    <h2>How can I use the name "Tor"?</h2>
19
+    <p>The Tor Project encourages developers to use the name Tor in ways that
20
+    do not confuse the public about the source of anonymity software and
21
+    services.  If you are building open-source non-commercial software or
22
+    services that incorporate or work with The Tor Project's code, you may
23
+    use the name “Tor” in an accurate description of your work.  We ask you
24
+    to include a link to the official Tor website
25
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a> so users can verify the original source of
26
+    Tor for themselves, and a note indicating that your project is not
27
+    sponsored by The Tor Project. For example, “This product is produced
28
+    independently from the Tor&#174; anonymity software and carries no guarantee
29
+    from The Tor Project about quality, suitability or anything else.”</p>
30
+    
31
+    <a id="onionlogo"></a>
32
+    <h2>Can I use the Tor onion logo?</h2>
33
+    <p>If you're making non-commercial use of Tor software, you may also use
34
+    the Tor onion logo (as an illustration, not as a brand for your
35
+    products).  Please don't modify the design or colors of the logo.  You
36
+    can use items that look like the Tor onion logo to illustrate a point
37
+    (e.g. an exploded onion with layers, for instance), so long as they're
38
+    not used as logos in ways that would confuse people.</p>
39
+    
40
+    <a id="combining"></a>
41
+    <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2>
42
+    <p>We recommend that you don't do this, but rather find a name that will
43
+    accurately identify <i>your</i> products or services.  Remember that our goal
44
+    is to make sure that people aren't confused about whether your product
45
+    or project is made or endorsed by The Tor Project. Creating a new brand
46
+    that incorporates the Tor brand is likely to lead to confusion.</p>
47
+    
48
+    <a id="enforcing"></a>
49
+    <h2>Does this mean you're enforcing trademark rights?</h2>
50
+    <p>The Tor Project is a non-profit corporation organized to research and
51
+    develop the Tor anonymity software and network.  We don't want to be
52
+    trademark bullies, but we will use trademark to protect the public's
53
+    ability to recognize Tor Project software.  Trademark law helps us to assure
54
+    that the name is used only in connection with genuine Tor anonymity
55
+    software and for accurate description of software and services.
56
+    After all, to protect their anonymity securely, computer users must be
57
+    able to identify the software they are using, so they can account
58
+    properly for its strengths and weaknesses.  Tor has become well-known as
59
+    a software package and associated network of onion-routing anonymizing
60
+    proxies, with online documentation, instructions for strengthening
61
+    anonymity protection, and warnings that even at this stage it remains
62
+    experimental software.  We work with developers to improve the software
63
+    and network and actively encourage researchers to document attacks to
64
+    help us strengthen its anonymity protection further.  We distribute the
65
+    software itself freely, but require correct attribution. </p>
66
+    
67
+    <a id="commercial"></a>
68
+    <h2>What if I produce non-open source, commercial products based on
69
+    Tor?</h2>
70
+    <p>Contact us, and let's talk.</p>
71
+    
72
+    <a id="licensee"></a>
73
+    <h2>Are there official licensees of the Tor trademarks?</h2>
74
+    <p>Yes.  A few open source, non-commercial projects are Tor trademark
75
+    licensees:</p>
76
+    <ul>
77
+    <li><a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live
78
+    System</a></li>
79
+    <li><a href="http://portabletor.sourceforge.net/">Portable Tor</a></li>
80
+    <li><a href="http://torstatus.kgprog.com/">Kprog Tor Status</a></li>
81
+    <li><a href="<page projects/vidalia>">Vidalia</a></li>
82
+    <li><a href="http://www.anonymityanywhere.com/tork/">TorK</a></li>
83
+    </ul>
84
+  </div>
85
+  <!-- END MAINCOL -->
86
+  <div id = "sidecol">
87
+#include "side.wmi"
88
+#include "info.wmi"
89
+  </div>
90
+  <!-- END SIDECOL -->
91
+</div>
92
+<!-- END CONTENT -->
93
+#include <foot.wmi>