[or-cvs] r23714: {website} fix page titles en masse, add a TBB blurb to the torbutton-f (in website/trunk: . donate/en torbutton/en)

Andrew Lewman andrew at torproject.org
Thu Oct 28 17:55:23 UTC 2010


Author: phobos
Date: 2010-10-28 17:55:23 +0000 (Thu, 28 Oct 2010)
New Revision: 23714

Modified:
   website/trunk/Makefile
   website/trunk/donate/en/donate-hardware.wml
   website/trunk/donate/en/donate-service.wml
   website/trunk/torbutton/en/torbutton-faq.wml
   website/trunk/torbutton/en/torbutton-options.wml
Log:
fix page titles en masse, add a TBB blurb to the torbutton-faq


Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile	2010-10-28 17:49:15 UTC (rev 23713)
+++ website/trunk/Makefile	2010-10-28 17:55:23 UTC (rev 23714)
@@ -10,7 +10,7 @@
 # 4. make
 # 5. ./publish
 
-export TORGIT=TORTUGA
+export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git
 export STABLETAG=tor-0.2.2.17-alpha
 export DEVTAG=tor-0.2.2.17-alpha
 

Modified: website/trunk/donate/en/donate-hardware.wml
===================================================================
--- website/trunk/donate/en/donate-hardware.wml	2010-10-28 17:49:15 UTC (rev 23713)
+++ website/trunk/donate/en/donate-hardware.wml	2010-10-28 17:55:23 UTC (rev 23714)
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+#include "head.wmi" TITLE="Tor Project: Donate Hardware to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>

Modified: website/trunk/donate/en/donate-service.wml
===================================================================
--- website/trunk/donate/en/donate-service.wml	2010-10-28 17:49:15 UTC (rev 23713)
+++ website/trunk/donate/en/donate-service.wml	2010-10-28 17:55:23 UTC (rev 23714)
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+#include "head.wmi" TITLE="Tor Project: Donate Services to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>

Modified: website/trunk/torbutton/en/torbutton-faq.wml
===================================================================
--- website/trunk/torbutton/en/torbutton-faq.wml	2010-10-28 17:49:15 UTC (rev 23713)
+++ website/trunk/torbutton/en/torbutton-faq.wml	2010-10-28 17:55:23 UTC (rev 23714)
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+#include "head.wmi" TITLE="Tor Project: Torbutton FAQ" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
@@ -71,7 +71,6 @@
     other Flash-based sites. Why?</a></strong>
     
     <p>
-    
     YouTube and similar sites require third party browser plugins such as Flash.
     Plugins operate independently from Firefox and can perform
     activity on your computer that ruins your anonymity. This includes
@@ -86,14 +85,13 @@
     with local IP address discovery and Flash cookies still remain.  </p>
     
     <p>
-    
     If you are not concerned about being tracked by these sites (and sites that
     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-&gt;Security Settings-&gt;Dynamic Content
     tab and unchecking "Disable plugins during Tor usage" box. If you do this
-    without Tor VM, The (Amnesic) Incognito Live System or appropriate
-    firewall rules, we strongly suggest you at least use <a
+    without 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
@@ -103,8 +101,11 @@
     placeholders in a page. We also recommend <a
     href="https://addons.mozilla.org/en-US/firefox/addon/6623">Better Privacy</a>
     in this case to help you clear your Flash cookies.
-    
     </p>
+
+    <p> The Tor Browser Bundle does not work with Flash or other plugins
+by design.  If you wish to run these plugins over Tor, you need to
+install Tor and configure your own instance of Firefox.</p>
     
     <a id="oldtorbutton"></a>
     <strong><a class="anchor" href="#oldtorbutton">Torbutton sure seems to do a lot of things, some of which I find

Modified: website/trunk/torbutton/en/torbutton-options.wml
===================================================================
--- website/trunk/torbutton/en/torbutton-options.wml	2010-10-28 17:49:15 UTC (rev 23713)
+++ website/trunk/torbutton/en/torbutton-options.wml	2010-10-28 17:55:23 UTC (rev 23714)
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+#include "head.wmi" TITLE="Tor Project: Torbutton Options" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>



More information about the tor-commits mailing list