[or-cvs] r17370: {website} clean up the new faq file so it can actually be used (website/trunk/en)

[arma at seul.org]

Author: arma
Date: 2008-11-22 21:19:36 -0500 (Sat, 22 Nov 2008)
New Revision: 17370

Modified:
   website/trunk/en/faq.wml
Log:
clean up the new faq file so it can actually be used


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2008-11-22 23:54:39 UTC (rev 17369)
+++ website/trunk/en/faq.wml	2008-11-23 02:19:36 UTC (rev 17370)
@@ -13,16 +13,32 @@
 <h2>Tor FAQ</h2>
 <hr />
 
+<p>General questions:</p>
 <ul>
-<li><a href="#General">General questions</a></li>
-<li><a href="#foo">Compilation and Installation</a></li>
-<li><a href="#foo">Running Tor</a></li>
-<li><a href="#foo">Running a Tor client</a></li>
-<li><a href="#foo">Running a Tor relay</a></li>
-<li><a href="#foo">Running a Tor hidden service</a></li>
-<li><a href="#foo">What happens to my donation?</a></li>
+<li><a href="#WhatIsTor">What is Tor?</a></li>
+<li><a href="#CompatibleApplications">What programs can I use with
+Tor?</a></li>
+<li><a href="#WhyCalledTor">Why is it called Tor?</a></li>
+<li><a href="#Backdoor">Is there a backdoor in Tor?</a></li>
+<li><a href="#DistributingTor">Can I distribute Tor on my magazine's
+CD?</a></li>
+<li><a href="#SupportMail">How can I get an answer to my
+Tor support mail?</a></li>
+<li><a href="#WhySlow">Why is Tor so slow?</a></li>
+<li><a href="#Funding">What would The Tor Project do with more
+funding?</a></li>
 </ul>
 
+<p>Compilation and Installation:</p>
+
+<p>Running Tor:</p>
+
+<p>Running a Tor client:</p>
+
+<p>Running a Tor relay:</p>
+
+<p>Running a Tor hidden service:</p>
+
 <hr />
 
 <a id="General"></a>
@@ -47,7 +63,7 @@
 
 <p>
 The Tor Project is a non-profit (charity) organization that maintains
-and develops the Tor software. The Tor Project is ...
+and develops the Tor software.
 </p>
 
 <a id="CompatibleApplications"></a>
@@ -136,8 +152,10 @@
 always check the source (or at least the diffs since the last release)
 for suspicious things. If we (or the distributors) don't give you
 source, that's a sure sign something funny might be going on. You
-should also check the GPG signatures on the releases, to make sure
-nobody messed with the distribution sites.
+should also check the <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures">PGP
+signatures</a> on the releases, to make sure nobody messed with the
+distribution sites.
 </p>
 
 <p>
@@ -155,7 +173,7 @@
 </p>
 
 <p>
-The Tor software is <a href="http://www.fsf.org/">free software</a>. This
+The Tor software is <a href="https://www.fsf.org/">free software</a>. This
 means we give you the rights to redistribute the Tor software, either
 modified or unmodified, either for a fee or gratis. You don't have to
 ask us for specific permission.
@@ -163,7 +181,7 @@
 
 <p>
 However, if you want to redistribute the Tor software you must follow our
-<a href="<svnsandbox>LICENSE">LICENSE</a>.
+<a href="<svnsandbox>license">LICENSE</a>.
 Essentially this means that you need to include our LICENSE file along
 with whatever part of the Tor software you're distributing.
 </p>
@@ -175,7 +193,7 @@
 and <a href="http://www.vidalia-project.net/">Vidalia</a>.
 You will need to follow the licenses for those programs
 as well. Both of them are distributed under the <a
-href="http://www.fsf.org/licensing/licenses/gpl.html">GNU General
+href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
 Public License</a>. The simplest way to obey their licenses is to
 include the source code for these programs everywhere you include
 the bundles themselves. Look for "source" packages on the <a
@@ -303,9 +321,10 @@
 
 <li>
 Tor needs some architectural changes too. One important change is to
-start providing <a href="#EverybodyARelay">better service to people who
-relay traffic</a>. We're working on this, and we'll finish faster if we
-get to spend more time on it.
+start providing <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#EverybodyARelay">better
+service to people who relay traffic</a>. We're working on this, and
+we'll finish faster if we get to spend more time on it.
 </li>
 
 <li>
@@ -332,7 +351,7 @@
 </ul>
 
 <a id="Funding"></a>
-<h3><a class="anchor" href="#Funding">What would the Tor project do with
+<h3><a class="anchor" href="#Funding">What would The Tor Project do with
 more funding?</a></h3>
 
 <p>
@@ -431,6 +450,9 @@
 <a id="question"></a>
 <h3><a class="anchor" href="#question">Question?</a></h3>
 
+
+
+
   </div><!-- #main -->
 
 #include <foot.wmi>