[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r23444: {website} kill the dead project pages they should be on the wiki anywa (in website/branches/web20: . projects/en)



Author: phobos
Date: 2010-10-07 18:46:12 +0000 (Thu, 07 Oct 2010)
New Revision: 23444

Removed:
   website/branches/web20/projects/en/clientside.wml
   website/branches/web20/projects/en/google.wml
   website/branches/web20/projects/en/gui-categories.wml
   website/branches/web20/projects/en/gui-criteria.wml
   website/branches/web20/projects/en/gui-legal.wml
   website/branches/web20/projects/en/gui-submit.wml
   website/branches/web20/projects/en/gui-technotes.wml
   website/branches/web20/projects/en/hidserv.wml
   website/branches/web20/projects/en/lowbandwidth.wml
   website/branches/web20/projects/en/serverside.wml
Modified:
   website/branches/web20/Makefile
   website/branches/web20/projects/en/projects.wml
   website/branches/web20/projects/en/sidenav.wmi
Log:
kill the dead project pages they should be on the wiki anyway, start
desc about active projects, add torbutton to the makefile.


Modified: website/branches/web20/Makefile
===================================================================
--- website/branches/web20/Makefile	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/Makefile	2010-10-07 18:46:12 UTC (rev 23444)
@@ -23,7 +23,7 @@
 export DEVTAG=tor-0.2.2.17-alpha
 
 WMLBASE=.
-SUBDIRS=docs eff projects press about download download getinvolved donate
+SUBDIRS=docs eff projects press about download getinvolved donate torbutton
 
 include $(WMLBASE)/Makefile.common
 all: $(SUBDIRS)

Deleted: website/branches/web20/projects/en/clientside.wml
===================================================================
--- website/branches/web20/projects/en/clientside.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/clientside.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,107 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Client-side Projects" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/clientside>">Client-side Projects</a>
-  </div>
-	<div id="maincol">
-  	<h1>Client-side Projects</h1>
-    <p>Consectetur adipiscing elit. Proin sit amet dolor justo, lacinia dapibus est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In orci est, pellentesque sit amet consequat eget, venenatis id augue. Quisque arcu velit, ultricies non porta a, dictum in lorem. Quisque pulvinar laoreet fermentum. Quisque mauris nulla, lobortis non facilisis at, lacinia in diam. Sed at enim tortor, vitae consequat elit.</p>
-    <div class="featured-project focus left first">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
-      <div class="name">Torbrowser</div>
-      <div class="caps">By Author</div>
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-    </div>
-    <div class="featured-project focus left">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
-      <div class="name">Torbutton</div>
-      <div class="caps">By Author</div>
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Integer semper justo mattis. <a href="<page torbutton/index>">Learn more &raquo;</a></p>
-    </div>
-    <table class="topforty">
-    	<tr>
-        <td class="beige">
-          <div class="name">Tordnsel</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/tordnsel>">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Vidalia</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-    </table>
-    <!-- END TABLE -->
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>   

Deleted: website/branches/web20/projects/en/google.wml
===================================================================
--- website/branches/web20/projects/en/google.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/google.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,89 +0,0 @@
-## translation metadata
-# Revision: $Revision: 21511 $
-# Translation-Priority: 4-optional
-
-#include "head.wmi" TITLE="Tor Project: Google Project: Secure Upgrade of Tor" CHARSET="UTF-8"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/google>">Google Project</a>
-  </div>
-	<div id="maincol"> 
-    <!-- PUT CONTENT AFTER THIS TAG -->
-    
-    <h2>Google Project:  Secure Upgrade of Tor</h2>
-    
-    <hr />
-    
-    <p>
-    
-    
-    </p>
-    
-    <p>
-    This project is generously funded by <a href="http://www.google.com";>Google</a>.
-    </p>
-    
-    <a id="Timetable"></a>
-    <h2><a class="anchor" href="#Timetable">Timetable</a></h2>
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
-    <!-- <thead>
-    <tr bgcolor="#e5e5e5">
-    <th>Deliverable</th>
-    <th>Due Date</th>
-    </tr>
-    </thead> -->
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Milestone 1:</b> Vidalia recognizes when Tor needs to upgrade,
-    and learns the most suitable new version and where to find it.<br />
-        <small><em>Looking at the majority-signed network status consensus
-    to decide when to update and to what version (Tor already lists what
-    versions are considered safe, in each network status
-    document)</em></small>
-      </td>
-      <td>
-        November 15, 2008
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b>Milestone 2:</b>Vidalia can fetch a new version of Tor from the
-    Tor website and check its signature.<br />  
-        <small><em>Update either via Tor or via the directory
-    mirror update protocol (proposal 127) when possible, for additional
-    privacy.   Check package signatures to ensure package validity.</em></small>
-      </td>
-      <td>
-        November 15, 2008
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Milestone 3:</b> Vidalia has an interface for notifying the user
-    about upgrades and helping them upgrade. <br /> 
-        <small><em>Give the user an interface for these updates, including
-    letting her opt to migrate from one major Tor version to the next. 
-        </em></small>
-      </td>
-      <td>
-        November 15, 2008
-      </td>
-    </tr>
-    </table>
-    
-    <br />
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>    

Deleted: website/branches/web20/projects/en/gui-categories.wml
===================================================================
--- website/branches/web20/projects/en/gui-categories.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/gui-categories.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,133 +0,0 @@
-## translation metadata
-# Revision: $Revision: 12809 $
-
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/projects>">Gui Competition</a>
-  </div>
-    
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
-    <div class="guileft">
-    <div class="guimenu">
-      
-      <div class="curveleft">
-      <div class="curveright">
-      &nbsp;
-      </div>
-      </div>
-    
-    <div class="guimenuinner">
-    <h1>Tor GUI Competition</h1>
-    
-    <a href="index.html">Overview &amp; Goals</a>
-    <a class="on" href="categories.html">What to Submit</a>
-    <a href="submit.html">How to Submit</a>
-    <a href="criteria.html">Judging &amp; Timeline</a>
-    <a href="technotes.html">Technical Notes</a>
-    <a href="legal.html">Licensing</a>
-    <h1>&nbsp;</h1>
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ";>Wiki/FAQ</a>
-    </div>
-    
-      <div class="curvebottomleft">
-      <div class="curvebottomright">
-      &nbsp;
-      </div>
-      </div>
-    
-    </div>
-    </div>
-    
-    <h2>Categories</h2>
-    <p>
-    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.
-    </p>
-    
-    <p>
-    All qualifying entries will receive an <a
-    href="https://www.torproject.org/tshirt.html";>EFF Tor T-shirt</a>
-    (subject to availability). The best sketches and working implementations
-    will be published on the Tor website.
-    </p>
-    
-    <p><b>Sketches:</b>
-    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.
-    </p>
-    
-    <p>
-    A qualifying sketch will present an informal specification for a
-    design. That is, it will present with some degree of thoroughness all
-    of the major interfaces that we might expect to encounter, all of the
-    major functionality for the interface, and a reasonable story about
-    how it would be integrated into currently-existing tools (if, indeed,
-    it would be). One example, with more detail than we would require, is
-    <a href="http://ui.netbeans.org/docs/ui/junits/promo_f.html";>the NetBeans
-    UI for JUnit</a>. Note that it walks through multiple interfaces,
-    highlighting the features and functions of the various buttons.
-    </p>
-    
-    <ul>
-    <li><b>Most featureful interface</b> will be awarded to the graphic design
-    that would provide usable, clear access to the most aspects of the Tor
-    system, covering many or most of the categories on the "useful features"
-    list.</li>
-    <li><b>Most usable experience</b> will be awarded to the graphic
-    design that would provide the most unobtrusive Tor experience while still
-    covering all criteria (working, perhaps, on the "no news is good news"
-    theory).</li>
-    <li><b>Clearest implementation guidance</b> will be awarded to the
-    graphic design that provides the cleanest package of graphic elements
-    and design documentation to aid would-be implementers.</li>
-    </ul>
-    
-    <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 <a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestEntries";>first
-    phase</a> (with appropriate credit to their authors), or you can make
-    your own. See the <a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestSamples";>Competition
-    Samples</a> wiki page for some other images you can reuse.
-    </p>
-    
-    <p>
-    An acceptable entry will be a package of free software that builds and
-    runs. It can be a stand-alone application, or it can act as an extension
-    or plugin to other broadly-available free software. The entry will
-    demonstrate the points in the Goals section: that is, it will be able
-    to control, display, and maintain awareness as discussed above.
-    </p>
-    
-    <ul>
-    <li><b>Most featureful interface</b> will be awarded to the application
-    that provides usable, clear access to the most aspects of the Tor system,
-    covering many or most of the categories on the "additional" list.</li>
-    <li><b>Most usable experience</b> will be awarded to the
-    application that provides the most unobtrusive Tor experience while
-    still covering all criteria (working, perhaps, on the "no news is good
-    news" theory).</li>
-    <li><b>Most flexible</b> will be awarded to the best system that runs
-    smoothly on all three of Windows, Linux, and OS&nbsp;X; extra points will be
-    awarded for additional systems.</li>
-    </ul>
-    
-    <p>We reserve the right to award other awards as the entries deserve.</p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>       

Deleted: website/branches/web20/projects/en/gui-criteria.wml
===================================================================
--- website/branches/web20/projects/en/gui-criteria.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/gui-criteria.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,99 +0,0 @@
-## translation metadata
-# Revision: $Revision: 12809 $
-
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/gui-criteria>">GUI Criteria</a>
-  </div>
-	<div id="maincol">  
-    
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
-    <div class="guileft">
-    <div class="guimenu">
-      
-      <div class="curveleft">
-      <div class="curveright">
-      &nbsp;
-      </div>
-      </div>
-    
-    <div class="guimenuinner">
-    <h1>Tor GUI Competition</h1>
-    
-    <a href="index.html">Overview &amp; Goals</a>
-    <a href="categories.html">What to Submit</a>
-    <a href="submit.html">How to Submit</a>
-    <a class="on" href="criteria.html">Judging &amp; Timeline</a>
-    <a href="technotes.html">Technical Notes</a>
-    <a href="legal.html">Licensing</a>
-    <h1>&nbsp;</h1>
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ";>Wiki/FAQ</a>
-    </div>
-    
-      <div class="curvebottomleft">
-      <div class="curvebottomright">
-      &nbsp;
-      </div>
-      </div>
-    
-    </div>
-    </div>
-    
-    <h2>Criteria</h2>
-    
-    <p>Awards will be granted on the basis of (in rough preference order):</p>
-    
-    <ul>
-    <li>Usability (<a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#DefineUsable";>what
-    does this mean?</a>)</li>
-    <li>Informativeness: can the user learn what they need to know, both in terms
-    of using the network and also in terms of security decisions?</li>
-    <li>Total user experience</li>
-    <li>Aesthetics</li>
-    <li>Responsiveness</li>
-    <li>Stability and robustness</li>
-    <li>Internationalization (multiple language support)</li>
-    <li>Installation experience</li>
-    </ul>
-    <br />
-    <h2>Judges</h2>
-    
-    <p>Judging will be led by a panel of prominent specialists in usability
-    and security, including:</p>
-    <ul>
-    <li>Patrick Ball, Director, Human Rights Program, The Benetech
-    Initiative</li>
-    <li>Ren Bucholz, EFF</li>
-    <!--<li>Simson Garfinkel, Center for Research on Computation and Society,
-    Harvard University</li>-->
-    <li>Bruce Schneier, Counterpane Internet Security</li>
-    <li>Adam Shostack, Informed Security</li>
-    <li>Edward Tufte</li>
-    <li>Ka-Ping Yee, University of California, Berkeley</li>
-    </ul>
-    
-    <h2>Timeline</h2>
-    
-    <ul>
-    <li>Phase 1 deadline (sketches): November 30, 2005.</li>
-    <li>Phase 2 deadline (code): May 31, 2006.</li>
-    </ul>
-    
-    <p>Winners will be announced on the webpage and also at the SOUPS 2006
-    conference. (Here's a suggestion on one approach to <a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#AcademicResearch";>academic
-    usability research on Tor</a>.)</p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>       

Deleted: website/branches/web20/projects/en/gui-legal.wml
===================================================================
--- website/branches/web20/projects/en/gui-legal.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/gui-legal.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,80 +0,0 @@
-## translation metadata
-# Revision: $Revision: 12809 $
-
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/gui-legal>">GUI Legal</a>
-  </div>
-	<div id="maincol">  
-    
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
-    <div class="guileft">
-    <div class="guimenu">
-      
-      <div class="curveleft">
-      <div class="curveright">
-      &nbsp;
-      </div>
-      </div>
-    
-    <div class="guimenuinner">
-    <h1>Tor GUI Competition</h1>
-    
-    
-    <a href="index.html">Overview &amp; Goals</a>
-    <a href="categories.html">What to Submit</a>
-    <a href="submit.html">How to Submit</a>
-    <a href="criteria.html">Judging &amp; Timeline</a>
-    <a href="technotes.html">Technical Notes</a>
-    <a class="on" href="legal.html">Licensing</a>
-    <h1>&nbsp;</h1>
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ";>Wiki/FAQ</a>
-    </div>
-    
-      <div class="curvebottomleft">
-      <div class="curvebottomright">
-      &nbsp;
-      </div>
-      </div>
-    
-    </div>
-    </div>
-    
-    <h2>Legal Notes</h2>
-    
-    <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
-    that you own all rights to the entry or have the authorized rights to
-    submit such entry and grant the licenses below; and (2) that the
-    entry does not infringe on any third party copyright or other
-    intellectual property rights; AND
-    </p><p>
-    <b>(B)</b> EITHER (1) grant us a worldwide, royalty-free, non-exclusive,
-    perpetual license to reproduce, edit, perform, display, publish, make
-    derivative works, and otherwise use the entry as we see fit,
-    including without limitation, incorporating (in whole or in part)
-    into the Tor software, and to sublicense such rights; OR, (2)
-    provide the entry pursuant to a license that complies with the
-    <a href="http://www.opensource.org/docs/definition.php";>Open
-    Source Definition</a>, such as the 3-clause BSD, MIT, or
-    GPL licenses, or (where applicable) provide the entry licensed under
-    the <a href="http://creativecommons.org/licenses/by/2.5/";>Creative
-    Commons Attribution</a> license. If you provide the entry pursuant to
-    such a license, you must include the applicable information in your
-    submission.
-    </p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>       

Deleted: website/branches/web20/projects/en/gui-submit.wml
===================================================================
--- website/branches/web20/projects/en/gui-submit.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/gui-submit.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,91 +0,0 @@
-## translation metadata
-# Revision: $Revision: 12809 $
-
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/projects>">GUI Submit</a>
-  </div>
-	<div id="maincol">  
-
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
-    <div class="guileft">
-    <div class="guimenu">
-      
-      <div class="curveleft">
-      <div class="curveright">
-      &nbsp;
-      </div>
-      </div>
-    
-    <div class="guimenuinner">
-    <h1>Tor GUI Competition</h1>
-    
-    
-    <a href="index.html">Overview &amp; Goals</a>
-    <a href="categories.html">What to Submit</a>
-    <a class="on" href="submit.html">How to Submit</a>
-    <a href="criteria.html">Judging &amp; Timeline</a>
-    <a href="technotes.html">Technical Notes</a>
-    <a href="legal.html">Licensing</a>
-    <h1>&nbsp;</h1>
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ";>Wiki/FAQ</a>
-    </div>
-    
-      <div class="curvebottomleft">
-      <div class="curvebottomright">
-      &nbsp;
-      </div>
-      </div>
-    
-    </div>
-    </div>
-    
-    <h2>How to Submit an Entry</h2>
-    
-    <p>Submissions for phase one (sketches) should come as:</p>
-    <ul>
-    <li>Images in an html page. The images must be able to be viewed on an
-    ordinary browser, e.g. Firefox. (You can submit proprietary formats too,
-    but if you do then you need to also export them to something we can
-    all read.) Must be licensed under a <a href="legal.html">free license</a>.</li>
-    <li>A design document (txt, html, pdf, or ps) as described in the
-    <a href="categories.html">Submission Categories</a> section.</li>
-    </ul>
-    
-    <p>Submissions for phase two (code) should come as:</p>
-    
-    <ul>
-    <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>. See <a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ#DefineFree";>this
-    FAQ entry</a> for clarification.</li>
-    <li>Compiled binaries or bytecodes for at least one platform of choice.</li>
-    <li>A design document (txt, html, pdf, or ps) providing an overview of
-    what major functions to look for and what functions are implemented.</li>
-    </ul>
-    
-    <p>To submit your entry, make a web page with
-    all your materials on it, then add a line to <a
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestEntries";>The
-    GUI Competition Entries Wiki</a>. (If you don't have a web page of
-    your own to put your entry on, find a friend who does, or mail <a
-    href="mailto:tor-gui@xxxxxxxxxxxxx";>tor-gui@xxxxxxxxxxxxx</a> and we'll
-    put it up on a temporary page.</p>
-    
-    <p>If you put it up on your own site, you can continue to update and
-    modify it. Remember that submitting early means you can get feedback
-    from Tor users and make it into a better submission!</p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>       

Deleted: website/branches/web20/projects/en/gui-technotes.wml
===================================================================
--- website/branches/web20/projects/en/gui-technotes.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/gui-technotes.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,78 +0,0 @@
-## translation metadata
-# Revision: $Revision: 21421 $
-
-#include "head.wmi" TITLE="Tor Project: GUI Competition" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/gui-technotes>">GUI Technical Notes</a>
-  </div>
-	<div id="maincol">  
-
-    <!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
-    <div class="guileft">
-    <div class="guimenu">
-      
-      <div class="curveleft">
-      <div class="curveright">
-      &nbsp;
-      </div>
-      </div>
-    
-    <div class="guimenuinner">
-    <h1>Tor GUI Competition</h1>
-    
-    
-    <a href="index.html">Overview &amp; Goals</a>
-    <a href="categories.html">What to Submit</a>
-    <a href="submit.html">How to Submit</a>
-    <a href="criteria.html">Judging &amp; Timeline</a>
-    <a class="on" href="technotes.html">Technical Notes</a>
-    <a href="legal.html">Licensing</a>
-    <h1>&nbsp;</h1>
-    <a class="wiki" href="https://wiki.torproject.org/noreply/TheOnionRouter/ContestFAQ";>Wiki/FAQ</a>
-    </div>
-    
-      <div class="curvebottomleft">
-      <div class="curvebottomright">
-      &nbsp;
-      </div>
-      </div>
-    
-    </div>
-    </div>
-    
-    <h2>Technical Notes</h2>
-    
-    
-    <p>For phase two, the canonical version of Tor is going to be the
-    upcoming 0.1.1.x release. This is the version that will be used for
-    judging the competition; please ensure that you use this version. Bugfixes
-    to this version of Tor will be announced on the
-    <a href="<page download/download>">Tor download page</a>.
-    Let us know if you find bugs!
-    </p>
-    
-    <p>You may find the <a href="<gitblob>doc/control-spec.txt">Tor controller
-    specification</a> or the <a
-    href="https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt";>Tor
-    controller howto</a> helpful.
-    </p>
-    
-    <p>The Tor developers will also release test rigs (libraries) in both Java
-    and Python that demonstrate Tor's controller protocol. Code submissions
-    may be able to save a lot of time by using this code as a skeleton. You
-    can check out the <a href="https://svn.torproject.org/svn/torctl/trunk/";>development
-    versions of these libraries</a> now. Let us know if you find bugs!
-    </p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>       

Deleted: website/branches/web20/projects/en/hidserv.wml
===================================================================
--- website/branches/web20/projects/en/hidserv.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/hidserv.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,475 +0,0 @@
-## translation metadata
-# Revision: $Revision: 21511 $
-# Translation-Priority: 4-optional
-
-#include "head.wmi" TITLE="Tor Project: NLnet Project: Speed Up Tor Hidden Services" CHARSET="UTF-8"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/hidserv>">NLnet Project</a>
-  </div>
-	<div id="maincol"> 
-    <!-- PUT CONTENT AFTER THIS TAG -->
-    
-    <h2>NLnet Project: Speed Up Tor Hidden Services</h2>
-    <hr />
-    
-    <p>
-    Tor Hidden Services allow users to set up anonymous information services,
-    like websites, that can only be accessed through the Tor network and are
-    protected against identification of the host that runs the services.
-    The most critical limitations of Tor Hidden Services are the time it takes
-    until a Hidden Service is registered in the network and the latency of
-    contact establishment when accessed by a user.
-    Due to design issues in the original Tor protocol,
-    the connection to a new Hidden Service can take several minutes, which
-    leads most users to give up before the connection has been established.
-    Using Tor Hidden Services for direct interactive user-to-user
-    communication (e.g. messaging) is nearly impossible due to the high latency
-    of Hidden Service circuit setup.
-    </p>
-    
-    <p>
-    This project aims at speeding up Tor Hidden Services by improving the way
-    Tor circuits are set up between the user and the Hidden Service as well as
-    the way a Hidden Service is registered in the Tor network.
-    In a first step precise diagnostics of the behavior of the Hidden Services
-    in lab setups and real world situations will be conducted to find the
-    root causes of the bad timing effects.
-    Based on these diagnostics, optimization strategies will be designed and
-    verified for unwanted implications for the security and anonymity of the
-    Tor network.
-    The most promising optimizations will then be implemented to achieve a
-    notable improvement for the users. Precise success metrics will be
-    developed in the diagnostics phase, after it becomes clear where the time
-    is lost and what improvements are realistic.
-    The ultimate goal is to have the Hidden Services protocol change production
-    ready and propagated to the Tor users within a timeframe of less than
-    12 months.
-    </p>
-    
-    <p>
-    This project is generously funded by:
-    </p>
-    
-    <p>
-    <a href="http://www.nlnet.nl/news/2008/20080514-awards.html";>
-    <img src="$(IMGROOT)/nlnet-160x60.png" alt="The NLnet foundation" /></a>
-    </p>
-    
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
-    <thead>
-    <tr>
-    <th><big>Project</big></th>
-    <th><big>Due Date</big></th>
-    </tr>
-    </thead>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Deliverable A:</b> Analysis, measurements and problem
-        clarification<br />
-        <small><em>As Tor Hidden Services have not been actively developed
-        further in the last year or so of Tor development, certain aspects of
-        the problems are under-diagnosed. To identify the precise sources of
-        latency and time loss, an extensive analysis of the deeper reasons for
-        them needs to be conducted. Deliverable A will require about one month
-        of work. The results of the analysis will influence the design
-        decisions to be taken in Deliverable B.</em></small>
-      </td>
-      <td>
-        June 15, 2008
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b>Deliverable B:</b> Design and evaluation of the necessary
-        changes<br />
-        <small><em>The changes to Tor Hidden Services will affect core
-        functionality of the protocol and therefore require a careful
-        evaluation of possible repercussions for the security and anonymity. A
-        two-month period is planned for the design and evaluation phase, which
-        concludes with an extensive peer review.</em></small>
-      </td>
-      <td>
-        August 15, 2008
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Deliverable C:</b> Implementation<br />
-        <small><em>After design, evaluation and peer review the modifications
-        need to be implemented and integrated with the current Tor code base.
-        The actual implementation of the necessary changes will take
-        approximately two months.</em></small>
-      </td>
-      <td>
-        October 15, 2008
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b>Deliverable D:</b> Implementation and test of the change up to
-        release state<br />
-        <small><em>The modification is highly critical to the security and
-        anonymity of the Tor network, it requires extensive testing and
-        debugging in laboratory and real life conditions. A period of three
-        months is projected for testing and debugging, where the responsible
-        developer is committed to the testing effort with 1/3 of its time. Part
-        of the testing phase will be a public beta period.</em></small>
-      </td>
-      <td>
-        January 15, 2009
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Deliverable E:</b> Rollout<br />
-        <small><em>The actual rollout to the Tor server network will be
-        conducted in sync with the regular Tor release schedule. As this
-        schedule is dependent on a number of external factors, like the
-        completion of other software projects that should go into the same
-        release, the actual release time and the time until this release has
-        been accepted and installed by most Tor server operators can vary. From
-        experience a period of three to four months can be
-        expected.</em></small>
-      </td>
-      <td>
-        May 15, 2009
-      </td>
-    </tr>
-    </table>
-    
-    <br />
-    
-    <a id="Reports"></a>
-    <h2><a class="anchor" href="#Reports">Monthly Status Reports</a></h2>
-    <p>
-    There will be in total eight monthly status reports beginning with the
-    first deliverable on June 15, 2008 and ending with completion of
-    implementation and testing work on January 15, 2009.
-    </p>
-    
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
-    <thead>
-    <tr>
-    <th><big>Month,</big></th>
-    <th><big>Status Report</big></th>
-    </tr>
-    </thead>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Jun08"></a>
-        <a class="anchor" href="#Jun08">Jun 08</a>
-      </td>
-      <td>
-        <small><em>The original goal of analyzing the problems that lead to
-        slowdown of Tor Hidden Services has been accomplished. Part of this
-        analysis was measuring the delay that a user experiences when
-        setting up or accessing a hidden service. Furthermore, measurement data
-        from April 2008 could be leveraged to explore timings of internal
-        substeps of establishing a connection to a hidden service. The results
-        of this analysis are contained in a 22-page
-        <a href="http://freehaven.net/~karsten/hidserv/perfanalysis-2008-06-15.pdf";>report</a>
-        that has been made public on the Tor
-        <a href="http://archives.seul.org/or/dev/Jun-2008/msg00019.html";>developer
-        mailing list</a>.</em></small>
-        <br/>
-        <small><em>The analysis also unveiled a few bugs which were responsible
-        for part of the delay in making a hidden service available for
-        clients. Some bugs have been fixed subsequent to the analysis, others
-        will be fixed soon. The evaluation has further brought up several
-        possible approaches to improve Tor Hidden Service performance. Some of
-        these ideas can be applied immediately, while others require deeper
-        analysis and new measurements. Finally, in the course of the analysis,
-        we discovered that some improvements require more in-depth
-        changes to Tor which are not directly related to hidden services. These
-        changes cannot be achieved in the time frame of this
-        project.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Jul08"></a>
-        <a class="anchor" href="#Jul08">Jul 08</a>
-      </td>
-      <td>
-        <small><em>All bugs that have been found in the analysis have been
-        fixed. This includes the 2 bugs that have already been fixed during the
-        analysis and 4 more bugs that were fixed within the past 30 days. While
-        the bugfixes remove unintended performance bottlenecks due to
-        programming errors, some of the design changes that have been spotted
-        in the previous analysis have side-effects on anonymity or overall
-        network load which need to be evaluated against individual performance
-        gains. A <a href="http://freehaven.net/~karsten/hidserv/discussion-2008-07-15.pdf";>report</a>
-        has been published to the
-        <a href="http://archives.seul.org/or/dev/Jul-2008/msg00034.html";>developer
-        mailing list</a> including 7 possible design changes that need to be
-        discussed. Some evaluations (namely Low-Bandwidth Measurements and the
-        Grand Scaling Plan) have turned out to require more time than expected
-        and had to be scheduled for a later time in the project than
-        deliverable B. The current plan is to perform these evaluations within
-        the timeframe until January 15 and work with assumptions until final
-        results are available.</em></small>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Aug08"></a>
-        <a class="anchor" href="#Aug08">Aug 08</a>
-      </td>
-      <td>
-        <small><em>During the past 30 days the 7 proposed designs have been
-        further evaluated and discussed. Four of them have proven to be
-        applicable in terms of the required changes to the code and possible
-        anonymity implications. One has been classified as bug rather than
-        design change. Two had to be excluded for either unforeseeable security
-        problems, or uncertainty of actual performance
-        improvements.</em></small>
-        <br/>
-        <small><em>Together with the results from July 15, the design phase has
-        been concluded. The tasks for the upcoming implementation phase are now
-        quite clear: One bug needs to be fixed and four design changes need to
-        be implemented. Further, evaluations of the changed design need to be
-        performed in order to verify their usefulness. A
-        <a href="http://freehaven.net/~karsten/hidserv/design-2008-08-15.pdf";>report</a>
-        with the results of the design phase has been published to the
-        <a href="http://archives.seul.org/or/dev/Aug-2008/msg00025.html";>developer
-        mailing list</a>.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Sep08"></a>
-        <a class="anchor" href="#Sep08">Sep 08</a>
-      </td>
-      <td>
-        <small><em>During the first half of the implementation phase two bugs
-        could be fixed that were related to hidden services: the
-        <a href="http://bugs.noreply.org/flyspray/index.php?do=details&amp;id=767";>first
-        bug</a> has already been identified in the design phase and was
-        responsible for an unusual high failure rate when making a hidden
-        service available in the system; the
-        <a href="http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details";>second
-        bug</a> was found during the implementation phase and was responsible
-        for failure to connect to a working hidden service. Both bugfixes will
-        be included in the next unstable version and likely be backported to
-        one of the next stable releases.</em></small>
-        <br/>
-        <small><em>The four design changes that were proposed as result of the
-        design phase have been implemented in an
-        <a href="https://tor-svn.freehaven.net/svn/tor/branches/hidserv-design-changes/";>experimental
-        branch</a> of the unstable development tree. Early function tests have
-        shown that these changes work and provide better (perceived)
-        performance. This needs to be confirmed throughout the next four weeks
-        in internal tests. The next goal is to prepare a release of this
-        experimental branch that can be given out to beta testers at the
-        beginning of the upcoming testing phase.</em></small>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Oct08"></a>
-        <a class="anchor" href="#Oct08">Oct 08</a>
-      </td>
-      <td>
-        <small><em>The implementation phase has been concluded. The bugfixes
-        that were found in the past 30 days have been released in developer
-        version <a href="http://archives.seul.org/or/talk/Oct-2008/msg00093.html";>0.2.1.6-alpha</a>.
-        The four design changes that were identified in the design phase have
-        been specified in
-        <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/155-four-hidden-service-improvements.txt";>proposal 155</a>.
-        Three design changes have been included in the development codebase and
-        will automatically be included in the next development version. The
-        first two design changes improve connection establishment to a hidden
-        service by reducing a timeout from 60 to 30 seconds and by making a
-        second attempt in parallel after a delay of 15 seconds. The third
-        design change affects publication of a hidden service in the network by
-        advertising the service at 5 rather than 3 points in the network in
-        parallel and succeeding as soon as 3 points are established. The fourth
-        design change has turned out to be rather ineffective, but would add
-        considerable code complexity and was therefore dismissed. By now there
-        are no more open bugfixes or new designs. All changes are in the
-        development codebase and can be tested in the next phase.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Nov08"></a>
-        <a class="anchor" href="#Nov08">Nov 08</a>
-      </td>
-      <td>
-        <small><em>The performance improvements that were implemented in the
-        last phase have been released in Tor version 0.2.1.7-alpha. Users can
-        download this development version from the Tor homepage and test the
-        improvements with minimal effort. Further, two bugfixes (<a
-        href="http://bugs.noreply.org/flyspray/index.php?id=767&amp;do=details";>1</a>,
-        <a href="http://bugs.noreply.org/flyspray/index.php?id=814&amp;do=details";>2</a>)
-        that were found in the course of this project have been backported to
-        the stable branch and will be included with the next stable version
-        0.2.0.32.</em></small>
-        <br/>
-        <small><em>The main focus of the past 31 days was to perform new
-        measurements to see whether the improvements are effective or not.
-        Measurements were conducted for two days in the time of November 6th to
-        8th. Unfortunately, the Tor network suffered a serious problem in this
-        time: An expired directory authority certificate produced huge amounts
-        of traffic within the Tor network which <a
-        href="http://archives.seul.org/or/talk/Nov-2008/msg00053.html";>forced
-        many operators to shut down their relays</a>. A second measurement was
-        performed between 13th and 15th. The raw data are available <a
-        href="http://freehaven.net/~karsten/hidserv/perfdata-2008-11-13.tar.gz";>here</a>
-        (40 MB). But results show that the overall
-        network performance is still worse than in June 2008 when the first
-        hidden service measurements have been performed. This becomes visible
-        when comparing requests to the Tor directories which have not been
-        affected by the performance improvements and which exhibit
-        significantly worse performance than before. The effects of performance
-        improvements are visible, but absolute values are not comparable at
-        this time. New measurements will be conducted in December in the hope
-        that the effects of this problem have mitigated.</em></small>
-        <br/>
-        <small><em>Further, there might be a <a
-        href="http://bugs.noreply.org/flyspray/index.php?id=847&amp;do=details";>bug</a>
-        in the way how Tor downloads directory information during
-        bootstrapping. Even though this is not related to hidden services, an
-        improvement would benefit hidden service publication, too. Part of the
-        work during the upcoming 30 days will be to investigate this bug.
-        </em></small>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Dec08"></a>
-        <a class="anchor" href="#Dec08">Dec 08</a>
-      </td>
-      <td>
-        <small><em>Part of the last 30 days has been used to fix bugs that have
-        influenced the previous hidden service measurements. The first <a
-        href="http://archives.seul.org/or/cvs/Nov-2008/msg00100.html";>bugfix</a>
-        corrects a possible segmentation fault that was very likely responsible
-        for a number of failed measurement runs. Another <a
-        href="https://bugs.torproject.org/flyspray/index.php?id=847&amp;do=details";>bug</a>
-        could be explained that lead to significant delays in bootstrapping:
-        Very slow directory authorities occupied bootstrapping clients for
-        a long time before clients finally gave up and bootstrapped using
-        another authority. As a result, the slowest two directory authorities
-        have dedicated more bandwidth to their nodes, so that the effect is
-        mitigated. A third <a
-        href="https://bugs.torproject.org/flyspray/index.php?id=874&amp;do=details";>bug</a>
-        has been introduced with the hidden service performance improvements in
-        November; the effect was that Tor processes running hidden services
-        would stop advertising their service upon reloading their
-        configuration. Further, this bug has uncovered that Tor has
-        re-established its introduction points upon reloading, which might have
-        affected hidden service stability. This bug has been fixed and will be
-        included in the upcoming version 0.2.1.9-alpha.</em></small>
-        <br/>
-        <small><em>Apart from fixing bugs, new measurements have been performed
-        between December 8 and 10. These will very likely be the final
-        measurements to compare hidden service performance now with the
-        beginning of the project. The data have not been completely evaluated,
-        so it is difficult to make a statement about improvements at this
-        point. However, a <a
-        href="http://freehaven.net/~karsten/hidserv/prelimreport-2008-12-15.pdf";>preliminary
-        evaluation</a> shows that service publication times have improved
-        significantly. This is a result of Tor clients bootstrapping faster and
-        of the performance improvements added in November. In contrast to this,
-        the results for establishing a connection to a hidden service are less
-        promising. While the improvements added in November seem to have a
-        positive effect on performance, some substeps exhibit significantly
-        worse performance. One example is fetching hidden service descriptors
-        in order to contact a hidden service. A possible explanation is that
-        the sudden increase in the number of hidden service directory nodes in
-        September has had a negative effect on performance. Part of the work in
-        the final 31 days will be to evaluate these data in more detail and
-        make a final conclusion on the achievements of this
-        project.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Jan09"></a>
-        <a class="anchor" href="#Jan09">Jan 09</a>
-      </td>
-      <td>
-        <small><em>The testing phase has been concluded. Testing was performed
-        in a public beta phase with all changes to hidden services being part
-        of the 0.2.1.x-alpha series. The result of the public beta phase is a
-        couple of identified bugs that could already be fixed.</em></small>
-        <br/>
-        <small><em>Another part of testing was a second set of measurements
-        that was performed in December. A
-        <a href="http://freehaven.net/~karsten/hidserv/comparison-2009-01-15.pdf";>comparison</a>
-        of measurements performed in June and December has revealed that the
-        changes of this project are effective. Service publication times could
-        be more than halved from 2:12 minutes to 58 seconds in the mean. This
-        improvement is far better than expected. With this improvement it might
-        even be worthwile to think about reducing stabilization time from 30
-        seconds to a lower value in the future. However, connection
-        establishment remains at approximately 56 seconds between requesting a
-        hidden service to having established a connection to the hidden server.
-        The main reason for missing improvements is the switch from the
-        centralized to a decentralized storage for hidden service descriptors.
-        This deteriorating effect of distributing the hidden service directory
-        has not been expected before. Future work should focus on improving
-        downloads from the distributed hidden service directory, for example by
-        parallelizing requests.</em></small>
-        <br/>
-        <small><em>This report concludes the series of monthly status updates.
-        The rollout of the 0.2.1.x series including the hidden service
-        performance improvements is going to take place within the next weeks
-        to months.</em></small>
-      </td>
-    </tr>
-    </table>
-    
-    <br />
-    
-    <!-- Do we want a people section? If so, would it make sense to write what
-    these people will be doing? And what exactly are these people going to
-    do? :)
-    <a id="People"></a>
-    <h2><a class="anchor" href="#People">People</a></h2>
-    <ul>
-    <li><a href="<page about/people>#Core">Karsten Loesing</a></li>
-    <li><a href="<page about/people>#Core">Steven Murdoch</a></li>
-    </ul>
-    -->
-    
-    <a id="Links"></a>
-    <h2><a class="anchor" href="#Links">Links</a></h2>
-    <ul>
-    <li>Research paper on <b>Performance Measurements and Statistics of Tor
-    Hidden Services</b>
-    (<a href="http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/loesing2008performance.pdf";>PDF</a>)
-    by Karsten Loesing, Werner Sandmann, Christian Wilms, and Guido Wirtz. In
-    the Proceedings of the 2008 International Symposium on Applications and the
-    Internet (SAINT), Turku, Finland, July 2008.</li>
-    
-    <!-- In the future, put links to proposal, preliminary results, etc. here -->
-    
-    </ul>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>    

Deleted: website/branches/web20/projects/en/lowbandwidth.wml
===================================================================
--- website/branches/web20/projects/en/lowbandwidth.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/lowbandwidth.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,360 +0,0 @@
-## translation metadata
-# Revision: $Revision: 21511 $
-# Translation-Priority: 4-optional
-
-#include "head.wmi" TITLE="Tor Project: NLnet Project: Tor for Low Bandwidth Clients" CHARSET="UTF-8"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/lowbandwidth>">NLnet Project: Tor for Low Bandwidth Clients</a>
-  </div>
-	<div id="maincol"> 
-    <!-- PUT CONTENT AFTER THIS TAG -->
-    
-    <h2>NLnet Project: Tor for Low Bandwidth Clients</h2>
-    <hr />
-    
-    <p>
-    The Tor anonymity system is currently only usable by internet users who
-    have high-bandwidth connections. Upon the start of the Tor client, a large file
-    with all Tor server descriptions is being downloaded. This file is the so-called Tor
-    Directory and enables the client to choose from the available mix-servers in the Tor network. The
-    download of the full Tor Directory is required by the current Tor protocol. This directory
-    file is too large for users on modem lines or on mobile data networks like GPRS as the initial
-    download that is triggered every time an user logs in takes 10 to 30 minutes over a slow
-    line. As a result, Tor is not usable by modem and mobile users. One of the major goals of
-    the Tor project is to provide secure anonymous internet access to users in dictatorships
-    and repressive states. These locations often have very slow internet connections,
-    either by modem or due to low-bandwidth links to the outside world. By enabling these users to
-    use the Tor network, significant progress can be made towards free communication and
-    information in these countries.
-    </p>
-    
-    <p>
-    To make Tor usable also for users on low-bandwidth connections, an
-    evolution of the Tor protocol is needed to reduce the initial download size. This new Tor
-    protocol version should change the way a client receives the information for its Tor
-    circuit setup in a way, that the initial download can be performed over a 14.4 kbps modem line
-    in about three minutes. The work to be conducted under the proposal has the ultimate
-    goal of getting the protocol change production ready and propagated to the Tor users
-    within a timeframe of less then 12 months. The resulting software will be published under
-    the 3-Clause BSD license, as all of the Tor code. All deliverables will be fully public.
-    </p>
-    
-    <p>
-    This project is generously funded by:
-    </p>
-    
-    <p>
-    <a href="http://www.nlnet.nl/news/2008/20080514-awards.html";>
-    <img src="$(IMGROOT)/nlnet-160x60.png" alt="The NLnet foundation" /></a>
-    </p>
-    
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
-    <thead>
-    <tr>
-    <th><big>Project</big></th>
-    <th><big>Due Date</big></th>
-    </tr>
-    </thead>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Deliverable A:</b> Design and evaluation of the protocol change<br />
-        <small><em>This deliverable covers the detailed design and
-        simulation-based evaluation of the necessary changes and design
-        modifications to the current Tor protocol.
-        The changes in protocol will be relatively substantial, so it requires a careful
-        evaluation of possible repercussions for the security and anonymity of the Tor network. A
-        two-month period is planned for this design and evaluation phase, which concludes with an
-        extensive peer review. Part of Deliverable A will be a goal definition for performance
-        for the implementation phase. The design goal is to shrink the Tor Directory
-        size that needs to be downloaded to about 300 Kilobytes, which would enable an user on a 14.4
-        kbps line to download it in roughly three minutes. There may be deviations from this
-        design goal if required to maintain anonymity and security, but this is the figure to aim for.
-        </em></small>
-      </td>
-      <td>
-        July 15, 2008
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b>Deliverable B:</b>Implementation of protocol change<br />
-        <small><em>After design, evaluation and peer review the modifications
-        need to be implemented and integrated with the current Tor code base. The actual implementation of
-        the necessary changes will take approximately three months.
-        </em></small>
-      </td>
-      <td>
-        October 15, 2008
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <b>Deliverable C:</b>Testing<br />
-        <small><em>Since the modification is highly critical to the security
-        and anonymity of the Tor network, it requires extensive testing and debugging in laboratory and real life
-        conditions. A period of three months is projected for testing and debugging, where the
-        responsible developer is committed to the testing effort with 1/3 of its time. Part of the
-        testing phase will be a public beta period.
-        </em></small>
-      </td>
-      <td>
-        January 15, 2009
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b>Deliverable D:</b>Rollout<br />
-        <small><em>The actual rollout to the Tor server network will be
-          conducted in sync with the regular Tor
-          release schedule. As this schedule is dependent on a number of external
-          factors, like the completion of other software projects that should go into the same
-          release, the actual release time and the time until this release has been accepted and
-          installed by most Tor server operators can vary. From experience a period of three to four
-          months can be expected. The rollout will be conducted as part of the regular Tor
-          release process that is a persistent activity done by volunteers and by personal paid through
-          other grants to the Tor project.
-        </em></small>
-      </td>
-      <td>
-        April 15, 2009
-      </td>
-    </tr>
-    </table>
-    
-    <br />
-    
-    <a id="Reports"></a>
-    <h2><a class="anchor" href="#Reports">Monthly Status Reports</a></h2>
-    <p>
-    There will be in total eight monthly status reports beginning with the
-    first deliverable on July 15, 2008 and ending with completion of
-    implementation and testing work on January 15, 2009.
-    </p>
-    
-    <table width="100%" border="0" cellspacing="0" cellpadding="3">
-    <thead>
-    <tr>
-    <th><big>Month,</big></th>
-    <th><big>Status Report</big></th>
-    </tr>
-    </thead>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Jun08"></a>
-        <a class="anchor" href="#Jun08">Jun 08</a>
-      </td>
-      <td>
-        <small><em>We did some initial measuring of Tor clients
-        bootstrapping. The results are not very surprising: a client
-        fetches about 10KB of certs, one consensus for 140KB (now 90KB, see
-        next paragraph), and about 1.5 megs of Server Descriptors (after
-        half of which it starts building circuits).</em></small>
-        <br />
-        <small><em><a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt";>Proposal
-        138</a> shrinks consensus documents by 30% to
-        40% and has already been implemented and merged into the spec.
-        Implementation is part of the 0.2.1.x-alpha tree and the code will
-        take effect once over two-thirds of the directory authorities
-        (i.e. 5 out of 6) have upgraded.</em></small>
-        <br />
-        <small><em><a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt";>Proposal
-        140</a> does not directly relate to reducing initial download size,
-        but instead tries to make subsequent downloads of new consensus
-        documents use fewer bytes has also been written up and <a
-        href="http://archives.seul.org/or/dev/Jun-2008/msg00013.html";>sent to
-        or-dev</a>. There are some questions to be answered from other Tor
-        developers first, but other than that I think it's fine and could
-        be implemented.</em></small>
-        <br />
-        <small><em>The Big Thing is making clients not download all 1.5 megs
-        of server descriptors. <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt";>Proposal
-        141</a> has been <a
-        href="http://archives.seul.org/or/dev/Jun-2008/msg00017.html";>sent
-        to or-dev</a>. There are basically 3 things to it, as
-        far as I can see at the moment: move load balancing info into the
-        consensus (should not be hard), implement something so that Tor
-        clients can fetch SDs on demand from routers along their circuit
-        while they are building it (described in the draft), and deal with
-        exit selection. We're still developing ideas for the last part;
-        some possibilities are mentioned in the draft.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Jul08"></a>
-        <a class="anchor" href="#Jul08">Jul 08</a>
-      </td>
-      <td>
-        <small><em>Work on <a
-        href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt";>Proposal
-        141</a> is continuing:  There are two basic ideas for how to move
-        load balancing information into the consensus: One is the
-        authorities generate the weights that clients should use and put
-        that in the consensus, the other approach is to just put bandwidth
-        information from the server descriptor there.  The latter option
-        is probably friendlier when one also considers <a
-        href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt";>Proposal
-        140</a> since it avoids a having number of highly fluctuating
-        numbers in the consensus.</em></small>
-        <br />
-        <small><em>For handling exit policies <a
-        href="http://archives.seul.org/or/dev/Jul-2008/msg00022.html";>a
-        post on the or-dev mailinglist</a> suggests that a hash identifying a
-        node's exit policy be added to the consensus document.  The addition
-        of another 160 high-entropy bits per node to the consensus might
-        be a cause for concern but we think that since a lot of the exit
-        policies are the same the consensus document will compress nicely.
-        Measurements pending.</em></small>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Aug08"></a>
-        <a class="anchor" href="#Aug08">Aug 08</a>
-      </td>
-      <td>
-        <small><em>Directory authority voting documents, and their consensus
-        forming algorithm have been changed to include bandwidth information
-        and policy summaries as documented in Proposal 141.  Once five of
-        the six running authorities have upgraded to trunk at at least
-        revision 16554 the consensus will start to include that
-        information.</em></small>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Sep08"></a>
-        <a class="anchor" href="#Sep08">Sep 08</a>
-      </td>
-      <td>
-    <small><em>No updates for September.</em></small>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Oct08"></a>
-        <a class="anchor" href="#Oct08">Oct 08</a>
-      </td>
-      <td><p>
-    <small><em>We didn't hit our "finish
-    the implementation" milestone for this month since the developer leading
-    the project has too much on his plate. The good news there is that we've
-    gotten quite a bit of the implementation work done, and it's been in for
-    several months now (since the August milestone) so it's seen a lot of
-    testing already. The remaining implementation steps are to teach relays
-    how to receive requests for fetching a relay descriptor from inside a
-    circuit (we probably want to use a new cell type specifically for this,
-    so we cut out a round-trip), and then teach clients to do that when the
-    relay they're using is running a recent enough version. These two steps
-    are written in more detail in
-    <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/141-jit-sd-downloads.txt";>Section 3.2 of proposal 141</a></em></small></p>
-    
-    <p><small><em>Our new timing plan is to have both of these pieces in place by mid Nov,
-    and if that starts looking less likely then we're going to do a more
-    radical overhaul of our timing plan and maybe also the design.</em></small></p>
-    
-    <p><small><em>There are several other components we'd like to get
-    to after this piece of it -- one we've been thinking about a lot lately
-    is downloading "diffs" of the latest consensus:
-    <a href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/140-consensus-diffs.txt";>140-consensus-diffs.txt</a>.
-    First this could save bandwidth, which is always nice when multiplied
-    by the total number of clients, but it also means that we can use this
-    saved bandwidth to fetch the diffs more often than the current "every
-    3 to 4 hours". If clients learn more up-to-date directory information,
-    then they can build faster paths because they have better information for
-    each relay's bandwidth (which ties into the first NLnet project above),
-    but the key new idea is that it also means that we're better at taking
-    advantage of transient relays: right now a relay needs to be up for 3 or
-    4 hours before it sees any users, and that rules out a lot of volunteers
-    who want to run a relay but only want to be up a few hours at a time.</em></small></p>
-    <p><small><em>The next step is to get the
-    implementation for proposal 141 finished so we can start putting it in
-    front of users for testing. Soon, we hope!</em></small></p>
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <a id="Nov08"></a>
-        <a class="anchor" href="#Nov08">Nov 08</a>
-      </td>
-      <td>
-    <p><small><em>It looks like the
-    original plan we had for the last development piece was both a) way
-    harder than we hoped, and b) hopefully overkill compared to what we need.</em></small></p>
-    
-    <p><small><em> Roger restarted the design discussion on or-dev:
-    <a href="http://archives.seul.org/or/dev/Nov-2008/threads.html";>http://archives.seul.org/or/dev/Nov-2008/threads.html</a>.</em></small></p>
-    
-    <p><small><em>I think we now have a better handle on the options and tradeoffs:
-    <a href="http://archives.seul.org/or/dev/Nov-2008/msg00007.html";>http://archives.seul.org/or/dev/Nov-2008/msg00007.html</a>.</em></small></p>
-    
-    <p><small><em>Nick has been buried in other development projects (hopefully starting to
-    wrap up this month-ish), and I want to get his opinion on how to proceed;
-    I am hoping we'll pick one of the more simple approaches.</em></small></p>
-    
-    <p><small><em>Alas, the really simple approaches provide less scalability. But I think
-    they will be good stopgaps until later -- and when 'later' arrives, who
-    knows what else will have changed.</em></small></p>
-      </td>
-    </tr>
-    
-    <tr bgcolor="#e5e5e5">
-      <td>
-        <a id="Jan09"></a>
-        <a class="anchor" href="#Jan09">Jan 09</a>
-      </td>
-      <td>
-    <p><small><em>
-    I wrote up the more detailed version of our new design idea, as <a
-    href="https://svn.torproject.org/svn/tor/trunk/doc/spec/proposals/158-microdescriptors.txt";>Tor
-    proposal #158</a>, and discussion has started at <a
-    href="http://archives.seul.org/or/dev/Jan-2009/msg00010.html";>http://archives.seul.org/or/dev/Jan-2009/msg00010.html</a>.</em></small></p>
-    
-    <p><small><em>
-    I think this is finally the one! (Well, once I finish folding in all
-    the comments.)
-    </em></small></p>
-    
-    <p><small><em>
-    One of the big reasons why the project isn't on its original schedule is
-    that a main conclusion from <a href="<page projects/hidserv>">Karsten's
-    NLnet project on hidden service performance</a> was that it's the circuit
-    extension that's the main killer. Yet this project had proposed to add
-    more round-trips and complexity into exactly that step. So we needed
-    to build a better plan to achieve the original goal without screwing up
-    performance even more.
-    </em></small></p>
-    
-    <p><small><em>We've been revising the design proposal over the past weeks, and
-    I think we'll be ready soon to start implementing. Note that since
-    we have a bunch of development items we're hoping to land in mid Feb
-    already, it's likely that this implementation won't land until late Feb
-    or March. This time for sure!</em></small></p>
-      </td>
-    </tr>
-    </table>
-    
-    <br />
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>    

