tor-webwml.git

@@ -74,7 +74,7 @@

 <h2>Categories</h2>

 <p>

-The design contest will proceed in two phases: first sketches and then

+The design competition will proceed in two phases: first sketches and then

 working code. You are invited to submit to either phase, or both phases.

 For each phase, our panel of judges will recognize the

 best submissions. All qualifying entries will receive an EFF Tor T-shirt

@@ -89,7 +89,7 @@ to the user.

 <p>

 The Tor project, affiliated with the

 <a href="http://www.eff.org/">Electronic Frontier Foundation</a>, is

-running a <b>UI contest</b> to develop a vision of how Tor can

+running a <b>UI competition</b> to develop a vision of how Tor can

 work in a user's everyday anonymous browsing experience. Some of the

 challenges include how to make alerts and error conditions visible on

 screen; how to let the user configure Tor to use or avoid certain routes

@@ -73,7 +73,7 @@

 <h2>Legal Notes</h2>

-<p>By submitting your entry to be considered in the Tor GUI contest, you

+<p>By submitting your entry to be considered in the Tor GUI competition, you

 hereby:</p>

 <p>

 <b>(A)</b> represent and warrant that (1) the entry was created by you and

@@ -78,8 +78,8 @@

 <p>Shortly before phase two begins, the Tor developers will release

 a canonical version of Tor. This is the version that will be used for

-judging the contest; please ensure that you use this version. Bugfixes

-to this version of Tor will be announced to the contest web site.</p>

+judging the competition; please ensure that you use this version. Bugfixes

+to this version of Tor will be announced to the competition web site.</p>

 <p>The Tor developers will also release test rigs (libraries) in both Java

 and Python that demonstrate Tor's controller protocol. Code submissions