[or-cvs] r24190: {website} change links to the #torrc faq entry, fixing two broken link (website/trunk/docs/en)

[Roger Dingledine]

Author: arma
Date: 2011-02-07 08:06:17 +0000 (Mon, 07 Feb 2011)
New Revision: 24190

Modified:
   website/trunk/docs/en/bridges.wml
   website/trunk/docs/en/documentation.wml
   website/trunk/docs/en/faq.wml
   website/trunk/docs/en/tor-doc-relay.wml
   website/trunk/docs/en/tor-hidden-service.wml
Log:
change links to the #torrc faq entry, fixing two broken links in
the process


Modified: website/trunk/docs/en/bridges.wml
===================================================================
--- website/trunk/docs/en/bridges.wml	2011-02-07 07:59:35 UTC (rev 24189)
+++ website/trunk/docs/en/bridges.wml	2011-02-07 08:06:17 UTC (rev 24190)
@@ -153,8 +153,7 @@
     docs/tor-doc-relay>">normal Tor relay</a>, you should
     run a bridge relay. You can configure it either way:
     <ul>
-    <li> manually <a
-    href="<wikifaq>#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit
+    <li> manually <a href="<page docs/faq>#torrc">edit
     your torrc file</a> to be just these four lines:<br>
     <pre><code>
     SocksPort 0

Modified: website/trunk/docs/en/documentation.wml
===================================================================
--- website/trunk/docs/en/documentation.wml	2011-02-07 07:59:35 UTC (rev 24189)
+++ website/trunk/docs/en/documentation.wml	2011-02-07 08:06:17 UTC (rev 24190)
@@ -59,7 +59,7 @@
     
     <li>The <a href="<page docs/tor-manual-dev>">manual</a>
     lists all the possible entries you can put in your <a
-    href="<wikifaq>#Imsupposedtoeditmytorrc.Whatdoesthatmean">torrc
+    href="<page docs/faq>#torrc">torrc
     file</a>. We also provide a <a href="<page docs/tor-manual-dev>">manual for
     the development version of Tor</a>.</li>
     

Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2011-02-07 07:59:35 UTC (rev 24189)
+++ website/trunk/docs/en/faq.wml	2011-02-07 08:06:17 UTC (rev 24190)
@@ -966,8 +966,8 @@
     <p>
     Yes. You can set preferred entry and exit nodes as well as
     inform Tor which nodes you do not want to use.
-    The following options can be added to your config file "torrc"
-    or specified on the command line:
+    The following options can be added to your config file <a
+    href="#torrc">"torrc"</a> or specified on the command line:
     </p>
     <dl>
       <dt><tt>EntryNodes $fingerprint,$fingerprint,...</tt></dt>
@@ -1109,7 +1109,7 @@
 <p>
 If your firewall works by blocking ports, then you can tell Tor to only
 use the ports that your firewall permits by adding "FascistFirewall 1" to
-your <a href="<wikifaq>#Imsupposedtoeditmytorrc.Whatdoesthatmean">torrc
+your <a href="<page docs/faq>#torrc">torrc
 configuration file</a>, or by clicking "My firewall only lets me connect
 to certain ports" in Vidalia's Network Settings window.
 </p>
@@ -1206,7 +1206,7 @@
     the Tor network can't handle the load (e.g. default
     file-sharing ports). You can change your exit policy
     using Vidalia's "Sharing" tab, or by manually editing your
-    <a href="<wikifaq>#torrc">torrc</a>
+    <a href="<page docs/faq>#torrc">torrc</a>
     file. If you want to avoid most if not all abuse potential, set it to
     "reject *:*" (or un-check all the boxes in Vidalia). This setting means
     that your relay will be used for relaying traffic inside the Tor network,
@@ -1271,8 +1271,8 @@
 
 <p>
 If you do decide to run more than one relay, please set the "MyFamily"
-config option in the torrc of each relay, listing all the relays
-(comma-separated) that are under your control:
+config option in the <a href="#torrc">torrc</a> of each relay, listing
+all the relays (comma-separated) that are under your control:
 </p>
 
 <pre>

Modified: website/trunk/docs/en/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/en/tor-doc-relay.wml	2011-02-07 07:59:35 UTC (rev 24189)
+++ website/trunk/docs/en/tor-doc-relay.wml	2011-02-07 08:06:17 UTC (rev 24190)
@@ -59,8 +59,10 @@
 
     <li><strong>Manual Configuration</strong>:
     <ul>
-    <li>Edit the bottom part of <a href="<wikifaq>#torrc">your torrc file</a>. If you want to be a public relay (recommended),
-    make sure to define ORPort and <a href="<page docs/faq>#ExitPolicies">look at ExitPolicy</a>; otherwise
+    <li>Edit the bottom part of <a href="<page docs/faq>#torrc">your
+    torrc file</a>. If you want to be a public relay (recommended),
+    make sure to define ORPort and <a href="<page
+    docs/faq>#ExitPolicies">look at ExitPolicy</a>; otherwise
     if you want to be a <a href="<wikifaq>#RelayOrBridge">bridge</a>
     for users in countries that censor their Internet,
     just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.

Modified: website/trunk/docs/en/tor-hidden-service.wml
===================================================================
--- website/trunk/docs/en/tor-hidden-service.wml	2011-02-07 07:59:35 UTC (rev 24189)
+++ website/trunk/docs/en/tor-hidden-service.wml	2011-02-07 08:06:17 UTC (rev 24190)
@@ -118,7 +118,7 @@
     </p>
     
     <p>First, open your torrc file in your favorite text editor. (See <a
-    href="<wikifaq>#torrc">the
+    href="<page docs/faq>#torrc">the
     torrc FAQ entry</a> to learn what this means.) Go to the middle section and
     look for the line</p>