Modified: website/branches/web20/projects/en/projects.wml
===================================================================
--- website/branches/web20/projects/en/projects.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/projects.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -9,18 +9,23 @@
     <a href="<page projects/projects>">Projects Overview</a>
   </div>
 	<div id="maincol">
-  	<h1>Client-side Projects</h1>
-    <p>Does client side vs. server side matter?  Is this a sensible
-taxonomy?</p>
+  	<h1>Software &amp; Services</h1>
+    <p>The Tor Project maintains a growing set of software and services
+in order to make your experience safer, better, and more anonymous.</p>
     <div class="featured-project focus left first">
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
       <div class="name">Torbutton</div>
-      <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor.  To keep you safe, Torbutton disables many types of active content. Read more about it in the <a href="<page torbutton/index>">torbutton docs</a>.
+      <p>Torbutton is a 1-click way for Firefox users to enable or
+disable Tor in Firefox.  To keep you safe, Torbutton disables many types
+of active content. <a href="<page torbutton/index>">Learn more
+&raquo;</a></p>
     </div>
     <div class="featured-project focus left">
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
       <div class="name">Tor Browser Bundle</div>
-      <p>The Tor Browser Bundle lets you use Tor on Windows, Linux, or Mac OS X without needing to install any software. It can run off a USB flash drive, comes with a pre-configured web browser and is self-contained. The Tor IM Browser Bundle additionally allows instant messaging and chat over Tor. </p>
+      <p>The Tor Browser Bundle contains everything you need to safely
+browse the Internet. This package requires no installation. Just extract
+it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
     </div>
     <table class="topforty">
     	<tr>
