[or-cvs] r22138: {website} incognito changed its name (in website/trunk: en projects/en torbutton/en)

[Runa Sandvik]

Author: runa
Date: 2010-04-07 16:40:43 +0000 (Wed, 07 Apr 2010)
New Revision: 22138

Modified:
   website/trunk/en/faq.wml
   website/trunk/en/trademark-faq.wml
   website/trunk/en/volunteer.wml
   website/trunk/projects/en/index.wml
   website/trunk/torbutton/en/faq.wml
Log:
incognito changed its name

Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2010-04-07 09:26:47 UTC (rev 22137)
+++ website/trunk/en/faq.wml	2010-04-07 16:40:43 UTC (rev 22138)
@@ -637,8 +637,9 @@
 </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 @@
 <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

Modified: website/trunk/en/trademark-faq.wml
===================================================================
--- website/trunk/en/trademark-faq.wml	2010-04-07 09:26:47 UTC (rev 22137)
+++ website/trunk/en/trademark-faq.wml	2010-04-07 16:40:43 UTC (rev 22138)
@@ -69,7 +69,8 @@
 <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>

Modified: website/trunk/en/volunteer.wml
===================================================================
--- website/trunk/en/volunteer.wml	2010-04-07 09:26:47 UTC (rev 22137)
+++ website/trunk/en/volunteer.wml	2010-04-07 16:40:43 UTC (rev 22138)
@@ -892,9 +892,9 @@
 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>

Modified: website/trunk/projects/en/index.wml
===================================================================
--- website/trunk/projects/en/index.wml	2010-04-07 09:26:47 UTC (rev 22137)
+++ website/trunk/projects/en/index.wml	2010-04-07 16:40:43 UTC (rev 22138)
@@ -83,7 +83,8 @@
 <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>

Modified: website/trunk/torbutton/en/faq.wml
===================================================================
--- website/trunk/torbutton/en/faq.wml	2010-04-07 09:26:47 UTC (rev 22137)
+++ website/trunk/torbutton/en/faq.wml	2010-04-07 16:40:43 UTC (rev 22138)
@@ -78,7 +78,7 @@
 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 @@
 local censors potentially noticing you visit them, you can enable plugins by
 going into the Torbutton Preferences-&gt;Security Settings-&gt;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