[tor-commits] r26500: {website} Removed references to Vidalia from the torrc entry. (website/trunk/docs/en)

[Matt Pagan]

Author: mttp
Date: 2013-12-20 06:34:06 +0000 (Fri, 20 Dec 2013)
New Revision: 26500

Modified:
   website/trunk/docs/en/faq.wml
Log:
Removed references to Vidalia from the torrc entry.



Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2013-12-20 05:31:32 UTC (rev 26499)
+++ website/trunk/docs/en/faq.wml	2013-12-20 06:34:06 UTC (rev 26500)
@@ -1509,57 +1509,28 @@
 <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 — only advanced
-users should need to modify their torrc file directly.
+configuration should work fine for most Tor users. 
 </p>
 <p>
-Tor Browser Bundle users should edit your torrc through Vidalia. Open
-the
-Vidalia Control Panel. Choose Settings. Choose Advanced. Click the
-button
-labelled "Edit current torrc". Remember to make sure the checkbox for
-"Save Settings." is checked. Hit the Ok button and you are done.
-</p>
-<p>
-Otherwise, you will need to edit the file manually.
-The location of your torrc file depends on the way you installed Tor:
-</p>
-<ul>
-<li>If you installed Tor Browser Bundle, look for
-<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory.
+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, if you installed a Tor bundle with Vidalia, you can
-find your torrc file in the Start menu under Programs -> Vidalia
-Bundle -> 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 -> Tor, or manually in either <code>\Documents
+<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, if you use Vidalia, edit
-<code>~/.vidalia/torrc</code>. Otherwise, open your favorite text editor
+<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.
+package's documentation. If you installed from source, look in 
+<code>/usr/local/etc/tor/torrc</code>.
 </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 manually. 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
@@ -3199,8 +3170,8 @@
     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 any other browser for use with Tor <a 
-    href="#TBBOtherBrowser">is not safe</a>.
+    we've discovered that configuring <a href="#TBBOtherBrowser">any 
+    browser</a> to use Tor by hand is unsafe.
     </p>
 
     <p>