[vidalia-svn] r2055: Add some small help text blurbs for the new network settings (in trunk: . src/gui/help/content/en)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-21 01:03:42 -0400 (Sun, 21 Oct 2007)
New Revision: 2055

Modified:
   trunk/
   trunk/src/gui/help/content/en/config.html
   trunk/src/gui/help/content/en/contents.xml
   trunk/src/gui/help/content/en/server.html
Log:
 r2171@lysithea:  edmanm | 2007-10-21 01:03:35 -0400
 Add some small help text blurbs for the new network settings page and the
 bridge server option.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2171] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/help/content/en/config.html
===================================================================
--- trunk/src/gui/help/content/en/config.html	2007-10-21 02:43:18 UTC (rev 2054)
+++ trunk/src/gui/help/content/en/config.html	2007-10-21 05:03:42 UTC (rev 2055)
@@ -53,6 +53,52 @@
   </li>
 </ul>
 
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>:
+    If your Internet connection requires an HTTP proxy, you can configure Tor
+    to send all of its directory requests and Tor server connections through
+    your proxy. You must specify at least the hostname or address of your
+    proxy, and the port on which your proxy is listening for connections. If
+    your proxy requires authentication, you can also enter the
+    <i>Username</i> and <i>Password</i> you use to connect to your proxy.
+    Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>:
+    If you are behind a restrictive firewall that limits the ports you are
+    able to connect to, you can configure Tor to connect directly only to
+    servers listening on the ports allowed by your firewall. Simply enter a
+    list of ports permitted by your firewall, separated by commas. (<i>Example:
+    80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>:
+    If your ISP (Internet Service Provider) blocks connections to the Tor
+    network, Tor can attempt to avoid being filtered by encrypting its
+    directory connections and connecting to the Tor network through servers
+    called <i>bridges</i> (Tor 0.2.0.3-alpha or newer only). You can add
+    bridge servers by specifying either their address and port number, or by
+    their address, port number, and fingerprint.<br>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.31.0.34:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+  </li>
+</ul>
+
 <a name="server"/>
 <h3>Server Settings</h3>
 <p>

Modified: trunk/src/gui/help/content/en/contents.xml
===================================================================
--- trunk/src/gui/help/content/en/contents.xml	2007-10-21 02:43:18 UTC (rev 2054)
+++ trunk/src/gui/help/content/en/contents.xml	2007-10-21 05:03:42 UTC (rev 2055)
@@ -39,6 +39,7 @@
   </Topic>
   <Topic id="config" name="Configuring Tor" html="config.html">
     <Topic id="general" name="General Settings" html="config.html" section="general"/>
+    <Topic id="network" name="Network Settings" html="config.html" section="network"/>
     <Topic id="server" name="Server Settings" html="config.html" section="server"/>
     <Topic id="advanced" name="Advanced Settings" html="config.html" section="advanced"/>
   </Topic>

Modified: trunk/src/gui/help/content/en/server.html
===================================================================
--- trunk/src/gui/help/content/en/server.html	2007-10-21 02:43:18 UTC (rev 2054)
+++ trunk/src/gui/help/content/en/server.html	2007-10-21 05:03:42 UTC (rev 2055)
@@ -44,7 +44,14 @@
     systems.
   </li>
   <li>Select the <i>Server</i> configuration page.</li>
-  <li>Check the box labeled <i>Relay traffic for the Tor network</i>.
+  <li>
+    Decide whether you want to run a normal relay server or a <i>bridge</i>
+    server (Tor 0.2.0.3-alpha or newer). Bridge servers help censored Tor users
+    who are blocked from accessing the Tor network directly.
+    Check the box labeled <i>Relay traffic for the Tor network</i> if you want
+    to run a normal relay or <i>Help censored users reach the Tor network</i>
+    if you want to run a bridge server.
+  </li>
   <li>Enter the following information:
     <ul>
       <li><b>Nickname</b>:
@@ -142,5 +149,9 @@
 Your server will allow other Tor users to connect to the Tor network and will
 help relay traffic between other Tor servers.
 </p>
+<p>
+If you chose to run a bridge server, the <i>Exit Policies</i> tab will be
+grayed out, since bridge servers do not allow exit connections.
+</p>
 </html>