Browse code

clean up wiki and faq references.

Andrew Lewman authored on08/10/2010 16:54:16
Showing10 changed files
... ...
@@ -114,7 +114,7 @@
114 114
     <h3><a class="anchor" href="#ExitPolicies">How do Tor exit policies work?</a></h3>
115 115
     
116 116
     <p>
117
-    <a href="<page docs/faq>#ExitPolicies">Moved to the new FAQ page</a>
117
+    <a href="<wiki>TorFAQ#ExitPolicies">See the FAQ</a>
118 118
     </p>
119 119
     
120 120
     <a id="HowMuchAbuse"></a>
... ...
@@ -295,7 +295,7 @@
295 295
     not so different from AOL in this respect.</p>
296 296
     
297 297
     <p>Lastly, please remember that Tor relays have <a
298
-    href="<page docs/faq>#ExitPolicies">individual exit policies</a>. Many Tor relays do
298
+    href="<wiki>#ExitPolicies">individual exit policies</a>. Many Tor relays do
299 299
     not allow exiting connections at all. Many of those that do allow some
300 300
     exit connections might already disallow connections to
301 301
     your service. When you go about banning nodes, you should parse the
... ...
@@ -327,7 +327,7 @@
327 327
     
328 328
     <p>
329 329
     Some fans have suggested that we redesign Tor to include a <a
330
-    href="<page docs/faq>#Backdoor">backdoor</a>.
330
+    href="<wikifaq>#Backdoor">backdoor</a>.
331 331
     There are two problems with this idea. First, it technically weakens the
332 332
     system too far. Having a central way to link users to their activities
333 333
     is a gaping hole for all sorts of attackers; and the policy mechanisms
... ...
@@ -60,21 +60,20 @@
60 60
        'url'  => '<wiki>',
61 61
        'txt'  => 'Tor Wiki',
62 62
       }, 
63
-      {'url'  => 'docs/faq',
64
-       'txt'  => 'FAQ',  #maybe stick this in about instead...
65
-       'subelements' => [
66
-          {'url'  => 'docs/faq-abuse',
67
-           'txt'  => 'Abuse FAQ',
68
-          },
69
-          {'url'  => 'docs/trademark-faq',
70
-           'txt'  => 'Trademark FAQ',
71
-          },
72
-          {'url'  => 'eff/tor-legal-faq',
73
-           'txt'  => 'Tor Legal FAQ',
74
-          },
75
-          {'url'  => 'eff/tor-dmca-response',
76
-           'txt'  => 'Tor DMCA Response',
77
-          }]
63
+      {'url'  => '<wikifaq>',
64
+       'txt'  => 'General FAQ',  
65
+      },
66
+      {'url'  => 'docs/faq-abuse',
67
+       'txt'  => 'Abuse FAQ',
68
+      },
69
+      {'url'  => 'docs/trademark-faq',
70
+       'txt'  => 'Trademark FAQ',
71
+      },
72
+      {'url'  => 'eff/tor-legal-faq',
73
+       'txt'  => 'Tor Legal FAQ',
74
+      },
75
+      {'url'  => 'eff/tor-dmca-response',
76
+       'txt'  => 'Tor DMCA Response',
78 77
       },  
79 78
   ];
80 79
 :>
... ...
@@ -84,7 +84,7 @@
84 84
     
85 85
     <p>
86 86
     If you plan to run Firefox on a different computer than Tor, see the <a
87
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">FAQ
87
+    href="<wikifaq>#SocksListenAddress">FAQ
88 88
     entry for running Tor on a different computer</a>.
89 89
     </p>
90 90
     
... ...
@@ -92,14 +92,14 @@
92 92
     point them at Polipo (that is, localhost port 8118). To use SOCKS
93 93
     directly (for instant messaging, Jabber, IRC, etc), you can point
94 94
     your application directly at Tor (localhost port 9050), but see <a
95
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
95
+    href="<wikifaq>#SOCKSAndDNS">this
96 96
     FAQ entry</a> for why this may be dangerous. For applications
97 97
     that support neither SOCKS nor HTTP, take a look at <a
98 98
     href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or
99 99
     <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>
100 100
     
101 101
     <p>For information on how to Torify other applications, check out the
102
-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify
102
+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify
103 103
     HOWTO</a>.
104 104
     </p>
105 105
     
... ...
@@ -115,7 +115,7 @@
115 115
     Tor detector</a>
