[or-cvs] r22811: {website} clean up the bundle faq. (website/trunk/en)

[Andrew Lewman <andrew@xxxxxxxxxxxxxx>]

Author: phobos
Date: 2010-08-06 16:05:13 +0000 (Fri, 06 Aug 2010)
New Revision: 22811

Modified:
   website/trunk/en/faq.wml
Log:
clean up the bundle faq.


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2010-08-06 12:42:45 UTC (rev 22810)
+++ website/trunk/en/faq.wml	2010-08-06 16:05:13 UTC (rev 22811)
@@ -670,14 +670,9 @@
 <li><a href="<page torbrowser/index>">Tor Browser Bundle</a>
 for Windows comes with a pre-configured web browser and is self contained
 so you can run it from a USB stick.</li>
-<li><a href="http://www.janusvm.com/tor_vm/";>Tor VM</a> is a successor
-to JanusVM. It needs testing from you!</li>
 <li><a href="http://janusvm.com/";>JanusVM</a> is a Linux kernel and software
 running in VMWare that sits between your Windows computer and the Internet,
 making sure that your Internet traffic is scrubbed and anonymized.</li>
-<li><a href="http://www.xerobank.com/xB_browser.html";>xB Browser</a>,
-previously known as Torpark, is a Firefox+Tor package for Win32 that can
-installed on a USB key. It needs a host Win32 operating system.</li>
 </ol>
 
 <p>
@@ -692,11 +687,6 @@
 software. It includes Tor and you can download it at
 <a
 href="http://www.northernsecurity.net/download/ele/";>http://www.northernsecurity.net/download/ele/</a>.</li>
-<li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
-Tor, some IRC and IM applications, and a set of ipchains rules aimed to prevent
-non-Tor traffic from accidentally leaving your computer. More information at
-<a
-href="https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine";>https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine</a>.</li>
 <li>Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather
 than Linux for maximum security. It was designed to be anonymous and secure
 from the ground up, and thus has some features and limitations not found in