@@ -28,12 +33,13 @@
           <div class="name">TorBEL</div>
           <p>The Tor Bulk Exitlist is a service others can query to
 determine if an IP is a tor exit node or not, and if so, on which tcp
-ports it allows traffic.  Read more about the <a href="<wiki>/ projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
+ports it allows traffic.  Read more about the <a href="<wiki>projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
         </td>
         <td>
           <div class="name">Vidalia</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
+          <p>Vidalia is a graphical Tor controller.  It allows you to
+see where your connections are in the world and configure Tor without
+getting into configuration files and code.  <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
         </td>
         <td class="beige">
           <div class="name">Project Name</div>

Deleted: website/branches/web20/projects/en/serverside.wml
===================================================================
--- website/branches/web20/projects/en/serverside.wml	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/serverside.wml	2010-10-07 18:46:12 UTC (rev 23444)
@@ -1,107 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Server-side Projects" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-  <div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page projects/projects>">Projects &raquo; </a>
-    <a href="<page projects/serverside>">Server-side Projects</a>
-  </div>
-	<div id="maincol">
-  	<h1>Server-side Projects</h1>
-    <p>Consectetur adipiscing elit. Proin sit amet dolor justo, lacinia dapibus est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In orci est, pellentesque sit amet consequat eget, venenatis id augue. Quisque arcu velit, ultricies non porta a, dictum in lorem. Quisque pulvinar laoreet fermentum. Quisque mauris nulla, lobortis non facilisis at, lacinia in diam. Sed at enim tortor, vitae consequat elit.</p>
-    <div class="featured-project focus left first">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
-      <div class="name">Torbrowser</div>
-      <div class="caps">By Author</div>
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-    </div>
-    <div class="featured-project focus left">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
-      <div class="name">Torbutton</div>
-      <div class="caps">By Author</div>
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page torbutton/index>">Learn more &raquo;</a></p>
-    </div>
-    <table class="topforty">
-    	<tr>
-        <td class="beige">
-          <div class="name">Tordnsel</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/tordnsel>">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Vidalia</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="<page projects/vidalia>">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td class="beige">
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-        <td>
-          <div class="name">Project Name</div>
-          <div class="caps">By Author</div>
-          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
-        </td>
-      </tr>
-    </table>
-    <!-- END TABLE -->
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>     

