[or-cvs] address comments from paul.
arma at seul.org
arma at seul.org
Wed Jul 20 23:37:48 UTC 2005
Update of /home2/or/cvsroot/website
In directory moria:/home/arma/work/onion/cvs/website
address comments from paul.
(alas, rms loses again.)
RCS file: /home2/or/cvsroot/website/gui-contest.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gui-contest.html 20 Jul 2005 23:25:07 -0000 1.17
+++ gui-contest.html 20 Jul 2005 23:37:46 -0000 1.18
@@ -73,7 +73,7 @@
<h3><a class="anchor" href="#Goals">Goals</a></h3>
<p>Contestants will produce a work of <a
+href="http://www.opensource.org/">Open Source Software</a>
provide a user interface to the Tor system by way of the <a
@@ -151,15 +151,16 @@
<h3><a class="anchor" href="#Categories">Contest Categories</a></h3>
-The design contest will proceed in two stages: first sketches and then
-working code. For each stage, our panel of judges will recognize the
+The design contest 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
(subject to availability). The best sketches and working implementations
will be published on the Tor website.
-the goal of this stage is to produce a mock-up of a functioning interface.
+the goal of this phase is to produce a mock-up of a functioning interface.
This should include design documents describing how the interface should
function. If you want, it should also include graphical elements that
can be used by programmers.
@@ -191,9 +192,9 @@
and design documentation to aid would-be implementers.</li>
-<p><b>Code:</b> the goal of this stage is to produce a working
+<p><b>Code:</b> the goal of this phase is to produce a working
implementation. You may use any of the sketches, graphics, or ideas from
-the first stage (with appropriate credit to
+the first phase (with appropriate credit to
their authors), or you can make your own. See the <a
Samples</a> wiki page for some other images you can reuse.
@@ -236,8 +237,7 @@
<li>Source code, with appropriate makefiles or documentation explaining
how to build it. Must be licensed under a free/open source license, as
-defined by <a href="http://www.opensource.org/licenses/">OSI</a> or <a
-href="http://www.debian.org/social_contract#guidelines">DFSG</a>. See <a
+defined by <a href="http://www.opensource.org/licenses/">OSI</a>. See <a
FAQ entry</a> for clarification.</li>
<li>Compiled binaries or bytecodes for at least one platform of choice.</li>
@@ -289,9 +289,9 @@
<h3><a class="anchor" href="#Timeline">Timeline</a></h3>
-<li>Stage 1 deadline (sketches): October 31.</li>
-<li>Stage 1 judging: November 31.</li>
-<li>Stage 2 deadline (code): January 31, 2006.</li>
+<li>Phase 1 deadline (sketches): October 31.</li>
+<li>Phase 1 judging: November 31.</li>
+<li>Phase 2 deadline (code): January 31, 2006.</li>
<p>Winners will be announced on the webpage and also at the SOUPS 2006
More information about the tor-commits