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

[or-cvs] r23447: {website} fix up projects sidenav, remove old people page, fix random (in website/branches/web20: . about/en projects/en)



Author: phobos
Date: 2010-10-07 20:02:34 +0000 (Thu, 07 Oct 2010)
New Revision: 23447

Removed:
   website/branches/web20/about/en/people.wml
Modified:
   website/branches/web20/Makefile
   website/branches/web20/about/en/corepeople.wml
   website/branches/web20/projects/en/sidenav.wmi
Log:
fix up projects sidenav, remove old people page, fix random broken links


Modified: website/branches/web20/Makefile
===================================================================
--- website/branches/web20/Makefile	2010-10-07 18:52:24 UTC (rev 23446)
+++ website/branches/web20/Makefile	2010-10-07 20:02:34 UTC (rev 23447)
@@ -44,6 +44,8 @@
 	$(MAKE) -C "$@" WMLBASE=.. 
 donate:
 	$(MAKE) -C "$@" WMLBASE=..  
+torbutton:
+	$(MAKE) -C "$@" WMLBASE=..  
 mirrors:
 	./update-mirrors.pl
 translations:
@@ -55,4 +57,4 @@
 # XXX: this also depends on all subs' wmlfiles.  How to fix?
 #translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
 
-.PHONY: docs eff projects press about download download getinvolved donate
+.PHONY: docs eff projects press about download getinvolved donate torbutton

Modified: website/branches/web20/about/en/corepeople.wml
===================================================================
--- website/branches/web20/about/en/corepeople.wml	2010-10-07 18:52:24 UTC (rev 23446)
+++ website/branches/web20/about/en/corepeople.wml	2010-10-07 20:02:34 UTC (rev 23447)
@@ -104,7 +104,11 @@
         <td class="beige">
           <div class="name">Dr. Karsten Loesing</div>
           <div class="caps">Researchers and Developer</div>
-          <p>Worked during the 2007 Google Summer of Code on <a href="<gitblob>doc/spec/proposals/114-distributed-storage.txt">distributing and securing the publishing and fetching of hidden service descriptors</a>. Currently working on <a href="<page projects/hidserv>">making hidden services faster and more reliable</a>, and on <a href="http://metrics.torproject.org/";>metrics</a>.</p>
+          <p>Worked during the 2007 Google Summer of Code on <a
+href="<gitblob>doc/spec/proposals/114-distributed-storage.txt">distributing
+and securing the publishing and fetching of hidden service
+descriptors</a>. Current the primary researcher for our National Science
+Foundation grant into <a href="http://metrics.torproject.org/";>anonymous metrics</a>.</p>
         </td>
         <td>
           <div class="name">Nick Mathewson</div>