116 116
     and see whether it thinks you're using Tor or not.
117 117
     (If that site is down, see <a
118
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this
118
+    href="<wikifaq>#IsMyConnectionPrivate">this
119 119
     FAQ entry</a> for more suggestions on how to test your Tor.)
120 120
     </p>
121 121
     
... ...
@@ -124,12 +124,12 @@
124 124
     your local applications to local port 8118 and port 9050. If
125 125
     your firewall blocks outgoing connections, punch a hole so
126 126
     it can connect to at least TCP ports 80 and 443, and then see <a
127
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this
127
+    href="<wikifaq>#FirewalledClient">this
128 128
     FAQ entry</a>.
129 129
     </p>
130 130
     
131 131
     <p>If it's still not working, look at <a
132
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
132
+    href="<wikifaq>#ItDoesntWork">this
133 133
     FAQ entry</a> for hints.</p>
134 134
     
135 135
     <p>
... ...
@@ -153,7 +153,7 @@
153 153
     
154 154
     <p>Having relays in many different places on the Internet is what
155 155
     makes Tor users secure. <a
156
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You
156
+    href="<wikifaq>#RelayAnonymity">You
157 157
     may also get stronger anonymity yourself</a>,
158 158
     since remote sites can't know whether connections originated at your
159 159
     computer or were relayed from others.</p>
... ...
@@ -32,13 +32,12 @@
32 32
     people who run relays, the faster the Tor network will be. If you have
33 33
     at least 20 kilobytes/s each way, please help out Tor by configuring your
34 34
     Tor to be a relay too. We have many features that make Tor relays easy
35
-    and convenient, including <a href="<page docs/faq>#RelayFlexible">rate limiting
35
+    and convenient, including <a href="<wiki>TorFAQ#RelayFlexible">rate limiting
36 36
     for bandwidth, exit policies so you can limit your exposure to abuse
37 37
     complaints, and support for dynamic IP addresses</a>.
38 38
     </p>
39 39
     
40
-    <p>You can run a Tor relay on <a
41
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS">pretty
40
+    <p>You can run a Tor relay on <a href="<wiki>/TorFAQ#RelayOS">pretty
42 41
     much any</a> operating system. Tor relays work best on Linux, OS X Tiger
43 42
     or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later.
44 43
     </p>
... ...
@@ -81,7 +80,10 @@
81 80
     <li>Click <tt>Setup Relaying</tt>.</li>
82 81
     
83 82
     <li>
84
-    	<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="<page docs/faq>#RelayOrBridge">bridge</a> for users in countries that censor their Internet.</dt>
83
+    	<dt>Choose <tt>Relay Traffic for the Tor network</tt> if you
84
+want to be a public relay (recommended), or choose 		<tt>Help
85
+censored users reach the Tor network</tt> if you want to be a <a
86
+href="<wiki>TorFAQ#RelayOrBridge">bridge</a> for users in countries that censor their Internet.</dt>
85 87
     <dd><img alt="vidalia basic settings" src="../img/screenshot-win32-configure-relay-1.png"></dd>
86 88
     </li>
87 89
     
... ...
@@ -98,8 +100,7 @@
98 100
     
99 101
     <li><dt>Choose the <tt>Exit Policies</tt> tab.  If you want to allow others
100 102
     to use your relay for these services, don't change anything.  Un-check
101
-    the services you don't want to allow people to <a href="<page
102
-    docs/faq>#ExitPolicies">reach from your relay</a>.  If you want to be a non-exit relay, un-check all services.</dt>
103
+    the services you don't want to allow people to <a href="<wiki>TorFAQ#ExitPolicies">reach from your relay</a>.  If you want to be a non-exit relay, un-check all services.</dt>
103 104
     <dd><img alt="vidalia exit policies" src="../img/screenshot-win32-configure-relay-3.png"></dd>
104 105
     </li>
105 106
     
... ...
@@ -110,12 +111,9 @@
110 111
     <br />
111 112
     <strong>Manual Configuration</strong>:
112 113
     <ul>
