[or-cvs] r21590: {website} it appears incognito livecd is process of being replaced by (website/trunk/en)

[Andrew Lewman]

Author: phobos
Date: 2010-02-08 14:20:51 +0000 (Mon, 08 Feb 2010)
New Revision: 21590

Modified:
   website/trunk/en/faq.wml
   website/trunk/en/volunteer.wml
Log:
it appears incognito livecd is process of being replaced by amnesia.
link to the latter.


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2010-02-08 12:50:02 UTC (rev 21589)
+++ website/trunk/en/faq.wml	2010-02-08 14:20:51 UTC (rev 21590)
@@ -637,6 +637,18 @@
 </p>
 
 <ol>
+<li><a href="https://amnesia.boum.org/">amnesia LiveCD/USB</a> is a Live
+System aimed at preserving your privacy and anonymity:
+<ul>
+<li> All outgoing connections to the Internet are forced to go through
+the Tor network.</li>
+<li> No trace is left on local storage devices unless explicitely asked.</li>
+<li> It includes Firefox, Tor, Torbutton, Vidalia graphical Tor
+controller, Pidgin Instant Messaging client, and lots of other
+software.</li>
+<li> It's based upon Debian gnu/linux and comes with the GNOME desktop
+environment.</li>
+</ul>
 <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

Modified: website/trunk/en/volunteer.wml
===================================================================
--- website/trunk/en/volunteer.wml	2010-02-08 12:50:02 UTC (rev 21589)
+++ website/trunk/en/volunteer.wml	2010-02-08 14:20:51 UTC (rev 21590)
@@ -758,9 +758,10 @@
 integrate this as an wml file so translations are easy and images are
 generated in multiple languages whenever we build the website.</li>
 
-<li>How can we make the <a
+<li>How can we make the various LiveCD/USB systems easier
+to maintain, improve, and document?  Some examples are <a
 href="http://anonymityanywhere.com/incognito/">Incognito LiveCD</a>
-easier to maintain, improve, and document?</li>
+and the  <a href="http://amnesia.boum.org">amnesia LiveCD/USB</a>.</li>
 </ol>
 
 <a id="Research"></a>