[or-cvs] r16892: {website} start putting a 'what is tor' question back in. it seems dum (website/trunk/en)

[arma at seul.org]

Author: arma
Date: 2008-09-13 05:11:07 -0400 (Sat, 13 Sep 2008)
New Revision: 16892

Modified:
   website/trunk/en/faq.wml
Log:
start putting a 'what is tor' question back in. it seems dumb
not to start the faq at the beginning. alas.


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2008-09-13 09:08:25 UTC (rev 16891)
+++ website/trunk/en/faq.wml	2008-09-13 09:11:07 UTC (rev 16892)
@@ -27,15 +27,38 @@
 
 <a id="General"></a>
 
+<a id="WhatIsTor"></a>
+<h3><a class="anchor" href="#WhatIsTor">What is Tor?</a></h3>
+
+<p>
+The name "Tor" can refer to several different components.
+</p>
+
+<p>
+The Tor software is a program you can run on your computer that helps keep
+you safe on the Internet. 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 visit, and it prevents the sites you visit
+from learning your physical location. This set of volunteer relays is
+called the Tor network. You can read more about how Tor works on the <a
+href="<page overview>">overview page</a>.
+</p>
+
+<p>
+The Tor Project is a non-profit (charity) organization that maintains
+and develops the Tor software. The Tor Project is ...
+</p>
+
 <a id="CompatibleApplications"></a>
-<h3><a class="anchor" href="#CompatibleApplications">What programs work
-with Tor?</a></h3>
+<h3><a class="anchor" href="#CompatibleApplications">What programs can
+I use with Tor?</a></h3>
 
 <p>
 There are two pieces to "Torifying" a program: connection-level anonymity
 and application-level anonymity. Connection-level anonymity focuses on
-making sure the application's Internet connections get sent into Tor,
-so they can be anonymized. This step is normally done by configuring
+making sure the application's Internet connections get sent through Tor.
+This step is normally done by configuring
 the program to use your Tor client as a "socks" proxy, but there are
 other ways to do it too. For application-level anonymity, you need to
 make sure that the information the application sends out doesn't hurt
@@ -163,7 +186,7 @@
 </p>
 
 <p>
-Also, you should make sure not to confuse your users about what Tor is,
+Also, you should make sure not to confuse your readers about what Tor is,
 who makes it, and what properties it provides (and doesn't provide). See
 our <a href="<page trademark-faq>">trademark FAQ</a> for details.
 </p>
@@ -183,7 +206,7 @@
 <p>
 Many people send the Tor developers mail privately, or send mail to
 our internal aliases like tor-webmaster, with questions about their
-specific setup -- they can't get their firewall working right,
+specific setup &mdash; they can't get their firewall working right,
 they can't configure Privoxy correctly, or so on. Sometimes our
 volunteers can answer these mails, but typically they need to spend
 most of their time on development tasks that will benefit more people.