113
-    <li>Edit the bottom part of <a
114
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">your
115
-    torrc file</a>. If you want to be a public relay (recommended),
116
-    make sure to define ORPort and <a href="<page
117
-    docs/faq>#ExitPolicies">look at ExitPolicy</a>; otherwise
118
-    if you want to be a <a href="<page docs/faq>#RelayOrBridge">bridge</a>
114
+    <li>Edit the bottom part of <a href="<wiki>/TorFAQ#torrc">your torrc file</a>. If you want to be a public relay (recommended),
115
+    make sure to define ORPort and <a href="<wiki>TorFAQ#ExitPolicies">look at ExitPolicy</a>; otherwise
116
+    if you want to be a <a href="<wiki>TorFAQ#RelayOrBridge">bridge</a>
119 117
     for users in countries that censor their Internet,
120 118
     just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.
121 119
     </li>
... ...
@@ -132,7 +130,7 @@
132 130
     </li>
133 131
     
134 132
     <li>Restart your relay. If it <a
135
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">logs
133
+    href="<wikifaq>#Logs">logs
136 134
     any warnings</a>, address them.
137 135
     </li>
138 136
     
... ...
@@ -155,7 +153,7 @@
155 153
     try to determine whether the ports you configured are reachable from
156 154
     the outside. This step is usually fast, but may take up to 20
157 155
     minutes. Look for a
158
-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">log
156
+    <a href="<wikifaq>#Logs">log
159 157
     entry</a> like
160 158
     <tt>Self-testing indicates your ORPort is reachable from the outside. Excellent.</tt>
161 159
     If you don't see this message, it means that your relay is not reachable
... ...
@@ -183,13 +181,13 @@
183 181
     
184 182
     <p>
185 183
     6. Read
186
-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/OperationalSecurity">about operational security</a>
184
+    <a href="<wiki>TheOnionRouter/OperationalSecurity">about operational security</a>
187 185
     to get ideas how you can increase the security of your relay.
188 186
     </p>
189 187
     
190 188
     <p>
191 189
     7. If you want to run more than one relay that's great, but please set <a
192
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleRelays">the
190
+    href="<wikifaq>#MultipleRelays">the
193 191
     MyFamily option</a> in all your relays' configuration files.
194 192
     </p>
195 193
     
... ...
@@ -197,7 +195,7 @@
197 195
     8. Decide about rate limiting. Cable modem, DSL, and other users
198 196
     who have asymmetric bandwidth (e.g. more down than up) should
199 197
     rate limit to their slower bandwidth, to avoid congestion. See the <a
200
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth">rate
198
+    href="<wikifaq>#LimitBandwidth">rate
201 199
     limiting FAQ entry</a> for details.
202 200
     </p>
203 201
     
... ...
@@ -206,7 +204,7 @@
206 204
     in your DataDirectory). This is your relay's "identity," and
207 205
     you need to keep it safe so nobody can read the traffic that goes
208 206
     through your relay. This is the critical file to keep if you need to <a
209
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#UpgradeRelay">move
207
+    href="<wikifaq>#UpgradeRelay">move
210 208
     or restore your Tor relay</a> if something goes wrong.
211 209
     </p>
212 210
     
... ...
@@ -231,7 +229,7 @@
231 229
     in their torrc and restart Tor. OS X or Unix relays can't bind
232 230
     directly to these ports (since they don't run as root), so they will
233 231
     need to set up some sort of <a
234
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients">
232
+    href="<wikifaq>#ServerForFirewalledClients">
235 233
     port forwarding</a> so connections can reach their Tor relay. If you are
236 234
     using ports 80 and 443 already but still want to help out, other useful
237 235
     ports are 22, 110, and 143.
... ...
@@ -242,7 +240,7 @@
242 240
     &mdash; such as a public webserver &mdash; make sure that connections to the
243 241
     webserver are allowed from the local host too. You need to allow these
244 242
     connections because Tor clients will detect that your Tor relay is the <a
245
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers">safest
243
+    href="<wikifaq>#ExitEavesdroppers">safest
246 244
     way to reach that webserver</a>, and always build a circuit that ends
247 245
     at your relay. If you don't want to allow the connections, you must
248 246
     explicitly reject them in your exit policy.
... ...
@@ -255,7 +253,7 @@
255 253
     be run as root, so it's good practice to not run it as root. Running
256 254
     as a 'tor' user avoids issues with identd and other services that
257 255
     detect user name. If you're the paranoid sort, feel free to <a
258
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorInChroot">put Tor
256
+    href="<wiki>TheOnionRouter/TorInChroot">put Tor
259 257
     into a chroot jail</a>.)
260 258
     </p>
261 259
     
... ...
@@ -80,7 +80,7 @@
80 80
     </p>
