Author: arma
Date: 2011-02-07 09:40:23 +0000 (Mon, 07 Feb 2011)
New Revision: 24197
Modified:
website/trunk/docs/en/faq-abuse.wml
website/trunk/docs/en/faq.wml
website/trunk/docs/en/tor-doc-osx.wml
website/trunk/docs/en/tor-doc-relay.wml
website/trunk/docs/en/tor-doc-unix.wml
website/trunk/docs/en/tor-doc-windows.wml
website/trunk/docs/en/tor-hidden-service.wml
Log:
fix the faq anchors that have been migrated already. leave ten or
twenty broken anchors for the old faq.
Modified: website/trunk/docs/en/faq-abuse.wml
===================================================================
--- website/trunk/docs/en/faq-abuse.wml 2011-02-07 09:23:16 UTC (rev 24196)
+++ website/trunk/docs/en/faq-abuse.wml 2011-02-07 09:40:23 UTC (rev 24197)
@@ -114,7 +114,7 @@
<h3><a class="anchor" href="#ExitPolicies">How do Tor exit policies
work?</a></h3>
<p>
- <a href="<wikifaq>#ExitPolicies">See the FAQ</a>
+ <a href="<page docs/faq>#ExitPolicies">See the main FAQ</a>
</p>
<a id="HowMuchAbuse"></a>
@@ -295,7 +295,8 @@
not so different from AOL in this respect.</p>
<p>Lastly, please remember that Tor relays have <a
- href="<wikifaq>#ExitPolicies">individual exit policies</a>. Many Tor
relays do
+ href="<page docs/faq>#ExitPolicies">individual exit policies</a>. Many
+ Tor relays do
not allow exiting connections at all. Many of those that do allow some
exit connections might already disallow connections to
your service. When you go about banning nodes, you should parse the
@@ -327,7 +328,7 @@
<p>
Some fans have suggested that we redesign Tor to include a <a
- href="<wikifaq>#Backdoor">backdoor</a>.
+ href="<page docs/faq>#Backdoor">backdoor</a>.
There are two problems with this idea. First, it technically weakens the
system too far. Having a central way to link users to their activities
is a gaping hole for all sorts of attackers; and the policy mechanisms
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-02-07 09:23:16 UTC (rev 24196)
+++ website/trunk/docs/en/faq.wml 2011-02-07 09:40:23 UTC (rev 24197)
@@ -75,7 +75,7 @@
with abuse issues.</a></li>
<li><a href="#RelayOrBridge">Should I be a normal relay or bridge
relay?</a></li>
- <li><a href="#ManyRelays">I want to run more than one relay.</a></li>
+ <li><a href="#MultipleRelays">I want to run more than one relay.</a></li>
<li><a href="#RelayMemory">Why is my Tor relay using so much
memory?</a></li>
<li><a href="#WhyNotNamed">Why is my Tor relay not named?</a></li>
</ul>
@@ -1300,8 +1300,8 @@
<hr>
-<a id="ManyRelays"></a>
-<h3><a class="anchor" href="#ManyRelays">I want to run more than one
relay.</a></h3>
+<a id="MultipleRelays"></a>
+<h3><a class="anchor" href="#MultipleRelays">I want to run more than one
relay.</a></h3>
<p>
Great. If you want to run several relays to donate more to the network,
Modified: website/trunk/docs/en/tor-doc-osx.wml
===================================================================
--- website/trunk/docs/en/tor-doc-osx.wml 2011-02-07 09:23:16 UTC (rev
24196)
+++ website/trunk/docs/en/tor-doc-osx.wml 2011-02-07 09:40:23 UTC (rev
24197)
@@ -122,7 +122,7 @@
</p>
<p>If it's still not working, look at <a
- href="<wikifaq>#ItDoesntWork">this FAQ entry</a> for hints.</p>
+ href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p>
<p>
Once it's working, learn more about <a href="<page
Modified: website/trunk/docs/en/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/en/tor-doc-relay.wml 2011-02-07 09:23:16 UTC (rev
24196)
+++ website/trunk/docs/en/tor-doc-relay.wml 2011-02-07 09:40:23 UTC (rev
24197)
@@ -63,7 +63,7 @@
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>
+ if you want to be a <a href="<page docs/faq>#RelayOrBridge">bridge</a>
for users in countries that censor their Internet,
just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.
</li>
@@ -83,7 +83,8 @@
<dt>Choose <tt>Relay Traffic for the Tor network</tt> if you
want to be a public relay (recommended), or choose <tt>Help
censored users reach the Tor network</tt> if you want to be a <a
-href="<wikifaq>#RelayOrBridge">bridge</a> for users in countries that censor
their Internet.</dt>
+href="<page docs/faq>#RelayOrBridge">bridge</a> for users in countries
+that censor their Internet.</dt>
<dd><img alt="vidalia basic settings"
src="$(IMGROOT)/screenshot-win32-configure-relay-1.png" /></dd>
</li>
@@ -100,7 +101,9 @@
<li><dt>Choose the <tt>Exit Policies</tt> tab. If you want to allow others
to use your relay for these services, don't change anything. Un-check
- the services you don't want to allow people to <a
href="<wikifaq>#ExitPolicies">reach from your relay</a>. If you want to be a
non-exit relay, un-check all services.</dt>
+ the services you don't want to allow people to <a href="<page
+ docs/faq>#ExitPolicies">reach from your relay</a>. If you want to
+ be a non-exit relay, un-check all services.</dt>
<dd><img alt="vidalia exit policies"
src="$(IMGROOT)/screenshot-win32-configure-relay-3.png" /></dd>
</li>
@@ -173,7 +176,7 @@
<p>
7. If you want to run more than one relay that's great, but please set <a
- href="<wikifaq>#MultipleRelays">the
+ href="<page docs/faq>#MultipleRelays">the
MyFamily option</a> in all your relays' configuration files.
</p>
Modified: website/trunk/docs/en/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/en/tor-doc-unix.wml 2011-02-07 09:23:16 UTC (rev
24196)
+++ website/trunk/docs/en/tor-doc-unix.wml 2011-02-07 09:40:23 UTC (rev
24197)
@@ -161,7 +161,7 @@
</p>
<p>If it's still not working, look at <a
- href="<wikifaq>#ItDoesntWork">this
+ href="<page docs/faq>#DoesntWork">this
FAQ entry</a> for hints.</p>
<hr>
Modified: website/trunk/docs/en/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/en/tor-doc-windows.wml 2011-02-07 09:23:16 UTC (rev
24196)
+++ website/trunk/docs/en/tor-doc-windows.wml 2011-02-07 09:40:23 UTC (rev
24197)
@@ -139,7 +139,7 @@
</p>
<p>If it's still not working, look at <a
- href="<wikifaq>#ItDoesntWork">this
+ href="<page docs/faq>#DoesntWork">this
FAQ entry</a> for hints.</p>
<p>
Modified: website/trunk/docs/en/tor-hidden-service.wml
===================================================================
--- website/trunk/docs/en/tor-hidden-service.wml 2011-02-07 09:23:16 UTC
(rev 24196)
+++ website/trunk/docs/en/tor-hidden-service.wml 2011-02-07 09:40:23 UTC
(rev 24197)
@@ -59,7 +59,7 @@
pops up an alert saying that "www.duskgytldkxiuqc6.onion could not
be found, please check the name and try again" then you haven't
configured Tor correctly; see <a
- href="<wikifaq>#ItDoesntWork">the
+ href="<page docs/faq>#DoesntWork">the
it-doesn't-work FAQ entry</a> for some help.
</p>
