[or-cvs] r23316: {website} fix up the info blurb, update navigation for about links, re (in website/branches/web20: about/en download/en include)
Andrew Lewman
andrew at torproject.org
Mon Sep 27 20:31:47 UTC 2010
Author: phobos
Date: 2010-09-27 20:31:47 +0000 (Mon, 27 Sep 2010)
New Revision: 23316
Removed:
website/branches/web20/about/en/future.wml
website/branches/web20/about/en/staying.wml
website/branches/web20/about/en/why.wml
Modified:
website/branches/web20/download/en/download.wml
website/branches/web20/include/foot.wmi
website/branches/web20/include/info.wmi
website/branches/web20/include/navigation.wmi
Log:
fix up the info blurb, update navigation for about links, remove 3 pages
replaced by the general overview, fix up download warning.
Deleted: website/branches/web20/about/en/future.wml
===================================================================
--- website/branches/web20/about/en/future.wml 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/about/en/future.wml 2010-09-27 20:31:47 UTC (rev 23316)
@@ -1,47 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor Project: Future of Tor" CHARSET="UTF-8" <p>
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page about/overview>">About » </a>
- <a href="<page about/future>">The Future of Tor</a>
- </div>
- <div id="maincol">
- <h1>The future of Tor</a></h1>
-
- <p>
- Providing a usable anonymizing network on the Internet today is an
- ongoing challenge. We want software that meets users' needs. We also
- want to keep the network up and running in a way that handles as many
- users as possible. Security and usability don't have to be at odds:
- As Tor's usability increases, it will attract more users, which will
- increase the possible sources and destinations of each communication,
- thus increasing security for everyone.
- We're making progress, but we need your help. Please consider
- <a href="<page docs/tor-doc-relay>">running a relay</a>
- or <a href="<page getinvolved/volunteer>">volunteering</a> as a
- <a href="<page docs/documentation>#Developers">developer</a>.
- </p>
-
- <p>
- Ongoing trends in law, policy, and technology threaten anonymity as never
- before, undermining our ability to speak and read freely online. These
- trends also undermine national security and critical infrastructure by
- making communication among individuals, organizations, corporations,
- and governments more vulnerable to analysis. Each new user and relay
- provides additional diversity, enhancing Tor's ability to put control
- over your security and privacy back into your hands.
- </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/about/en/staying.wml
===================================================================
--- website/branches/web20/about/en/staying.wml 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/about/en/staying.wml 2010-09-27 20:31:47 UTC (rev 23316)
@@ -1,42 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Tor Project: Staying Anonymous" CHARSET="UTF-8" <p>
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page about/overview>">About » </a>
- <a href="<page about/staying>">Staying Anonymous</a>
- </div>
- <div id="maincol">
- <h1>Staying anonymous</h1>
-
- <p>
- Tor can't solve all anonymity problems. It focuses only on
- protecting the transport of data. You need to use protocol-specific
- support software if you don't want the sites you visit to see your
- identifying information. For example, you can use web proxies such as
- Poliipo while web browsing to block cookies and withhold information
- about your browser type.
- </p>
-
- <p>
- Also, to protect your anonymity, be smart. Don't provide your name
- or other revealing information in web forms. Be aware that, like all
- anonymizing networks that are fast enough for web browsing, Tor does not
- provide protection against end-to-end timing attacks: If your attacker
- can watch the traffic coming out of your computer, and also the traffic
- arriving at your chosen destination, he can use statistical analysis to
- discover that they are part of the same circuit.
- </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/about/en/why.wml
===================================================================
--- website/branches/web20/about/en/why.wml 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/about/en/why.wml 2010-09-27 20:31:47 UTC (rev 23316)
@@ -1,66 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="Why We Need Tor" CHARSET="UTF-8" <p>
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page about/overview>">About » </a>
- <a href="<page about/why>">Why We Need Tor</a>
- </div>
- <div id="maincol">
- <h1>Why We Need Tor</h1>
-
- <p>
- Using Tor protects you against a common form of Internet surveillance
- known as "traffic analysis." Traffic analysis can be used to infer
- who is talking to whom over a public network. Knowing the source
- and destination of your Internet traffic allows others to track your
- behavior and interests. This can impact your checkbook if, for example,
- an e-commerce site uses price discrimination based on your country or
- institution of origin. It can even threaten your job and physical safety
- by revealing who and where you are. For example, if you're travelling
- abroad and you connect to your employer's computers to check or send mail,
- you can inadvertently reveal your national origin and professional
- affiliation to anyone observing the network, even if the connection
- is encrypted.
- </p>
-
- <p>
- How does traffic analysis work? Internet data packets have two parts:
- a data payload and a header used for routing. The data payload is
- whatever is being sent, whether that's an email message, a web page, or an
- audio file. Even if you encrypt the data payload of your communications,
- traffic analysis still reveals a great deal about what you're doing and,
- possibly, what you're saying. That's because it focuses on the header,
- which discloses source, destination, size, timing, and so on.
- </p>
-
- <p>
- A basic problem for the privacy minded is that the recipient of your
- communications can see that you sent it by looking at headers. So can
- authorized intermediaries like Internet service providers, and sometimes
- unauthorized intermediaries as well. A very simple form of traffic
- analysis might involve sitting somewhere between sender and recipient on
- the network, looking at headers.
- </p>
-
- <p>
- But there are also more powerful kinds of traffic analysis. Some
- attackers spy on multiple parts of the Internet and use sophisticated
- statistical techniques to track the communications patterns of many
- different organizations and individuals. Encryption does not help against
- these attackers, since it only hides the content of Internet traffic, not
- the headers.
- </p>
- </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/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/download/en/download.wml 2010-09-27 20:31:47 UTC (rev 23316)
@@ -7,73 +7,13 @@
<div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div>
<div id="maincol-left">
<h1>Download Tor</h1>
- <!-- BEGIN WARNING -->
+ <!-- BEGIN TEASER WARNING -->
<div class="warning">
<h2>Want Tor to really work?</h2>
-<p></p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. There are several major pitfalls to watch out for:
+<p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>.
</p>
-
-<ol>
-<li>
-Tor only protects Internet applications that are configured to
-send their traffic through Tor — it doesn't magically anonymize
-all your traffic just because you install it. We recommend you
-use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a
-href="<page torbutton/index>">Torbutton</a> extension.
-</li>
-
-<li>
-Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer,
-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/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
-information. Some people prefer using two browsers (one for Tor, one
-for unsafe browsing).
-</li>
-
-<li>
-Beware of cookies: if you ever browse without Tor and a site gives
-you a cookie, that cookie could identify you even when you start
-using Tor again. Torbutton tries to handle your cookies safely. <a
-href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help
-protect any cookies you do not want to lose.
-</li>
-
-<li>
-Tor anonymizes the origin of your traffic, and it encrypts everything
-between you and the Tor network and everything inside the Tor network,
-but <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor">it
-can't encrypt your traffic between the Tor network and its final
-destination.</a> If you are communicating sensitive information, you
-should use as much care as you would on the normal scary Internet —
-use HTTPS or other end-to-end encryption and authentication.
-</li>
-
-<li>
-While Tor blocks attackers on your local network from discovering
-or influencing your destination, it opens new risks: malicious or
-misconfigured Tor exit nodes can send you the wrong page, or even send
-you embedded Java applets disguised as domains you trust. Be careful
-opening documents or applications you download through Tor, unless you've
-verified their integrity.
-</li>
-</ol>
-
-<br />
-<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 getinvolved/volunteer>#Documentation">identifying and documenting
-all the issues</a>.
-</p>
- </p>
</div>
- <!-- END WARNING -->
+ <!-- END TEASER WARNING -->
<table class="topforty">
<tr>
<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
@@ -83,7 +23,7 @@
Bundle contains Tor, Vidalia, Torbutton, Polipo, and
Firefox. This package requires no installation. Just
extract it and run.</td>
- </tr>
+ </tr>
<tr>
<td><span class="column-title">Language</span></td>
<td><span class="column-title">Version</span></td>
@@ -125,7 +65,7 @@
<td><version-torbrowserbundlelinux></td>
<td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
<td></td>
- </tr>
+ </tr>
</tr>
</table>
<table class="topforty">
@@ -150,7 +90,7 @@
<td><span class="mac"><a href="<package-osx-bundle-alpha>">Download</a></span>
<td><span class="linux"><a href="<page download/download-unix>">Unix Packages</a></span></td>
<td><a href="<package-source-alpha>">Download Tarball</a></td>
- </tr>
+ </tr>
</table>
<table class="topforty">
<tr>
@@ -228,6 +168,75 @@
<td><a href="#">Source Tarballs</a></td>
</tr>
</table>
+
+<!-- BEGIN WARNING -->
+ <div class="warning">
+ <a name="warning"></a>
+ <h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
+<p></p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. There are several major pitfalls to watch out for:
+</p>
+
+<ol>
+<li>
+Tor only protects Internet applications that are configured to
+send their traffic through Tor — it doesn't magically anonymize
+all your traffic just because you install it. We recommend you
+use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a
+href="<page torbutton/index>">Torbutton</a> extension.
+</li>
+
+<li>
+Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer,
+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/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
+information. Some people prefer using two browsers (one for Tor, one
+for unsafe browsing).
+</li>
+
+<li>
+Beware of cookies: if you ever browse without Tor and a site gives
+you a cookie, that cookie could identify you even when you start
+using Tor again. Torbutton tries to handle your cookies safely. <a
+href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help
+protect any cookies you do not want to lose.
+</li>
+
+<li>
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network,
+but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor">it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you
+should use as much care as you would on the normal scary Internet —
+use HTTPS or other end-to-end encryption and authentication.
+</li>
+
+<li>
+While Tor blocks attackers on your local network from discovering
+or influencing your destination, it opens new risks: malicious or
+misconfigured Tor exit nodes can send you the wrong page, or even send
+you embedded Java applets disguised as domains you trust. Be careful
+opening documents or applications you download through Tor, unless you've
+verified their integrity.
+</li>
+</ol>
+
+<br />
+<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 getinvolved/volunteer>#Documentation">identifying and documenting
+all the issues</a>.
+</p>
+ </p>
+ </div>
+ <!-- END WARNING -->
</div>
<!-- END MAINCOL -->
<div id="sidecol-right">
Modified: website/branches/web20/include/foot.wmi
===================================================================
--- website/branches/web20/include/foot.wmi 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/include/foot.wmi 2010-09-27 20:31:47 UTC (rev 23316)
@@ -39,7 +39,7 @@
<div class="col first">
<h4>About Tor</h4>
<ul>
- <li><a href="<page about/about>">What Tor Does</a></li>
+ <li><a href="<page about/overview>">What Tor Does</a></li>
<li><a href="<page about/torusers>">Users of Tor</a></li>
<li><a href="<page about/corepeople>">Core Tor People</a></li>
<li><a href="<page about/sponsors>">Sponsors</a></li>
Modified: website/branches/web20/include/info.wmi
===================================================================
--- website/branches/web20/include/info.wmi 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/include/info.wmi 2010-09-27 20:31:47 UTC (rev 23316)
@@ -2,7 +2,8 @@
<div class="img-shadow">
<div class="infoblock">
<h2 class="bulb">Tor Tip</h2>
- <p>Use Tor correctly or go away. NEED BETTER BLURB.</p>
+ <p>Want to get the most out of Tor? Understand what Tor <a
+href="<page download/download>#warning">does and does not do</a> to protect you!</p>
</div>
<!-- END INFOBLOCK -->
</div>
Modified: website/branches/web20/include/navigation.wmi
===================================================================
--- website/branches/web20/include/navigation.wmi 2010-09-27 19:27:16 UTC (rev 23315)
+++ website/branches/web20/include/navigation.wmi 2010-09-27 20:31:47 UTC (rev 23316)
@@ -8,7 +8,7 @@
# path link text
my @navigation = (
'home' , 'Home',
- 'about/about' , 'About Tor',
+ 'about/overview' , 'About Tor',
'docs/documentation' , 'Documentation',
'projects/projects' , 'Projects',
'press/' , 'Press',
More information about the tor-commits
mailing list