[or-cvs] r8710: replaced accidental .txt file (website/branches/Oct2006/en)

[shava at seul.org]

Author: shava
Date: 2006-10-13 19:31:44 -0400 (Fri, 13 Oct 2006)
New Revision: 8710

Added:
   website/branches/Oct2006/en/glossary.wml
Log:
replaced accidental .txt file


Added: website/branches/Oct2006/en/glossary.wml
===================================================================
--- website/branches/Oct2006/en/glossary.wml	2006-10-13 22:51:49 UTC (rev 8709)
+++ website/branches/Oct2006/en/glossary.wml	2006-10-13 23:31:44 UTC (rev 8710)
@@ -0,0 +1,32 @@
+## translation metadata
+# Revision: $Revision: 7935 $
+
+#include "head.wmi" TITLE="a glossary"
+
+<div class="main-column">
+
+<h2>Tor: a glossary of terms</h2>
+<hr />
+When we talk about Tor, we will refer to several things:
+<ul>
+<li>The Tor network -- a complex of volunteer-run servers that relay anonymous traffic, 
+located on six continents.</li>
+<li>The Tor client -- a piece of software that runs on an individual's computer to allow
+them access to the Tor network</li>
+<li>The Tor bundle -- software we've chosen to distribute with our client, including the 
+Vidalia user interface and Privoxy, which protects you from intrusive marketing and helps 
+protect your anonymity.  We think these applications provide synergy with the client, and 
+we believe in the people who produce them.</li>
+<li>The Tor software -- the software we produce that runs the servers, 
+and provides individuals with a client program that connects to the Tor network</li>
+</ul>
+
+<p>
+Since we're a largely volunteer motivated project, you will find the term "Tor" used to mean 
+any or all of these things, sometimes in the same document!  We hope you'll be patient with us, 
+and we'd enjoy your <a href="<page volunteer>"help</a> in maintaining our documents and web site.
+</p>
+
+  </div><!-- #main -->
+
+#include <foot.wmi>