[or-cvs] r23295: {website} fix the press links so they work correctly, update the affec (in website/branches/web20: about/en include press/en)

Andrew Lewman andrew at torproject.org
Fri Sep 24 15:34:32 UTC 2010 

Author: phobos
Date: 2010-09-24 15:34:31 +0000 (Fri, 24 Sep 2010)
New Revision: 23295

Modified:
   website/branches/web20/about/en/people.wml
   website/branches/web20/include/head.wmi
   website/branches/web20/include/navigation.wmi
   website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
   website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
   website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
   website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml
   website/branches/web20/press/en/index.wml
   website/branches/web20/press/en/inthemedia.wml
   website/branches/web20/press/en/sidenav.wmi
Log:
fix the press links so they work correctly, update the affected pages.


Modified: website/branches/web20/about/en/people.wml
===================================================================
--- website/branches/web20/about/en/people.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/about/en/people.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -96,7 +96,7 @@
     href="https://svn.torproject.org/svn/arm/trunk/README">code</a>).</dd>
 
     <dt>Andrew Lewman (Executive Director; Director; <a href="<page
-    press>">press contact</a>)</dt><dd>Manages the business operations
+    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>
 

Modified: website/branches/web20/include/head.wmi
===================================================================
--- website/branches/web20/include/head.wmi	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/include/head.wmi	2010-09-24 15:34:31 UTC (rev 23295)
@@ -26,7 +26,7 @@
   <!--[if IE 6]>
   <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" />
   <![endif]-->
-  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
+#  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
   # end WML to generate css/js paths 
 
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

Modified: website/branches/web20/include/navigation.wmi
===================================================================
--- website/branches/web20/include/navigation.wmi	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/include/navigation.wmi	2010-09-24 15:34:31 UTC (rev 23295)
@@ -11,7 +11,7 @@
         'about/about'                 , 'About Tor',
         'docs/documentation'          , 'Documentation',
         'projects/projects'           , 'Projects',
-        'press/index'                 , 'Press',
+        'press/'                      , 'Press',
         'https://blog.torproject.org/' , 'Blog',
         'http://printfection.com/torprojectstore' , 'Store',
     );

Modified: website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press>">Press &raquo; </a>
+    <a href="<page press/index>">Press &raquo; </a>
     <a href="<page press/2008-12-19-roadmap-press-release>">Tor Project Announces Three-Year Development Roadmap</a>
   </div> 
   <div id="maincol"> 

Modified: website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press/>">Press &raquo; </a>
+    <a href="<page press/index>">Press &raquo; </a>
     <a href="<page press/2009-03-12-performance-roadmap-press-release>">Tor Project Launches Performance Roadmap and Campaign</a>
   </div> 
   <div id="maincol">

Modified: website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
===================================================================
--- website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press/>">Press &raquo; </a>
+    <a href="<page press/index>">Press &raquo; </a>
     <a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
   </div> 
   <div id="maincol"> 

Modified: website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml
===================================================================
--- website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press/>">Press &raquo; </a>
+    <a href="<page press/index>">Press &raquo; </a>
     <a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
   </div> 
   <div id="maincol"> 

Modified: website/branches/web20/press/en/index.wml
===================================================================
--- website/branches/web20/press/en/index.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/index.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press>">Press</a>
+    <a href="<page press/index>">Press</a>
   </div> 
   <div id="maincol">
     <!-- PUT CONTENT AFTER THIS TAG -->
@@ -25,7 +25,7 @@
 <div class="nb">
 <h3>Quick links to better understand Tor</h3>
 <ol>
-<li>How is Tor <a href="<page faq>#Torisdifferent">different than other proxy solutions</a>?</li>
+<li>How is Tor <a href="<page docs/faq>#Torisdifferent">different than other proxy solutions</a>?</li>
 <li><a href="/presskit/2009-General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li>
 <li><a href="/presskit/2009-General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li>
 <li><a href="https://blog.torproject.org/blog/circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li>

Modified: website/branches/web20/press/en/inthemedia.wml
===================================================================
--- website/branches/web20/press/en/inthemedia.wml	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/inthemedia.wml	2010-09-24 15:34:31 UTC (rev 23295)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page press/>">Press &raquo; </a>
+    <a href="<page press/index>">Press &raquo; </a>
     <a href="<page press/inthemedia>">Tor in the Media</a>
   </div>
   <div id="maincol">
@@ -432,7 +432,7 @@
 <td><a href="http://news.cnet.com/8301-13739_3-9779225-46.html">
     Tor anonymity server admin arrested</a>.  A Tor exit node operator from Germany was arrested and then released once the police realized
     their mistake. Unfortunately, the hassle <a href="http://arstechnica.com/news.ars/post/20070917-tor-node-operator-after-run-in-with-police-i-cant-do-this-any-more.html"> caused this operator to shut down the node</a>.
-    We have an <a href="<page faq-abuse>"> Abuse FAQ for Tor Relay Operators</a>, as well as a <a href="<page eff/tor-legal-faq>">
+    We have an <a href="<page docs/faq-abuse>"> Abuse FAQ for Tor Relay Operators</a>, as well as a <a href="<page eff/tor-legal-faq>">
     Legal FAQ for Tor Relay Operators</a> with advice on how to handle such issues if you are operating a Tor relay.
   </td>
 </tr>

Modified: website/branches/web20/press/en/sidenav.wmi
===================================================================
--- website/branches/web20/press/en/sidenav.wmi	2010-09-24 03:07:51 UTC (rev 23294)
+++ website/branches/web20/press/en/sidenav.wmi	2010-09-24 15:34:31 UTC (rev 23295)
@@ -19,7 +19,7 @@
 <:
   my $sidenav;
   $sidenav = [
-      {'url'  => 'press/',
+      {'url'  => 'press/index',
        'txt'  => 'Press Releases',
       }, 
       {'url'  => 'press/inthemedia',

More information about the tor-commits mailing list