tor-webwml.git

@@ -1513,26 +1513,14 @@ configuration should work fine for most Tor users.

 </p>

 <p>

 If you installed Tor Browser Bundle, look for

-<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory. If 

-you installed core Tor, you'll find your torrc file elsewwhere on your system:

-</li>

-<li>On Windows, Tor will put your torrc file 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, 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. If you installed from source, look in 

-<code>/usr/local/etc/tor/torrc</code>.

-</li>

-</ul>

+<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory. 

+</p>

+<p>

+Core tor puts the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package.</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

+Once you've changed your torrc, you will need to restart tor for the

+changes to take effect. (For advanced users, note that

 you actually only need to send Tor a HUP signal, not actually restart

 it.)

 </p>

@@ -3170,8 +3158,8 @@ diversity,

     code. The full design of the Tor Browser can be read <a 

     href="https://www.torproject.org/projects/torbrowser/design/">here</a>. 

     In designing a safe, secure solution for browsing the web with Tor, 

-    we've discovered that configuring <a href="#TBBOtherBrowser">any 

-    browser</a> to use Tor by hand is unsafe.

+    we've discovered that configuring <a href="#TBBOtherBrowser">other 

+    browsers</a> to use Tor is unsafe.

     </p>

     <p>