Deleted: website/branches/web20/about/en/people.wml
===================================================================
--- website/branches/web20/about/en/people.wml	2010-10-07 18:52:24 UTC (rev 23446)
+++ website/branches/web20/about/en/people.wml	2010-10-07 20:02:34 UTC (rev 23447)
@@ -1,330 +0,0 @@
-## translation metadata
-# Revision: $Revision: 22448 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor: People" CHARSET="UTF-8"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/overview>">About &raquo; </a>
-    <a href="<page about/board>">Board of Directors</a>
-  </div>
-  <div class="maincol">
-    <h2>Tor: People</h2>
-
-    #<!-- BEGIN SIDEBAR -->
-    #<div class="sidebar-left">
-    #<h3>Sections</h3>
-    #<ul>
-    #<li><a href="<page about/corepeople>#Core">Core Tor People</a></li>
-    #<li><a href="<page about/people>#Board">Board of Directors</a></li>
-    #<li><a href="<page about/people>#GSoC">Summer Students</a></li>
-    #<li><a href="<page about/people>#Translators">Translators</a></li>
-    #<li><a href="<page about/people>#Volunteers">Volunteers</a></li>
-    #<li><a href="<page about/people>#Past">Past Contributors</a></li>
-    #</ul>
-    #</div>
-    #<!-- END SIDEBAR -->
-
-    <p>The Tor Project is a 501(c)(3) non-profit based in
-    the United States. The official address of the organization is:
-    </p>
-
-    <address>
-    The Tor Project<br />
-    969 Main Street, Suite 206<br />
-    Walpole, MA 02081-2972 USA<br /><br />
-    </address>
-
-    <p>The organization consists of many volunteers and a few employees.
-    Please don't contact us individually about Tor topics &mdash; if you
-    have a problem or question, please look through the <a href="<page
-    about/contact>">contact page</a> for appropriate addresses.</p>
-
-    <div class="underline"></div>
-    <a id="Core"></a>
-    <h3><a class="anchor" href="#Core">Core Tor people:</a></h3>
-
-    <dl>
-    <dt>Carolyn Anhalt (Community and Translation
-    Coordinator)</dt><dd>Responsible for growing Tor's community
-    moderators and translators.</dd>
-
-    <dt>Jacob Appelbaum (Developer and Advocate)</dt><dd>Runs
-    the <a href="https://check.torproject.org/";>Tor DNSEL</a> <a
-    href="http://exitlist.torproject.org/";>site</a>, and also the in-progress
-    Tor weather site.</dd>
-
-    <dt>Erinn Clark (Packaging and Build Automation)</dt><dd>Erinn is tackling
-    the growing needs for easy to install and configure packages on a variety
-    of operating systems.  Also working on automating the build system and
-    producing nightly builds for all operating systems we support.</dd>
-
-    <dt>Christopher Davis</dt><dd>Worked during Google Summer of Code 2009
-    on porting Polipo to Windows and on helping with the libevent bufferevent
-    code. Now he's the Polipo maintainer.</dd>
-
-    <dt>Roger Dingledine (Project Leader; Director)</dt><dd>Original
-    developer of Tor; now plays pretty much all the roles to keep everything
-    on track.</dd>
-
-    <dt>Matt Edman (Developer)</dt><dd>Lead developer for <a href="<page
-    projects/vidalia>">Vidalia</a>, a cross-platform Tor GUI included in the
-    Windows and OS X bundles.</dd>
-
-    <dt>Nathan Freitas</dt><dd>The driving force behind Tor on the Android
-    platform in the form of <a href="<page docs/android>">Orbot</a>.</dd>
-
-    <dt>Christian Fromme (Developer)</dt><dd>Christian works on all things
-    python for Tor.  He enhanced and maintains a slew of codebases for us,
-    such as the get-tor email auto-responder, check.torproject.org, bridge
-    db, tor weather, tor controller, tor flow, etc.</dd>
-
-    <dt>Melissa Gilroy (CFO and Internal Audit)</dt><dd>With a strong
-    background in non-profit accounting and auditing, Melissa is in charge of
-    Tor's finances, audit compliance, and keeping Tor's financial operations
-    moving along.</dd>
-
-    <dt>Sebastian Hahn</dt><dd> Worked during the 2008 Google Summer of
-    Code on a networking application to automatically carry out tests for
-    Tor and during the 2009 Google Summer of Code on expanding Thandy to
-    include BitTorrent support. Generally helps out a lot.</dd>
-
-    <dt>Damian Johnson</dt><dd>Builds a command-line application for monitoring
-    Tor relays, providing real-time status information such as the current
-    configuration, bandwidth usage, message log, etc. (<a
-    href="https://svn.torproject.org/svn/arm/trunk/README";>code</a>).</dd>
-
-    <dt>Andrew Lewman (Executive Director; Director; <a href="<page
-    press/index>">press contact</a>)</dt><dd>Manages the business operations
-    of The Tor Project, Inc.  Plays roles of finance, advocacy, project
-    management, and general support.</dd>
-
-    <dt>Karsten Loesing (Developer)</dt><dd>
-    Worked during the 2007 Google Summer of Code on <a
-    href="<gitblob>doc/spec/proposals/114-distributed-storage.txt">distributing
-    and securing the publishing and fetching of hidden
-    service descriptors</a>. Currently working on <a href="<page
-    projects/hidserv>">making hidden services faster and more reliable</a>,
-    and on <a href="http://metrics.torproject.org/";>metrics</a>.</dd>
-
-    <dt>Nick Mathewson (Chief architect; Director)</dt><dd>One of the
-    three original designers of Tor; does a lot of the ongoing design work.
-    One of the two main developers, along with Roger.</dd>
-
-    <dt>Steven Murdoch (Researcher and Developer)</dt><dd>Researcher at
-    the University of Cambridge, currently funded by The Tor Project to
-    improve the security, performance, and usability of Tor. Creator of the
-    <a href="<page projects/torbrowser>">Tor Browser Bundle</a>.</dd>
-
-    <dt>Peter Palfrader</dt><dd>Manages the Debian packages, runs one of
-    the directory authorities, runs the website and the wiki, and generally
-    helps out a lot.</dd>
-
-    <dt>Mike Perry (Developer)</dt><dd>Author of <a
-    href="https://svn.torproject.org/svn/torflow/trunk/README";>TorFlow</a>,
-    a Tor controller that builds paths through the Tor network and measures
-    various properties and behaviors, and new author of <a href="<page
-    torbutton/index>">Torbutton</a>.</dd>
-
-    <dt>Karen Reilly (Development Director)</dt><dd>Responsible for
-    fundraising, advocacy, and general marketing and outreach programs
-    for Tor.</dd>
-
-    <dt>Runa A. Sandvik</dt><dd>Maintains the <a
-    href="https://translation.torproject.org/";>Tor Translation
-    Portal</a>, and works on automatically converting our website wml
-    files to po files (and back) so that they can be handled by <a
-    href="http://translate.sourceforge.net/wiki/pootle/index";>Pootle</a>.</dd>
-
-    <dt>Paul Syverson</dt><dd>Inventor of <a
-    href="http://www.onion-router.net/";>Onion Routing</a>, original designer
-    of Tor along with Roger and Nick, and project leader for original design,
-    development, and deployment of Tor. Currently helps out with research
-    and design.</dd>
-    </dl>
-
-    <div class="underline"></div>
-    <h3><a href="<page about/board>">The Tor Project Board of Directors:</a></h3>
-
-    <div class="underline"></div>
-    <a id="GSoC"></a>
-    <h3><a class="anchor" href="#GSoC">Google Summer of Code 2010 students:</a></h3>
-
-    <dl>
-    <dt>Kevin Berry</dt><dd>Working on a database schema to support better
-    node churn metrics and on a more dynamic metrics website. Mentored by
-    Karsten Loesing.</dd>
-    <dt>Harry Bock</dt><dd>Working on TorBEL, a Tor bulk exit list tracker and
-    service designed to replace TorDNSEL. TorBEL is written in Python using
-    the torflow API. Mentored by Sebastian Hahn.</dd>
-    <dt>Kory Kirk</dt><dd>Worked during Google Summer of Code 2009 on
-    extending Torbutton. Now he's working on implementing hidden services
-    for our java Tor client. Mentored by Bruce Leidl.</dd>
-    <dt>John Schanck</dt><dd>Works on improving the automated detection of
-    misconfigured or malicious exit nodes. Mentored by Mike Perry.</dd>
-    </dl>
-
-    <div class="underline"></div>
-    <a id="Translators"></a>
-    <h3><a class="anchor" href="#Translators">Core translators:</a></h3>
-
-    <dl>
-    <dt>Bogdan Drozdowski</dt><dd><a
-    href="https://www.torproject.org/index.html.pl";>Polish</a>.</dd>
-    <dt>Tiago Faria</dt><dd>Portuguese.</dd>
-    <dt>fredzupy</dt><dd><a
-    href="https://www.torproject.org/index.html.fr";>French</a>.</dd>
-    <dt>Ruben Garcia, plus further pages by <a
-    href="http://www.greentranslations.com/";>Green Crescent</a></dt><dd><a
-    href="https://www.torproject.org/index.html.es";>Spanish</a>.</dd>
-    <dt>Jens Kubieziel and Oliver Knapp</dt><dd><a
-    href="https://www.torproject.org/index.html.de";>German</a>.</dd>
-    <dt>Pei Hanru and bridgefish</dt><dd><a
-    href="https://www.torproject.org/index.html.zh-cn";>Simplified Chinese</a>.</dd>
-    <dt>Jan Reister</dt><dd><a
-    href="https://www.torproject.org/index.html.it";>Italian</a>.</dd>
-    <dt>Masaki Taniguchi</dt><dd><a
-    href="https://www.torproject.org/index.html.ja";>Japanese</a>.</dd>
-    <dt>Jan Woning</dt><dd><a
-    href="https://www.torproject.org/index.html.nl";>Dutch</a>.</dd>
-    <dt>ygrek</dt><dd><a
-    href="https://www.torproject.org/index.html.ru";>Russian</a>.</dd>
-    </dl>
-
-    <div class="underline"></div>
-    <a id="Volunteers"></a>
-    <h3><a class="anchor" href="#Volunteers">More volunteers:</a></h3>
-
-    <dl>
-    <dt>Anonym</dt><dd>Maintainer of the Incognito LiveCD.</dd>
-    <dt>Kevin Bankston</dt><dd>EFF lawyer who helped write the <a
-    href="<page eff/tor-legal-faq>">Tor Legal FAQ</a> and
-    tirelessly answers the phone when somebody in the world has a legal
-    question about Tor.</dd>
-    <dt>Marco Bonetti</dt><dd>Focusing on MobileTor for the iPhone.</dd>
-    <dt>Kasimir Gabert</dt><dd>Maintains the <a
-    href="https://torstatus.kgprog.com/";>TorStatus</a> statistics pages.</dd>
-    <dt>Robert Hogan</dt><dd>Developer for the <a
-    href="http://tork.sf.net/";>TorK</a> Tor controller.</dd>
-    <dt>Fabian Keil</dt><dd>One of the core Privoxy developers, and also a
-    Tor fan. He's the reason Tor and Privoxy still work well together.</dd>
-    <dt>Bruce Leidl</dt><dd>Working on a Tor client in Java.</dd>
-    <dt>Julius Mittenzwei</dt><dd>A lawyer with the CCC in
-    Germany. Coordinates the German Tor community with respect to legal
-    questions and concerns.</dd>
-    <dt>Shava Nerad</dt><dd>Our former Development Director. She still works
-    on PR and community relations.</dd>
-    <dt>Linus Nordberg</dt><dd>Enjoys measuring the Tor network and helps
-    with outreach in the Nordic countries.</dd>
-    <dt>Lasse &Oslash;verlier</dt><dd>Writes research papers on Tor: attacks,
-    defenses, and resource management, especially for hidden services.</dd>
-    <dt>Martin Peck</dt><dd>Working on a VM-based transparent
-    proxying approach for Tor clients on Windows.</dd>
-    <dt>rovv (a pseudonym -- he's managed to stay anonymous even from
-    us!)</dt><dd>The most dedicated bug reporter we've ever heard from. He
-    must read Tor source code every day over breakfast.</dd>
-    <dt>tup (another pseudonym)</dt><dd>Periodically adds new features for
-    making Tor easier to use as a <a
-    href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TransparentProxy";>transparent
-    proxy</a>. Also maintains the <a
-    href="http://p56soo2ibjkx23xo.onion/";>TorDNSEL code</a>.</dd>
-    <dt>Kyle Williams</dt><dd>Developer for
-    JanusVM, a VMWare-based
-    transparent Tor proxy that makes Tor easier to set up and use.</dd>
-    <dt>Ethan Zuckerman</dt><dd>A blogger who has written some
-    <a href="http://www.ethanzuckerman.com/blog/?p=1019";>interesting</a>
-    <a href="http://advocacy.globalvoicesonline.org/tools/guide/";>tutorials</a>
-    for how, when, and whether to use Tor. He also teaches activists around
-    the world about Tor and related tools.</dd>
-    <dt>All our relay operators, people who write <a
-    href="http://freehaven.net/anonbib/";>research papers</a> about Tor,
-    people who teach others about Tor, etc.</dt>
-    </dl>
-
-    <div class="underline"></div>
-    <a id="Past"></a>
-    <h3><a class="anchor" href="#Past">Past thanks to:</a></h3>
-
-    <dl>
-    <dt>John Bashinski</dt><dd> Contributed the initial rpm spec file.</dd>
-    <dt>Domenik Bork</dt><dd> Worked on
-    Configuration of Hidden Services with User Authorization in Vidalia (<a
-    href="http://trac.vidalia-project.net/browser/vidalia/branches/hidden-services";>svn</a>) as part of Google Summer of Code 2008.</dd>
-    <dt>Benedikt Boss</dt><dd>Worked during the 2007 Google Summer of Code on <a
-    href="https://svn.torproject.org/svn/topf/trunk/README";>TOPF</a>,
-    a fuzzer for Tor; mentored by Roger.</dd>
-    <dt>Ren Bucholz</dt><dd>Our fine logo and images.</dd>
-    <dt>Fallon Chen</dt><dd> Worked on
-    Improving Tor Path Selection (<a
-    href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>)
-    and <a
-    href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">proposal
-    151</a> as part of Google Summer of Code 2008.</dd>
-    <dt>Bram Cohen</dt><dd>Helped design our congestion control mechanisms,
-    in Tor's early days.</dd>
-    <dt>Pat Double</dt><dd>Creator of the Incognito LiveCD.</dd>
-    <dt>Geoff Goodell</dt><dd>Started the <a
-    href="https://svn.torproject.org/svn/blossom/trunk/";>Blossom project</a>
-    which uses Tor as its overlay network; also helped motivate Tor's control
-    interface to be as flexible as it is.</dd>
-    <dt>Aleksei Gorny</dt><dd> Working on
-    Tor exit scanner improvements (<a
-    href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>), originally started as part of Google Summer of Code 2008.</dd>
-    <dt>Christian Grothoff</dt><dd> Contributed better daemonizing behavior.</dd>
-    <dt>Steven Hazel</dt><dd> Made 'make install' do the right thing.</dd>
-    <dt>Justin Hipple</dt><dd>The other developer for Vidalia.</dd>
-    <dt>Jason Holt</dt><dd> Contributed patches to the instructions and the man
-    page.</dd>
-    <dt>Christian King</dt><dd> Worked during the 2007 Google Summer of Code
-    on making Tor relays stable on
-    Windows, by developing a <a
-    href="https://svn.torproject.org/svn/libevent-urz/trunk/README";>buffer
-    implementation for libevent</a>; mentored by Nick.</dd>
-    <dt>Joe Kowalski</dt><dd>Original author and provider of the torstatus
-    script formerly run on nighteffect.</dd>
-    <dt>Adam Langley</dt><dd>Our fine eventdns code.</dd>
-    <dt>Rebecca MacKinnon</dt><dd>Former Director of Tor.  Co-Founder of <a
-    href="http://www.globalvoicesonline.org/";>Global Voices Online</a>.</dd>
-    <dt>Chris Palmer</dt><dd>Our liaison and tech guy with EFF while EFF
-    was funding us. Also helped advocate and write end-user docs.</dd>
-    <dt>Matej Pfajfar</dt><dd>Author of the original onion routing code that
-    Tor is based on, so we didn't have to start from scratch.</dd>
-    <dt>Johannes Renner</dt><dd> Worked during the 2007 Google Summer of
-    Code on modifying <a
-    href="https://svn.torproject.org/svn/torflow/trunk/README";>TorFlow</a>
-    to measure various properties of the Tor network; mentored by Mike
-    Perry.</dd>
-    <dt>Scott Squires</dt><dd>The original developer of <a
-    href="<page torbutton/index>">Torbutton</a>.</dd>
-    <dt>Aaron Turner</dt><dd> Contributed the first version of the tor.sh
-    initscripts shell script.</dd>
-    <dt>Stephen Tyree</dt><dd> Worked during Google Summer of Code 2009 to
-    develop a plugin API for <a href="<page projects/vidalia>">Vidalia</a>
-    and create a plugin to allow HerdictWeb integration, a project aiming
-    at identifying website inaccessibility using user submissions.</dd>
-    <dt>Camilo Viecco</dt><dd> Worked on
-    Providing Blossom functionality to Vidalia (<a
-    href="http://trac.vidalia-project.net/browser/vidalia/branches/exit-country";>svn</a>) as part of Google Summer of Code 2008.</dd>
-    <dt>Fred von Lohmann</dt><dd>Fred served on our Board of Directors
-    from 2006 through 2009.   His complete bio can be found at the <a
-    href="http://www.eff.org/about/staff/?f=fred_von_lohmann.html";>EFF
-    Staff Site</a>.</dd>
-    <dt>Christian Wilms</dt><dd> Worked on
-    Performance Enhancing Measures for Tor Hidden Services (<a
-    href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";>svn</a>) as part of Google Summer of Code 2008.</dd>
-    <dt>Jillian C. York</dt><dd><a href="http://jilliancyork.com/";>Jillian
-    C. York</a> is a writer, blogger, and activist based in
-    Boston.  She blogs on the uses of Tor and anonymity at <a
-    href="http://www.knightpulse.org/blog/tor";>KnightPulse</a>.</dd>
-    </dl>
-  </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 18:52:24 UTC (rev 23446)
+++ website/branches/web20/projects/en/sidenav.wmi	2010-10-07 20:02:34 UTC (rev 23447)
@@ -35,50 +35,12 @@
               {'url' => 'torbutton/torbutton-faq',
                'txt' => 'TorButton FAQ',
               },
-          ]},
-          {'url'  => 'https://check.torproject.org',
-           'txt'  => 'TorCheck',
-          }, 
-          {'url'  => 'projects/sampleproject',
-           'txt'  => 'SampleProject',
-          }], 
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TorWeather',
-#          }, 
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TorWall',
-#          }, 
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'PuppeTor',
-#          }, 
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TorDNSEL',
-#          },  
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'Pootle',
-#          },  
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'LNET',
-#          },  
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TorStatus',
-#          },      
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'BridgeDB',
-#          },  
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TorPerf',
-#          },   
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'BWAuthority',
-#          },    
-#          {'url'  => 'projects/sampleproject',
-#           'txt'  => 'TBB Builds',
-#          }],
-      }],
-       #   {'url'  => '',
-       #    'txt'  => '',
-       #   }],
-      },
-  ];
+              {'url'  => 'https://check.torproject.org',
+               'txt'  => 'TorCheck',
+              }, 
+              {'url'  => 'projects/sampleproject',
+               'txt'  => 'SampleProject',
+              }]
+          }]
+        }];
 :>