[vidalia-svn] r4366: Steal arma's additional text from http://archives.seul.org/o (vidalia/trunk/src/vidalia/help/content/en)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-08-03 14:21:39 -0400 (Tue, 03 Aug 2010)
New Revision: 4366

Modified:
   vidalia/trunk/src/vidalia/help/content/en/troubleshooting.html
Log:

Steal arma's additional text from
http://archives.seul.org/or/cvs/Aug-2010/msg00052.html


Modified: vidalia/trunk/src/vidalia/help/content/en/troubleshooting.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/en/troubleshooting.html	2010-08-02 20:34:47 UTC (rev 4365)
+++ vidalia/trunk/src/vidalia/help/content/en/troubleshooting.html	2010-08-03 18:21:39 UTC (rev 4366)
@@ -73,12 +73,19 @@
 
 <p>
 Usually this process of generating and setting a random control password
-happens in the background. There are two common situations, though, where
+happens in the background. There are three common situations, though, where
 Vidalia may prompt you for a password:
 </p>
 
 <ul>
   <li>
+    You're already running Vidalia and Tor. For example, this situation
+    can happen if you installed the Vidalia bundle and now you're trying
+    to run the Tor Browser Bundle. In that case, you'll need to close the
+    old Vidalia and Tor before you can run this one.
+  </li>
+
+  <li>
     <p>Vidalia crashed, but left Tor running with the last known random
     password. After you restart Vidalia, it generates a new random password,
     but Vidalia can't talk to Tor, because the random passwords are