[tor-commits] [vidalia/alpha] Rephrase the password prompt point

[chiiph at torproject.org]

commit 5b150dd251080a2a93e30a53e4c77d102dde4c3e
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Sun May 8 13:28:39 2011 -0300

    Rephrase the password prompt point
---
 CHANGELOG |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 810f586..eb22e4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,11 +3,12 @@
     is organized in tabs arranged in a common main window. This new tab
     organization will give Vidalia a generic way of organizing the GUI plug-ins
     that will be available in later releases. Ticket #2939.
-  o Change the password prompt to just inform the user of the situation and what
-    are his or her possibilities. The password prompt is more trouble to users
-    than it is of a solution to the problem of getting the right ControlPort
-    password.  So the idea of this new approach is to just inform the user, and
-    try to kill the Tor instance that's causing the issue. Ticket #2132.
+  o Change the password prompt to just inform the user of that there is another
+    Tor running and Vidalia doesn't know the control password, and list what are
+    his or her possibilities. The password prompt is more trouble to users than
+    it is of a solution to the problem.  So the idea of this new approach is to
+    just inform the user, and try to kill the Tor instance that's causing the
+    issue.  Ticket #2132.
   o Add an option for setting up a non-exit relay to the Sharing configuration
     panel. This is meant to clarify what an exit policy and an exit relay are.
     Ticket #2644.