diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index 262466e5..ba473f7c 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -45,6 +45,10 @@
     </ul>
 
     <p>Running Tor:</p>
+    <ul>
+    <li><a href="#torrc">I'm supposed to "edit my torrc". What does
+    that mean?</a></li>
+    </ul>
 
     <p>Running a Tor client:</p>
     <ul>
@@ -88,7 +92,7 @@
     relay.</a></li>
     </ul>
 
-    <p>Abuse</p>
+    <p>Abuse:</p>
     <ul>
     <li><a href="#Criminals">Doesn't Tor enable criminals to do bad things?</a></li>
     <li><a href="#RespondISP">How do I respond to my ISP about my exit
@@ -748,6 +752,66 @@ encryption, what data you're sending to the destination.</dd>
 
 <hr>
 
+<a id="torrc"></a>
+<h3><a class="anchor" href="#torrc">I'm supposed to "edit my torrc". What
+does that mean?</a></h3>
+
+<p>
+Tor installs a text file called torrc that contains configuration
+instructions for how your Tor program should behave. The default
+configuration should work fine for most Tor users. Users of Vidalia can
+make common changes through the Vidalia interface &mdash; only advanced
+users should need to modify their torrc file directly.
+</p>
+
+<p>
+The location of your torrc file depends on the way you installed Tor:
+</p>
+
+<ul>
+<li>On Windows, if you installed a Tor bundle with Vidalia, you can
+find your torrc file in the Start menu under Programs -&gt; Vidalia
+Bundle -&gt; Tor, or you can find it by hand in <code>\Documents and
+Settings\<i>username</i>\Application Data\Vidalia\torrc</code>. If you
+installed Tor without Vidalia, you can find your torrc in the Start
+menu under Programs -&gt; Tor, or manually in either <code>\Documents
+and Settings\Application Data\tor\torrc</code> or <code>\Documents and
+Settings\<i>username</i>\Application Data\tor\torrc</code>.
+</li>
+<li>On OS X, if you use Vidalia, edit
+<code>~/.vidalia/torrc</code>. Otherwise, open your favorite text editor
+and load <code>/Library/Tor/torrc</code>.
+</li>
+<li>On Unix, if you installed a pre-built package, look for
+<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your
+package's documentation.
+</li>
+<li>Finally, if you installed from source, you may not have a torrc
+installed yet: look in <code>/usr/local/etc/</code> and note that you
+may need to manually copy <code>torrc.sample</code> to <code>torrc</code>.
+</li>
+</ul>
+
+<p>
+If you use Vidalia, be sure to exit both Tor and Vidalia before you edit
+your torrc file. Otherwise Vidalia might overwrite your changes.
+</p>
+
+<p>
+Once you've changed your torrc, you will need to restart Tor for the
+changes to take effect. (For advanced users on OS X and Unix, note that
+you actually only need to send Tor a HUP signal, not actually restart it.)
+</p>
+
+<p>
+For other configuration options you can use, look at the <a href="<page
+docs/tor-manual>">Tor manual page</a>. Remember, all lines beginning
+with # in torrc are treated as comments and have no effect on Tor's
+configuration.
+</p>
+
+<hr>
+
 <a id="DoesntWork"></a>
 <h3><a class="anchor" href="#DoesntWork">I installed Tor and Polipo but
 it's not working.</a></h3>