[vidalia-svn] r1891: Add some information about the new authentication options to (in trunk: . src/gui/help/content/en)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-27 19:18:25 -0400 (Mon, 27 Aug 2007)
New Revision: 1891

Modified:
   trunk/
   trunk/src/gui/help/content/en/config.html
Log:
 r2100@adrastea:  edmanm | 2007-08-27 19:18:19 -0400
 Add some information about the new authentication options to the help text.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2100] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/gui/help/content/en/config.html
===================================================================
--- trunk/src/gui/help/content/en/config.html	2007-08-27 22:46:44 UTC (rev 1890)
+++ trunk/src/gui/help/content/en/config.html	2007-08-27 23:18:25 UTC (rev 1891)
@@ -69,16 +69,50 @@
 modified by more experienced users.
 </p>
 <ul>
-  <li><b>Control Port</b>:
+  <li><b>Control Address &amp; Port</b>:
     The <i>Control Port</i> is the port which Vidalia uses to talk to Tor.
     This doesn't need to be changed unless you have a conflict with another
-    service on your machine.
+    service on your machine, or if you are using Vidalia to control and
+    monitor a Tor process running on another machine.
   </li>
-  <li><b>Tor Configuration File</b>:
+  <li><b>Control Port Authentication</b>:
+    Control port authentication is used to limit the applications on your
+    machine that can connect to and reconfigure your Tor installation. The
+    available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+        <b>strongly</b> discouraged. Any application or user on your computer
+        can reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you
+        can specify a password that Tor will require each time a user or
+        application connects to Tor's control port. If Vidalia starts Tor for
+        you, you can have Vidalia randomly generate a new password each time
+        it starts Tor by checking the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will
+        write a file (or, <i>cookie</i>) containing random bytes to its data 
+        directory when it starts. Any user or application that tries to
+        connect to Tor's control port must be able to provide the contents of
+        this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>:
     You can use this option to have Vidalia start Tor using a 
-    specific <i>torrc</i>, Tor's configuration file.
+    specific <i>torrc</i>, Tor's configuration file. If you leave this field
+    blank, Tor will uses its own default torrc location.
   </li>
-  <li><b>Permissions</b>:
+  <li><b>Tor Data Directory</b> <i>(optional)</i>:
+    You can specify the directory in which Tor will store its saved data,
+    such as cached Tor server information, Tor server keys, and configuration
+    files. If you leave this field blank, Tor will use its own default data
+    directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>:
     If you enter a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user
     when it starts.
     If you enter a value for <b>Run as Group</b>, Tor will <i>setgid</i> to this