[tor-commits] r26731: {website} update more references to torbutton (in website/trunk: . docs/en)

[Andrew Lewman]

Author: phobos
Date: 2014-04-24 14:42:53 +0000 (Thu, 24 Apr 2014)
New Revision: 26731

Modified:
   website/trunk/Makefile
   website/trunk/docs/en/documentation.wml
   website/trunk/docs/en/faq.wml
Log:
update more references to torbutton


Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile	2014-04-24 14:39:20 UTC (rev 26730)
+++ website/trunk/Makefile	2014-04-24 14:42:53 UTC (rev 26731)
@@ -14,7 +14,7 @@
 export DEVTAG=tor-0.2.5.3-alpha
 
 WMLBASE=.
-SUBDIRS=docs eff projects press about download getinvolved donate torbutton 
+SUBDIRS=docs eff projects press about download getinvolved donate 
 include $(WMLBASE)/Makefile.local
 
 include $(WMLBASE)/Makefile.common
@@ -36,8 +36,6 @@
 	$(MAKE) -C "$@" WMLBASE=.. 
 donate:
 	$(MAKE) -C "$@" WMLBASE=..  
-torbutton:
-	$(MAKE) -C "$@" WMLBASE=..  
 mirrors:
 	./update-mirrors.pl
 translations:
@@ -49,4 +47,4 @@
 # XXX: this also depends on all subs' wmlfiles.  How to fix?
 #translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
 
-.PHONY: docs eff projects press about download getinvolved donate torbutton
+.PHONY: docs eff projects press about download getinvolved donate 

Modified: website/trunk/docs/en/documentation.wml
===================================================================
--- website/trunk/docs/en/documentation.wml	2014-04-24 14:39:20 UTC (rev 26730)
+++ website/trunk/docs/en/documentation.wml	2014-04-24 14:42:53 UTC (rev 26731)
@@ -18,7 +18,7 @@
     Mac OS X</a></li>
     <li><a href="<page docs/tor-doc-unix>">Installing Tor on
     Linux/BSD/Unix</a></li>
-    <li><a href="<page torbutton/index>">Installing
+    <li><a href="<page docs/torbutton/index>">Installing
     Torbutton for Tor</a></li>
     <li><a href="<page docs/tor-doc-relay>">Configuring a
     Tor relay</a></li>

Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2014-04-24 14:39:20 UTC (rev 26730)
+++ website/trunk/docs/en/faq.wml	2014-04-24 14:42:53 UTC (rev 26731)
@@ -1342,7 +1342,7 @@
 
 <p>
 Unfortunately, Torbutton only works with Firefox right now, and without
-<a href="https://www.torproject.org/torbutton/en/design/">Torbutton's
+<a href="https://www.torproject.org/docs/torbutton/en/design/">Torbutton's
 extensive privacy fixes</a> there are many ways for websites or other
 attackers to recognize you, track you back to your IP address, and so
 on.