[or-cvs] r23576: {website} and play the "where did that go" game so it builds again (website/trunk/docs/en)

[Roger Dingledine]

Author: arma
Date: 2010-10-11 05:43:45 +0000 (Mon, 11 Oct 2010)
New Revision: 23576

Modified:
   website/trunk/docs/en/faq.wml
Log:
and play the "where did that go" game so it builds again


Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2010-10-11 05:37:19 UTC (rev 23575)
+++ website/trunk/docs/en/faq.wml	2010-10-11 05:43:45 UTC (rev 23576)
@@ -738,7 +738,7 @@
 Vidalia will turn green. You can also check in the Vidalia
 Control Panel to make sure it says "Connected to the Tor
 network!" under Status. For those not using Vidalia, check your <a
-href="<wiki>TorFAQ#HowdoIsetuploggingorseeTorslogs">Tor logs</a> for
+href="<wikifaq>#HowdoIsetuploggingorseeTorslogs">Tor logs</a> for
 a line saying that Tor "has successfully opened a circuit. Looks like
 client functionality is working."
 </p>
@@ -755,17 +755,17 @@
 the clock -&gt; Internet time tab. In addition, correct the day and date
 under the 'Date &amp; Time' Tab.</li>
 <li>Is your Internet connection <a
-href="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">firewalled</a>,
+href="<wikifaq>#Myfirewallonlyallowsafewoutgoingports.">firewalled</a>,
 or do you normally need to use a <a
-href="<wiki>TorFAQ#MyInternetconnectionrequiresanHTTPorSOCKSproxy.">proxy</a>?
+href="<wikifaq>#MyInternetconnectionrequiresanHTTPorSOCKSproxy.">proxy</a>?
 </li>
 <li>Are you running programs like Norton Internet Security or SELinux that
 block certain connections, even though you don't realize they do? They
 could be preventing Tor from making network connections.</li>
 <li>Are you in China, or behind a restrictive corporate network firewall
 that blocks the public Tor relays? If so, you should learn about <a
-href="<page bridges>">Tor bridges</a>.</li>
-<li>Check your <a href="<wiki>TorFAQ#HowdoIsetuploggingorseeTorslogs">Tor
+href="<page docs/bridges>">Tor bridges</a>.</li>
+<li>Check your <a href="<wikifaq>#HowdoIsetuploggingorseeTorslogs">Tor
 logs</a>. Do they give you any hints about what's going wrong?</li>
 </ol>
 
@@ -773,7 +773,7 @@
 Step two is to confirm that Firefox is correctly configured to send its
 traffic through Tor. Try the <a href="https://check.torproject.org/">Tor
 Check</a> site and see whether it thinks you are using Tor. See <a
-href="<wiki>TorFAQ#HowcanItellifTorisworkingandthatmyconnectionsreallyareanonymizedArethereexternalserversthatwilltestmyconnection">the
+href="<wikifaq>#HowcanItellifTorisworkingandthatmyconnectionsreallyareanonymizedArethereexternalserversthatwilltestmyconnection">the
 Tor Check FAQ entry</a> for details.
 <p>
 
@@ -791,7 +791,7 @@
 installed? If so, uninstall them. (Note that using FoxyProxy is NOT
 a sufficient substitute for Torbutton. There are many known attacks
 against a browser setup that does not include Torbutton. Read more
-in the <a href="<page torbutton/faq>">Torbutton FAQ</a> and the <a
+in the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a> and the <a
 href="https://www.torproject.org/torbutton/design/">Torbutton design</a>
 specification.)</li>
 <li>If your browser says "The proxy server is refusing connections.",
@@ -864,7 +864,7 @@
 but it is different than the saved password in the Tor service.
 <br />
 You need to reconfigure Tor to not be a service. See the FAQ entry on
-<a href="<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice">running Tor as a Windows NT service</a>
+<a href="<wikifaq>#HowdoIrunmyTorrelayasanNTservice">running Tor as a Windows NT service</a>
 for more information on how to remove the Tor service.
 </li>
 </ol>
@@ -908,7 +908,7 @@
     <tt>StrictExitNodes 1</tt> or <tt>StrictEntryNodes 1</tt> 
     &mdash; but if you do, your Tor connections will stop working 
     if all of the nodes you have specified become unreachable. 
-    See the <a href="https://www.torproject.org/documentation.html.en#NeatLinks">Tor status pages</a> 
+    See the <a href="<page docs/documentation>#NeatLinks">Tor status pages</a> 
     for some nodes you might pick.
     </p>
     <p>