Modified: website/branches/web20/projects/en/sidenav.wmi
===================================================================
--- website/branches/web20/projects/en/sidenav.wmi	2010-10-07 16:09:57 UTC (rev 23443)
+++ website/branches/web20/projects/en/sidenav.wmi	2010-10-07 18:46:12 UTC (rev 23444)
@@ -23,8 +23,8 @@
 <:
   my $sidenav;
   $sidenav = [
-      {'url'  => 'projects/clientside',
-       'txt'  => 'Client-side Projects',
+      {'url'  => 'projects/projects',
+       'txt'  => 'Software &amp; Services',
        'subelements' => [
           {'url'  => 'torbutton/index',
            'txt'  => 'TorButton',
@@ -36,7 +36,7 @@
                'txt' => 'TorButton FAQ',
               },
           ]},
-          {'url'  => 'http://check.torproject.org',
+          {'url'  => 'https://check.torproject.org',
            'txt'  => 'TorCheck',
           }, 
           {'url'  => 'projects/sampleproject',
@@ -75,13 +75,7 @@
 #          {'url'  => 'projects/sampleproject',
 #           'txt'  => 'TBB Builds',
 #          }],
-      },
-      {'url'  => 'projects/serverside',
-       'txt'  => 'Server-side Projects',
-       'subelements' => [
-          {'url'  => 'https://metrics.torproject.org',
-           'txt'  => 'https://metrics.torproject.org', 
-          }],
+      }],
        #   {'url'  => '',
        #    'txt'  => '',
        #   }],