tor-webwml.git

@@ -637,8 +637,9 @@ LiveCDs:

 </p>

 <ol>

-<li><a href="https://amnesia.boum.org/">amnesia LiveCD/USB</a> is a Live

-System aimed at preserving your privacy and anonymity:

+<li><a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live

+System</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>

@@ -649,11 +650,6 @@ 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

-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

@@ -69,7 +69,8 @@ Tor?</h2>

 <p>Yes.  A few open source, non-commercial projects are Tor trademark

 licensees:</p>

 <ul>

-<li><a href="http://anonymityanywhere.com/incognito/">Incognito</a></li>

+<li><a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live

+System</a></li>

 <li><a href="http://portabletor.sourceforge.net/">Portable Tor</a></li>

 <li><a href="http://torstatus.kgprog.com/">Kprog Tor Status</a></li>

 <li><a href="<page vidalia/index>">Vidalia</a></li>

@@ -892,9 +892,9 @@ 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 various LiveCD/USB systems easier

-to maintain, improve, and document?  Some examples are <a

-href="http://amnesia.boum.org/">amnesia LiveCD/USB</a> and the <a

-href="http://anonymityanywhere.com/incognito/">Incognito LiveCD</a>

+to maintain, improve, and document?  One example is <a

+href="https://amnesia.boum.org/">The (Amnesic) Incognito Live

+System</a>.

 </li>

 <li>

@@ -83,7 +83,8 @@ installer</a>.</li>

 <li>osx image</li>

 <li>torvm</li>

 <li>orbot</li>

-<li>livecd's: incognito, <a href="https://amnesia.boum.org/">amnesia</a>, tor ramdisk</li>

+<li>livecd's: <a href="https://amnesia.boum.org/">The (Amnesic)

+Incognito Live System</a>, tor ramdisk</li>

 </ul>

 <a id="Implementations"></a>

@@ -78,7 +78,7 @@ IP address</a>, and <a

 href="http://epic.org/privacy/cookies/flash.html">storing their own

 cookies</a>. It is possible to use a LiveCD or VMWare-based solution such as

 <a href="<page torvm/index>">Tor VM</a> or <a

-href="http://anonymityanywhere.com/incognito/">Incognito</a> that creates a

+href="https://amnesia.boum.org/">The (Amnesic) Incognito Live System</a> that creates a

 secure, transparent proxy to protect you from proxy bypass, however issues

 with local IP address discovery and Flash cookies still remain.  </p>

@@ -89,8 +89,8 @@ try to unmask you by pretending to be them), and are unconcerned about your

 local censors potentially noticing you visit them, you can enable plugins by

 going into the Torbutton Preferences->Security Settings->Dynamic Content

 tab and unchecking "Disable plugins during Tor usage" box. If you do this

-without Tor VM, Incognito or appropriate firewall rules, we strongly suggest

-you at least use <a

+without Tor VM, The (Amnesic) Incognito Live System or appropriate

+firewall rules, we strongly suggest you at least use <a

 href="https://addons.mozilla.org/en-US/firefox/addon/722">NoScript</a> to <a

 href="http://noscript.net/features#contentblocking">block plugins</a>. You do

 not need to use the NoScript per-domain permissions if you check the <b>Apply