81 81
     
82 82
     <p>If you prefer, you can instead use Privoxy with <a
83
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig">this
83
+    href="<wiki>TheOnionRouter/PrivoxyConfig">this
84 84
     sample Privoxy configuration</a>. But since the config files both use
85 85
     port 8118, you shouldn't run both Polipo and Privoxy at the same time.</p>
86 86
     
... ...
@@ -106,7 +106,7 @@
106 106
     
107 107
     <p>
108 108
     If you plan to run Firefox on a different computer than Tor, see the <a
109
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">
109
+    href="<wikifaq>#SocksListenAddress">
110 110
     FAQ
111 111
     entry for running Tor on a different computer</a>.
112 112
     </p>
... ...
@@ -115,15 +115,15 @@
115 115
     point them at Polipo (that is, localhost port 8118). To use SOCKS
116 116
     directly (for instant messaging, Jabber, IRC, etc), you can point
117 117
     your application directly at Tor (localhost port 9050), but see <a
118
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
118
+    href="<wikifaq>#SOCKSAndDNS">this
119 119
     FAQ entry</a> for why this may be dangerous. For applications
120 120
     that support neither SOCKS nor HTTP, take a look at <a
121 121
     href="http://tsocks.sourceforge.net/">tsocks</a> or <a
122
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat">socat</a>.
122
+    href="<wiki>TheOnionRouter/TorifyHOWTO#socat">socat</a>.
123 123
     </p>
124 124
     
125 125
     <p>For information on how to Torify other applications, check out the
126
-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify
126
+    <a href="<wiki>TheOnionRouter/TorifyHOWTO">Torify
127 127
     HOWTO</a>.
128 128
     </p>
129 129
     
... ...
@@ -141,7 +141,7 @@
141 141
     #<a href="http://ipchicken.com/">this site</a>
142 142
     #to see what IP address it thinks you're using.
143 143
     (If that site is down, see <a
144
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this
144
+    href="<wikifaq>#IsMyConnectionPrivate">this
145 145
     FAQ entry</a> for more suggestions on how to test your Tor.)
146 146
     </p>
147 147
     
... ...
@@ -152,7 +152,7 @@
152 152
     9050). If
153 153
     your firewall blocks outgoing connections, punch a hole so
154 154
     it can connect to at least TCP ports 80 and 443, and then see <a
155
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this
155
+    href="<wikifaq>#FirewalledClient">this
156 156
     FAQ entry</a>.  If your SELinux config is not allowing tor or privoxy to
157 157
     run correctly, create a file named booleans.local in the directory
158 158
     /etc/selinux/targeted.  Edit this file in your favorite text editor and
... ...
@@ -161,7 +161,7 @@
161 161
     </p>
162 162
     
163 163
     <p>If it's still not working, look at <a
164
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
164
+    href="<wikifaq>#ItDoesntWork">this
165 165
     FAQ entry</a> for hints.</p>
166 166
     
167 167
     <hr />
... ...
@@ -180,7 +180,7 @@
180 180
     
181 181
     <p>Having relays in many different places on the Internet is what
182 182
     makes Tor users secure. <a
183
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You
183
+    href="<wikifaq>#RelayAnonymity">You
184 184
     may also get stronger anonymity yourself</a>,
185 185
     since remote sites can't know whether connections originated at your
186 186
     computer or were relayed from others.</p>
... ...
@@ -44,7 +44,7 @@
44 44
     You should fill in "localhost"
45 45
     and "8118" to point the top four protocols to Polipo, as shown here. (Even
46 46
     though Polipo doesn't support FTP and Gopher, <a
47
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy">you
47
+    href="wikifaq#FtpProxy">you
48 48
     should set them up anyway</a>.) You should also fill out the socks proxy entry to point directly to Tor ("localhost", "9050", and socks5)
49 49
     to cover protocols besides the first four. Then click "OK".</p>
50 50
     
... ...
@@ -86,7 +86,7 @@
86 86
     
87 87
     <p>
88 88
     If you plan to run Firefox on a different computer than Tor, see the <a
89
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">FAQ
89
+    href="<wikifaq>#SocksListenAddress">FAQ
90 90
     entry for running Tor on a different computer</a>.
91 91
     </p>
92 92
     
... ...
@@ -94,14 +94,14 @@
94 94
     point them at Polipo (that is, localhost port 8118). To use SOCKS
