[or-cvs] r19379: {website} minor updates to the TBB section to actually reference it as (website/trunk/en)

[phobos at seul.org]

Author: phobos
Date: 2009-04-26 19:57:26 -0400 (Sun, 26 Apr 2009)
New Revision: 19379

Modified:
   website/trunk/en/easy-download.wml
   website/trunk/en/index.wml
Log:
minor updates to the TBB section to actually reference it as TBB rather
than "zero install" for clarity.  update the summary sidebar with
links to overview instead of 30seconds.


Modified: website/trunk/en/easy-download.wml
===================================================================
--- website/trunk/en/easy-download.wml	2009-04-26 05:07:20 UTC (rev 19378)
+++ website/trunk/en/easy-download.wml	2009-04-26 23:57:26 UTC (rev 19379)
@@ -18,8 +18,7 @@
 <td bgcolor="#e5e5e5" align="center">
 # Translators: please point to the version of TBB in your language,
 # if there is one.
-<a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Zero
-Install Bundle for Windows</a>
+<a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Tor Browser Bundle for Windows</a>
 </td>
 <td align="center">
 <a href="<package-osx-bundle-stable>">Installation Bundle for Apple OS X</a>
@@ -30,8 +29,7 @@
 </td>
 </tr>
 <tr>
-<td bgcolor="#e5e5e5" align="center">Great for USB drives! Pre-configured with Mozilla
-Firefox. <a href="<page torbrowser/index>#Extraction">Screenshots</a>.</td>
+<td bgcolor="#e5e5e5" align="center">Zero installation.  Great for USB drives! Pre-configured with Firefox and more. <a href="<page torbrowser/index>">Learn more</a>.</td>
 <td align="center">Simple.  Point.  Click.  Install.</td>
 <td bgcolor="#e5e5e5" align="center">Easy to Install.</td>
 </tr>
@@ -43,12 +41,12 @@
 download>#Warning">Read more about this topic</a>.</p></li>
 <li><p>Verify the signatures for the downloads above (<a href="<page verifying-signatures>">How?</a>):</p>
   <ul>
-    <li><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">Zero Install Bundle for Windows signature</a></li>
+    <li><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">Tor Browser Bundle for Windows signature</a></li>
     <li><a href="<package-win32-bundle-stable-sig>">Installation Bundle for Windows signature</a></li>
     <li><a href="<package-osx-bundle-stable-sig>">Installation Bundle for OS X signature</a></li>
   </ul></li>
 <li><p>Need more download options?  <a href="<page download>">See advanced choices</a>.</p></li>
-<li><p>Interested in <a href="<page 30seconds>">learning more about Tor in general</a>?</p></li>
+<li><p>Interested in <a href="<page overview>#overview">learning more about Tor in general</a>?</p></li>
 </ul>
 <p>
 To keep informed of security advisories and new stable releases, subscribe

Modified: website/trunk/en/index.wml
===================================================================
--- website/trunk/en/index.wml	2009-04-26 05:07:20 UTC (rev 19378)
+++ website/trunk/en/index.wml	2009-04-26 23:57:26 UTC (rev 19379)
@@ -14,9 +14,9 @@
 <div class="sidebar">
 <h3>Summary</h3>
 <p>
-<p><a href="<page 30seconds>">What is Tor?</a></p>
+<p><a href="<page overview>#overview">Why Tor?</a></p>
 <p><a href="<page torusers>">Who uses Tor?</a></p>
-<p><a href="<page overview>">Want more detail?</a></p>
+<p><a href="<page overview>#thesolution">What is Tor?</a></p>
 <hr />
 <div class="downloadbutton">
 <p><a href="<page easy-download>">Download Tor</a></p>
@@ -33,6 +33,7 @@
 surveillance that threatens personal freedom and privacy, confidential
 business activities and relationships, and state security known as <a
 href="<page overview>">traffic analysis</a>.</p>
+
 <p>Tor protects you by bouncing your communications around a distributed
 network of relays run by volunteers all around the world: it prevents
 somebody watching your Internet connection from learning what sites you