[or-cvs] r22950: {website} get the website to build cleanly. (in website/branches/web20: about/en docs/en donate/en download/en en getinvolved/en projects/en)

Andrew Lewman andrew at torproject.org
Wed Aug 18 16:26:21 UTC 2010


Author: phobos
Date: 2010-08-18 16:26:21 +0000 (Wed, 18 Aug 2010)
New Revision: 22950

Modified:
   website/branches/web20/about/en/corepeople.wml
   website/branches/web20/about/en/people.wml
   website/branches/web20/docs/en/documentation.wml
   website/branches/web20/docs/en/faq.wml
   website/branches/web20/docs/en/tor-doc-osx.wml
   website/branches/web20/donate/en/donate-hardware.wml
   website/branches/web20/download/en/download.wml
   website/branches/web20/en/index.wml
   website/branches/web20/getinvolved/en/translation-overview.wml
   website/branches/web20/getinvolved/en/volunteer.wml
   website/branches/web20/projects/en/clientside.wml
   website/branches/web20/projects/en/projects.wml
   website/branches/web20/projects/en/serverside.wml
   website/branches/web20/projects/en/sidenav.wmi
Log:
get the website to build cleanly.


Modified: website/branches/web20/about/en/corepeople.wml
===================================================================
--- website/branches/web20/about/en/corepeople.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/about/en/corepeople.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -128,7 +128,7 @@
         <td class="beige">
           <div class="name">Mike Perry</div>
           <div class="caps">Torbutton and Tor Performance Developer</div>
-          <p>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 projects/torbutton>">Torbutton</a>.</p>
+          <p>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>.</p>
         </td>
         <td>
           <div class="name">Karen Reilly</div>

Modified: website/branches/web20/about/en/people.wml
===================================================================
--- website/branches/web20/about/en/people.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/about/en/people.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -125,7 +125,7 @@
     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
-    projects/torbutton>">Torbutton</a>.</dd>
+    torbutton/index>">Torbutton</a>.</dd>
 
     <dt>Karen Reilly (Development Director)</dt><dd>Responsible for
     fundraising, advocacy, and general marketing and outreach programs
@@ -296,7 +296,7 @@
     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 projects/torbutton>">Torbutton</a>.</dd>
+    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

Modified: website/branches/web20/docs/en/documentation.wml
===================================================================
--- website/branches/web20/docs/en/documentation.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/docs/en/documentation.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -18,7 +18,7 @@
     Mac OS X</a></li>
     <li><a href="<page docs/tor-doc-unix>">Installing Tor on
     Linux/BSD/Unix</a></li>
-    <li><a href="<page projects/torbutton>">Installing
+    <li><a href="<page torbutton/index>">Installing
     Torbutton for Tor</a></li>
     <li><a href="<page docs/tor-doc-relay>">Configuring a
     Tor relay</a></li>

Modified: website/branches/web20/docs/en/faq.wml
===================================================================
--- website/branches/web20/docs/en/faq.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/docs/en/faq.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -153,7 +153,7 @@
     <p>
     Most of our work so far has focused on the Firefox web browser. The
     bundles on the <a href="<page download/download>">download page</a> automatically
-    install the <a href="<page projects/torbutton>">Torbutton Firefox
+    install the <a href="<page torbutton/index>">Torbutton Firefox
     extension</a> if you have Firefox installed. As of version 1.2.0,
     Torbutton now takes care of a lot of the connection-level and
     application-level worries.

Modified: website/branches/web20/docs/en/tor-doc-osx.wml
===================================================================
--- website/branches/web20/docs/en/tor-doc-osx.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/docs/en/tor-doc-osx.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -29,7 +29,7 @@
     The install for Macintosh OS X bundles
     <a href="<page index>">Tor</a>,
     <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface for Tor),
-    <a href="<page projects/torbutton>">Torbutton</a>,
+    <a href="<page torbutton/index>">Torbutton</a>,
     and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)
     into one package, with the four applications pre-configured to work
     together.

Modified: website/branches/web20/donate/en/donate-hardware.wml
===================================================================
--- website/branches/web20/donate/en/donate-hardware.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/donate/en/donate-hardware.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -20,7 +20,7 @@
     donate it to us.
 
     By donating hardware, you're joining our many <a href="<page
-    sponsors>">sponsors</a> in providing online privacy and anonymity. If
+    about/sponsors>">sponsors</a> in providing online privacy and anonymity. If
     you want Tor to work on your architecture or hardware, a fine way to
     do this is to donate the hardware and operating system to us. Contact
     us at donations at torproject.org for more details.