95 95
     directly (for instant messaging, Jabber, IRC, etc), you can point
96 96
     your application directly at Tor (localhost port 9050), but see <a
97
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
97
+    href="<wikifaq>#SOCKSAndDNS">this
98 98
     FAQ entry</a> for why this may be dangerous. For applications
99 99
     that support neither SOCKS nor HTTP, take a look at SocksCap or
100 100
     <a href="http://www.freecap.ru/eng/">FreeCap</a>.
101 101
     (FreeCap is free software; SocksCap is proprietary.)</p>
102 102
     
103 103
     <p>For information on how to Torify other applications, check out the
104
-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify
104
+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify
105 105
     HOWTO</a>.
106 106
     </p>
107 107
     
... ...
@@ -125,7 +125,7 @@
125 125
     sure that your IP address is being anonymized. Click on <a
126 126
     href="https://check.torproject.org/">the Tor detector</a> and see
127 127
     whether it thinks you're using Tor or not.  (If that site is down, see <a
128
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this
128
+    href="<wikifaq>#IsMyConnectionPrivate">this
129 129
     FAQ entry</a> for more suggestions on how to test your Tor.)
130 130
     </p>
131 131
     
... ...
@@ -134,12 +134,12 @@
134 134
     your local applications to local port 8118 and port 9050. If
135 135
     your firewall blocks outgoing connections, punch a hole so
136 136
     it can connect to at least TCP ports 80 and 443, and then see <a
137
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this
137
+    href="<wikifaq>#FirewalledClient">this
138 138
     FAQ entry</a>.
139 139
     </p>
140 140
     
141 141
     <p>If it's still not working, look at <a
142
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this
142
+    href="<wikifaq>#ItDoesntWork">this
143 143
     FAQ entry</a> for hints.</p>
144 144
     
145 145
     <p>
... ...
@@ -163,7 +163,7 @@
163 163
     
164 164
     <p>Having relays in many different places on the Internet is what
165 165
     makes Tor users secure. <a
166
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You
166
+    href="<wikifaq>#RelayAnonymity">You
167 167
     may also get stronger anonymity yourself</a>,
168 168
     since remote sites can't know whether connections originated at your
169 169
     computer or were relayed from others.</p>
... ...
@@ -59,7 +59,7 @@
59 59
     immediately and your browser pops up an alert saying that
60 60
     "www.duskgytldkxiuqc6.onion could not be found, please check the name and
61 61
     try again" then you haven't configured Tor correctly; see <a
62
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">the
62
+    href="<wikifaq>#ItDoesntWork">the
63 63
     it-doesn't-work FAQ entry</a> for some help.
64 64
     </p>
65 65
     
... ...
@@ -118,7 +118,7 @@
118 118
     </p>
119 119
     
120 120
     <p>First, open your torrc file in your favorite text editor. (See <a
121
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">the
121
+    href="<wikifaq>#torrc">the
122 122
     torrc FAQ entry</a> to learn what this means.) Go to the middle section and
123 123
     look for the line</p>
124 124
     
... ...
@@ -170,7 +170,7 @@
170 170
     your logfiles for hints. It will print some warnings or error messages. That
171 171
     should give you an idea what went wrong. Typically there are typos in the torrc
172 172
     or wrong directory permissions (See <a
173
-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">the
173
+    href="<wikifaq>#Logs">the
174 174
     logging FAQ entry</a> if you don't know how to enable or find your
175 175
     log file.)
176 176
     </p>
... ...
@@ -65,7 +65,7 @@
65 65
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
66 66
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
67 67
           <li><a href="<wiki>">Tor Wiki</a></li>
68
-          <li><a href="<page docs/faq>">FAQ</a></li>
68
+          <li><a href="<wikifaq>">FAQ</a></li>
69 69
         </ul>
70 70
       </div>
71 71
       <!-- END COL -->
... ...
@@ -6,7 +6,8 @@
6 6
 <define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
7 7
 <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>
8 8
 <define-tag svnprojects whitespace=delete>https://svn.torproject.org/svn/projects/</define-tag>
9
-<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/</define-tag>
9
+<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/</define-tag>
10
+<define-tag wikifaq whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ</define-tag>
10 11
 <define-tag blog whitespace=delete>https://blog.torproject.org/</define-tag>
11 12
 <define-tag tbbrepo whitespace=delete>https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:</define-tag>
12 13