[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r17899: {website} clean up the new faq entries (website/trunk/en)



Author: arma
Date: 2009-01-04 22:39:02 -0500 (Sun, 04 Jan 2009)
New Revision: 17899

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


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2009-01-05 02:30:48 UTC (rev 17898)
+++ website/trunk/en/faq.wml	2009-01-05 03:39:02 UTC (rev 17899)
@@ -480,7 +480,7 @@
 <p>
 This depends entirely on how you installed it and which operating system you
 have. If you installed a package, then hopefully your package has a way to
-uninstall itself. Windows has the uninstaller functionality. The proper way to
+uninstall itself. The Windows packages include uninstallers. The proper way to
 completely remove Tor, Vidalia, Torbutton for Firefox, and Privoxy on any
 version of Windows is as follows:
 </p>
@@ -496,11 +496,12 @@
 This will remove the Vidalia bundle, which includes Tor and Privoxy.</li>
 <li>Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.
 Click the Uninstall button.</li>
+</ol>
 
 <p>
-If you do not follow these steps, and merely try to uninstall Vidalia, Tor, and
-Privoxy, while they are still running, you need to reboot and manually remove
-the directory "Program Files\Vidalia Bundle".
+If you do not follow these steps (for example by trying to uninstall
+Vidalia, Tor, and Privoxy while they are still running), you will need to
+reboot and manually remove the directory "Program Files\Vidalia Bundle".
 </p>
 
 <p>
@@ -552,14 +553,15 @@
 <p>
 Sometimes, overzealous Windows virus and spyware detectors trigger on some
 parts of the Tor Windows binary. Our best guess is that these are false
-positives --- after all, the anti-virus and anti-spyware business is just a
+positives &mdash; after all, the anti-virus and anti-spyware business is just a
 guessing game anyway. You should contact your vendor and explain that you have
 a program that seems to be triggering false positives. Or pick a better vendor.
 </p>
 
 <p>
-In the meantime, we encourage you to not just take our word for it. Our job is
-to provide the source; please do recompile it yourself.
+In the meantime, we encourage you to not just take our word for
+it. Our job is to provide the source; if you're concerned, please do <a
+href="#CompileTorWindows">recompile it yourself</a>.
 </p>
 
 <hr />
@@ -576,40 +578,51 @@
 </p>
 
 <p>
-Maintained:
+LiveCDs:
 </p>
 
 <ol>
-<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>
+<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
+is a CD you can boot that has several Internet applications (Firefox, IRC,
+Mail, etc) pre-configured to use Tor. For most computers everything is
+automatically configured and you're ready to go. You can even copy the CD to a
+USB drive. Includes TorK.</li>
 <li><a href="http://tork.sourceforge.net/wiki/index.php/LiveCD";>TorK LiveCD</a>
 is Knoppix-based with an emphasis on user-friendliness. You can work
 anonymously or non-anonymously while TorK tries to keep you informed of the
 consequences of your activity. The TorK LiveCD is experimental, so the aim is
 to provide regular releases through 2007 and beyond.</li>
-<li>Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor
-and utilities to encrypt IP-telephony. <a href="http://polippix.org/";>Info and
-download</a>.</li>
-<li><a href="http://incognito.anonymityanywhere.com/";>Incognito LiveCD/USB</a>
-is a CD you can boot that has several Internet applications (Firefox, IRC,
-Mail, etc) pre-configured to use Tor. For most computers everything is
-automatically configured and you're ready to go. You can even copy the CD to a
-USB drive. Includes TorK.</li>
 <li><a href="http://mandalka.name/privatix/";>Privatix LiveCD/USB</a> is a
 debian based live-system including tor, firefox and torbutton which can save
 bookmarks and other settings or data on an encrypted usb-key</li>
-<li>Please contact us if you know of any other.</li>
 </ol>
 
 <p>
+Windows bundles:
+</p>
+
+<ol>
+<li><a href="https://www.torproject.org/torbrowser/";>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>
 Not currently maintained as far as we know:
 </p>
 
 <ol>
+<li>Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor
+and utilities to encrypt IP-telephony. <a href="http://polippix.org/";>Info and
+download</a>.</li>
 <li>ELE is a Linux LiveCD which is focused on privacy related
 software. It includes Tor and you can download it at
 <a
@@ -631,6 +644,10 @@
 Website</a>.</li>
 </ol>
 
+<p>
+Please contact us if you know any others.
+</p>
+
 <hr />
 
 <a id="KeyManagement"></a>