Modified: website/branches/web20/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/download/en/download.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -27,7 +27,7 @@
 Quicktime, Adobe's PDF plugin, and others: they can be manipulated
 into revealing your IP address. For example, that means Youtube is
 disabled. If you really need your Youtube, you can <a href="<page
-torbutton/faq>#noflash">reconfigure Torbutton</a> to allow it; but
+torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but
 be aware that you're opening yourself up to potential attack. Also,
 extensions like Google toolbar look up more information about the
 websites you type in: they may bypass Tor and/or broadcast sensitive
@@ -68,7 +68,7 @@
 <p>
 Be smart and learn more. Understand what Tor does and does not offer.
 This list of pitfalls isn't complete, and we need your
-help <a href="<page volunteer>#Documentation">identifying and documenting
+help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting
 all the issues</a>.
 </p>
           </p>

Modified: website/branches/web20/en/index.wml
===================================================================
--- website/branches/web20/en/index.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/en/index.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -47,7 +47,7 @@
             <tr>
               <td>
                 <img src="images/icon-default.jpg" alt="Default Icon" />
-                <h3><a href="<page torbutton/>">TorButton</a></h3>
+                <h3><a href="<page torbutton/index>">TorButton</a></h3>
                 <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor. </p>
               </td>
               <td>

Modified: website/branches/web20/getinvolved/en/translation-overview.wml
===================================================================
--- website/branches/web20/getinvolved/en/translation-overview.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/getinvolved/en/translation-overview.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -17,7 +17,7 @@
     The Tor bundles include several different programs, all of which need
     translation help. In order of importance they are:
     <a href="<page projects/vidalia>">Vidalia</a>,
-    <a href="<page projects/torbutton>">Torbutton</a>, and
+    <a href="<page torbutton/index>">Torbutton</a>, and
     <a href="https://check.torproject.org/">TorCheck</a>.
     Please read the sections below and help out. If you need help, please
     ask; we're always happy to lend a hand.

Modified: website/branches/web20/getinvolved/en/volunteer.wml
===================================================================
--- website/branches/web20/getinvolved/en/volunteer.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/getinvolved/en/volunteer.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -1018,7 +1018,7 @@
     puzzles the right answer? What other practical approaches are there? Bonus
     if they're backward-compatible with the current Tor protocol.</li>
     <li>Programs like <a
-    href="<page projects/torbutton>">Torbutton</a> aim to hide
+    href="<page torbutton/index>">Torbutton</a> aim to hide
     your browser's UserAgent string by replacing it with a uniform answer for
     every Tor user. That way the attacker can't splinter Tor's anonymity set
     by looking at that header. It tries to pick a string that is commonly used

Modified: website/branches/web20/projects/en/clientside.wml
===================================================================
--- website/branches/web20/projects/en/clientside.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/projects/en/clientside.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -22,7 +22,7 @@
 			<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 projects/torbutton>">Learn more &raquo;</a></p>
+      <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>

Modified: website/branches/web20/projects/en/projects.wml
===================================================================
--- website/branches/web20/projects/en/projects.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/projects/en/projects.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -21,7 +21,7 @@
 			<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 projects/torbutton>">Learn more &raquo;</a></p>
+      <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>

Modified: website/branches/web20/projects/en/serverside.wml
===================================================================
--- website/branches/web20/projects/en/serverside.wml	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/projects/en/serverside.wml	2010-08-18 16:26:21 UTC (rev 22950)
@@ -22,7 +22,7 @@
 			<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 projects/torbutton>">Learn more &raquo;</a></p>
+      <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>

Modified: website/branches/web20/projects/en/sidenav.wmi
===================================================================
--- website/branches/web20/projects/en/sidenav.wmi	2010-08-18 15:26:54 UTC (rev 22949)
+++ website/branches/web20/projects/en/sidenav.wmi	2010-08-18 16:26:21 UTC (rev 22950)
@@ -26,13 +26,13 @@
       {'url'  => 'projects/clientside',
        'txt'  => 'Client-side Projects',
        'subelements' => [
-          {'url'  => 'projects/torbutton',
+          {'url'  => 'torbutton/index',
            'txt'  => 'TorButton',
            'subelements' => [
-              {'url' => 'projects/torbutton-options',
+              {'url' => 'torbutton/torbutton-options',
                'txt' => 'TorButton Options',
               },
-              {'url' => 'projects/torbutton-faq',
+              {'url' => 'torbutton/torbutton-faq',
                'txt' => 'TorButton FAQ',
               },
           ]},



More information about the tor-commits mailing list