[or-cvs] r22791: {website} add a third common case where you see a vidalia password pro (website/trunk/en)

[Roger Dingledine]

Author: arma
Date: 2010-08-03 18:03:40 +0000 (Tue, 03 Aug 2010)
New Revision: 22791

Modified:
   website/trunk/en/faq.wml
Log:
add a third common case where you see a vidalia password prompt


Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2010-08-03 18:00:34 UTC (rev 22790)
+++ website/trunk/en/faq.wml	2010-08-03 18:03:40 UTC (rev 22791)
@@ -729,11 +729,16 @@
 
 <p>
 Usually this process of generating and setting a random control password
-happens in the background. There are two common situations, though,
+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>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 different.