← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2690: [help] Restructure and improve connectivity FAQs

 

------------------------------------------------------------
revno: 2690
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Tue 2011-11-29 18:27:23 +0100
message:
  [help] Restructure and improve connectivity FAQs
added:
  help/faq_unblock.html
renamed:
  help/faq_activemode.html => help/faq_portforward.html
modified:
  help/chat_commands.html
  help/faq_connection.html
  help/faq_mapping.html
  help/faq_nosearch.html
  help/get_started.html
  help/index.html
  help/settings_connectivity_manual.html
  help/window_download_queue.html
  help/window_main.html
  help/window_system_log.html
  help/faq_portforward.html


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'help/chat_commands.html'
--- help/chat_commands.html	2011-04-11 20:39:22 +0000
+++ help/chat_commands.html	2011-11-29 17:27:23 +0000
@@ -23,7 +23,8 @@
   <dd>Toggles visibility of the list of users for the current
 hub.</dd>
   <dt><untranslated>/connection</untranslated></dt>
-  <dd>Displays the IP and ports that DC++ is using for connections with users from the current hub.</dd>
+  <dt><untranslated>/conn</untranslated></dt>
+  <dd>Displays the connectivity status information, auto detected or manually chosen connection mode, IP and ports that DC++ is currently using for connections with all users.</dd>
   <dt><untranslated>/favorite</untranslated></dt>
   <dt><untranslated>/fav</untranslated></dt>
   <dd>Adds the current hub (along with your nickname and password, if

=== modified file 'help/faq_connection.html'
--- help/faq_connection.html	2011-04-11 20:39:22 +0000
+++ help/faq_connection.html	2011-11-29 17:27:23 +0000
@@ -14,25 +14,41 @@
 your incoming connection manually in case of the <a href="settings_connectivity.html">
 automatic detection</a> fails or its result isn't acceptable for you.</p>
 
-<p>Note that correct incoming connection settings are needed for searches and
-downloads to work. These settings have no effect on ability to connecting to hubs
-or downloading hublists. Before you go on with this FAQ make sure that you are
-able to download hublists and connect to hubs. If not then please follow 
-<a href="get_started.html#firewall">this guide</a> instead.</p>
-
-<p>To get the most out of DC++ you should find out what is the best connection
-mode for you. From a protocol perspective, there are two connection methods available:
-<b>active mode</b> and <b>passive mode</b>. While passive mode is almost guaranteed
-to work, it does not work as well as a properly configured active mode connection.
-For a more in-depth explanation, read <a href="faq_whyactive.html">
-Why do I need active mode?</a></p>
+<h2 id="connbasics">Understanding DC++ connectivity</h2>
+
+<p>To make your life easier while using DC++ your connection must be set up correctly.
+In other words your incoming connection type must be correctly chosen for searches and
+downloads to work. The available connection modes depend on the structure of your network
+and the way you access the Internet. From a protocol perspective, there are two connection
+methods available: <b>active mode</b> and <b>passive mode</b>. While passive
+mode is almost guaranteed to work, it does not work as well as a properly
+configured active mode connection. For a more in-depth explanation, read
+<a href="faq_whyactive.html">Why do I need active mode?</a></p>
+
+<p>Note that correct <b>incoming connection settings are needed for searches and file
+downloads</b> to work. These settings <b>have no effect on ability to connecting to hubs
+or downloading hublists</b>. This FAQ assumes that <u>you are able to download hublists
+and connect to hubs</u> as well as other peers can upload files from you. If this is not
+true then you must elminate another kind of problems before go on with this FAQ:
+<ul>
+	<li>Make sure DC++ isn't blocked by any firewall and similar security software. For tips
+	how to workaround this situation and unblock DC++ please follow <a href="faq_unblock.html">
+	this guide</a>.</li>
+	<li>Check that DC++ uses the correct network interface for accessing the Internet, especially
+	if you use multiple Internet connections or any IP tunneling 
+	(<a href="http://en.wikipedia.org/wiki/Virtual_private_network"; target="_blank" class="external">VPN</a>)
+	software. You can specify the correct interface to use with DC++ <a href="settings_connectivity_manual.html#bindaddress">
+	here</a>.</li>
+</ul>
+</p>
+
+<h2>Decide what active mode setting to choose</h2>
 
 <p>It is very important to decide what <i>active connection mode</i> is available
 for you. It depends on your network structure, so you need to know exactly how
 you access the Internet. Is it a direct connection through a modem or do you
 have a local network and access the Internet through a router or other gateway?
-If unsure, <a href="http://www.b.ali.btinternet.co.uk/DCPlusPlus/advancedUsage.html#activepassive"; target="_blank" class="external">this page</a> 
-should help you figure it out. </p>
+If unsure, <a href="http://www.b.ali.btinternet.co.uk/DCPlusPlus/advancedUsage.html#activepassive"; target="_blank" class="external">this page</a> should help you figure it out.</p>
 
 <p>If you're still unsure what network devices you use to connect to the Internet,
 then use <a href="http://www.google.com/"; target="_blank" class="external">Google</a>! It can give you
@@ -59,31 +75,136 @@
 
 <p>To manually configure your connectivity settings, uncheck <a href="settings_connectivity.html">
 Let DC++ determine the best connectivity settings</a> in the Connectivity settings pane of the settings
-dialog. This will enable the whole <a href="settings_connectivity_manual.html#connection">Manual configuration</a>
-group which you can use to alter connectivity settings manually.</p>
+dialog. This will enable the controls on the <a href="settings_connectivity_manual.html#connection">Manual configuration</a>
+pane where you can alter connectivity settings manually.</p>
 
-<p>When you look at the <a href="settings_connectivity.html_manual#connection">Incoming connection settings</a>
+<p>When you look at the <a href="settings_connectivity_manual.html#connection">Incoming connection settings</a>
 you will find 3 options for active mode and the last option for being passive
 as a last resort. For being active:</p>
 
 <ul>
-<li style="margin-left: 10px;">You can use the <i>My computer is directly connected 
-to Internet (no router)</i> option <b>ONLY if you don't have a router/gateway</b>.
-
-</li><li style="margin-left: 10px;">If you <b>have a router/gateway you can use ONLY
-the 2nd or the 3rd option</b> : <i>Use UPnP to let DC++ configure
-my router</i> or <i>Manual port forwarding (I have configured my router by myself)</i></li>
-
-</ul>
-
-<p>For setting up any of the three active mode options follow the <a href="faq_activemode.html">active mode setup FAQ</a>.</p>
+	<li style="margin-left: 10px;">You can use the <i>My computer is directly connected 
+to Internet (no router)</i> option <b>ONLY if you don't have a router/gateway</b>.</li>
+	<li style="margin-left: 10px;">If you <b>have a router/gateway you can use ONLY
+the 2nd or the 3rd option</b> : <i>Let DC++ configure
+my router (NAT-PMP / UPnP)</i> or <i>Manual port forwarding (I have configured my router by myself)</i></li>
+</ul>
+
+<h2>Setting up active mode if you are directly connected (NOT behind a router)</h2>
+
+<ul>
+	<li>	
+      Click on File menu and then Settings. Click on the <a href="settings_connectivity_manual.html">Manual configuration pane</a>.
+	</li>
+	<li>
+	Select the <b>My computer is directly connected to the Internet (no router)</b> radio button. Leave the fields in 
+	the 'External / WAN IP' box blank. This will make DC++ use the current IP assigned to your network card. 
+	You must NOT have an internal IP address for this to work.
+	</li>
+	<li>
+	Leave the transfers and search port fields blank also. This will make DC++ randomize the port it uses each time.
+	</li>
+	<li>
+	Leave the Outgoing Connection settings in the Proxy pane set to Direct Connection.
+	</li>
+	<li>
+	Click OK. This will close the Settings window.
+	</li>
+	<li>
+	Test active mode by joining several hubs and doing a search for a common term. You should get results back. 
+	If not, then you are likely behind a router, have an internal IP address or haven't properly configured your <a href="faq_unblock.html">security software to unblock DC++</a>.
+	</li>
+</ul>
+
+<h2>Setting up active mode if you are behind a router</h2>
+
+<p>If you're behind a router (gateway) then your computer is a <b>member of a separate local network so connections
+coming from the Internet must find their way into your computer</b> that resides in a private network. For successful
+connectivity <b>the router must be set up</b> to open the communication ports DC++ uses and forward 
+the incoming information from the Internet to the correct computer (the one that runs DC++).
+This is called <b>port forwarding</b> or <b>port mapping</b> and it requires configuration in the router device.
+There are ways to do port mapping <i>automatically</i> if your router supports one of the automatic
+port mapping protocols available in DC++. If none of the automatic port mapping ways are supported by the router, 
+the configuration should be done manually to achieve a working active connection mode.</p>
+
+<h3 id="automap">Automatic port mapping configuration</h3>
+
+<p>You can simplify the process of setting up port forwarding if your router supports automatic port mapping protocols 
+such as NAT-PMP or <acronym title="Universal Plug and Play">UPnP</acronym>. For more information, see
+<a href="faq_mapping.html">What is NAT-PMP / UPnP?</a>.</p>
+
+<p>All broadband <acronym title="Small Office, Home Office">SOHO</acronym> routers that manufactured in the recent
+years should support at least UPnP and it should be enabled by default (this may not always true for older models).
+In any case its best to consult the documentation of the device about what port mapping protocol does the router 
+support and how to enable it.</p>
+
+<p>Currently, DC++ includes two different UPnP implementations and support for NAT-PMP as well. If automatic port mapping
+is enabled in the connectivity configuration DC++ will try to map the ports with all the available mapper interfaces until
+a successful attempt. To enable automatic port mapping
+
+<ul>
+	<li>
+	Click on File menu and then Settings. Click on the <a href="settings_connectivity_manual.html">Manual configuration pane</a>.
+	</li>
+	<li>
+	Select the <b>Let DC++ configure my router (NAT-PMP / UPnP)</b> radio button. Leave the fields in the 'External / WAN IP'
+	box blank.
+	</li>
+	<li>
+	Leave the transfers and search port fields blank also. This will make DC++ randomize the port it uses each time.
+	</li>
+	<li>
+	Leave the Outgoing Connection settings in the Proxy pane set to Direct Connection.
+	</li>
+	<li>
+	Click OK. This will close the Settings window.
+	</li>
+	<li>
+	Test active mode by joining several hubs and doing a search for a common term. You should get results back. If not, then 
+	open the <a href="window_system_log.html">System Log</a> window and check the last log messages about the port mapping 
+	attempts and possible errors.
+	</li>
+</ul>
+</p>
+
+<p>Here are some tips if you can't make the automatic port mapping work and unable to figure out what's the problem:
+<ul>
+	<li>Make absolutely sure you have properly configured your <a href="faq_unblock.html">security software to unblock DC++</a></li>
+	<li>When automatic port mapping is selected DC++ tries all the included mapping interfaces one by one, until a 
+		successful result. The default order of the implementations is pre-determined but you can force what mapper
+		DC++ should try first. It's possible that DC++ gets a successful signal from a certain mapping interface 
+		(you see successful port mapping results in the <a href="window_system_log.html">System Log</a> window) but searches
+		and downloads still don't work as the port mapping operation is actually failed. In this case you can 
+		<a href="settings_connectivity_manual.html#prefmap">select another mapping interface to try first</a> in a hope of a
+		better result.</li>
+	<li>Try to <a href="settings_connectivity_manual.html#extip">set your external IP manually</a> (see above how to determine it)
+		especially if you see 'Port mapping: Failed to get external IP' message in the <a href="window_system_log.html">
+		System Log</a> window or wrong IP addess shown if you use the /conn chat command. Don't forget to 
+		<a href="settings_connectivity_manual.html#noipoverride">disallow the automatic IP override</a> in these cases.</li>
+	<li>While the preferred UPnP interface is MiniUPnP, in some cases you may find the legacy Windows UPnP mapper more 
+		successful (eg. if you have an older router model and it worked well with older versions of DC++). In any case it
+		worth a try if the other mappers are failed and you'll find troubleshooting tips for the <u>Windows UPnP only</u> in
+		<a href="http://www.dslreports.com/faq/11043"; target="_blank" class="external">this FAQ</a>.</li>
+</ul>
+</p>
+
+<h3>Manual port mapping configuration</h3>
+
+<p>If you are unable to automate port forwarding with NAT-PMP or UPnP, you can follow the <a href="faq_portforward.html">
+Manual port forwarding FAQ</a> to achieve active connection mode. Note that manual port forwarding is an advanced task
+and it requires a minimal knowledge of computer networking.</p>
+
+<h3>Select passive mode as the last resort</h3>
 
 <p>If none of the above helped or you are not able to use active mode in your
 network (e.g. you have no access to the configuration page of the
 router/gateway or you have firewall service provided by your ISP) then you must
 choose <i>Passive mode (last resort - has serious limitations)</i> option in 
-<a href="settings_connectivity_manual.html">Connection Settings</a>. As linked above,
+<a href="settings_connectivity_manual.html">Connectivity Settings</a>. As linked above,
 however, passive mode has several disadvantages.</p>
 
+<p>If you still unable to search and/or download even in passive mode another possibility is that your ISP is blocking DC 
+(and often other p2p protocols as well). This is also common at universities, at the workplace or other organizations, and 
+is <a href="faq_university.html">the topic of another FAQ</a>.</p>
 </body>
 </html>

=== modified file 'help/faq_mapping.html'
--- help/faq_mapping.html	2011-04-07 13:40:55 +0000
+++ help/faq_mapping.html	2011-11-29 17:27:23 +0000
@@ -14,7 +14,7 @@
 create the required port mappings and gather your external IP address; this allows DC++ to fully
 operate in Active mode.</p>
 <p>If you are unable to have your router support NAT-PMP or UPnP, follow the
-<a href="faq_activemode.html">Manual port forwarding</a> guide for information on how to manually
+<a href="faq_portforward.html">Manual port forwarding</a> guide for information on how to manually
 set up the ports that DC++ needs for its active mode.</p>
 </body>
 </html>

=== modified file 'help/faq_nosearch.html'
--- help/faq_nosearch.html	2011-04-07 13:40:55 +0000
+++ help/faq_nosearch.html	2011-11-29 17:27:23 +0000
@@ -17,7 +17,7 @@
   <li>If you are in passive connection mode some hubs may won't allow
    you to search as it stresses the hub a lot. Try to set up active
    mode following the
-   <a href="get_started.html#connection">Connection setup guide</a>.</li> 	
+   <a href="faq_connection.html">Connection setup guide</a>.</li>
   <li>Some hubs allow searches for registered users only. 
    Check login messages, banners, hub addresses or ask an operator how
    to register yourself.</li> 	
@@ -44,7 +44,7 @@
  title="Transmission Control Protocol">TCP</acronym> and <acronym
  title="User Datagram Protocol">UDP</acronym> traffic. If you can
 download, but not search, UDP is blocked. Please read the 
-<a href="get_started.html#connection">Connection setup guide</a>.</li>
+<a href="faq_connection.html">Connection setup guide</a>.</li>
   <li>Your school or work might be blocking DC traffic. Read the FAQ on
 types of blocks, and what you <a href="faq_university.html">might be
 able to do about it</a>.</li>
@@ -53,7 +53,8 @@
   <li>
 If you still can't search (in passive mode) then probably your DC++
 blocked by a software firewall. Please follow the 
-<a href="get_started.html#firewall">Firewall settings guide</a>. </li>
+<a href="faq_unblock.html">guide how to unblock DC++ in firewalls and 
+other types of security sofware</a>. </li>
 <li>
 An anti-flood protector software / network device can (partially)
 block your searches as well. You can suspect that you have a problem 

=== renamed file 'help/faq_activemode.html' => 'help/faq_portforward.html'
--- help/faq_activemode.html	2011-04-11 20:39:22 +0000
+++ help/faq_portforward.html	2011-11-29 17:27:23 +0000
@@ -6,62 +6,55 @@
   <link type="text/css" rel="stylesheet" href="style.css"/>
 </head>
 <body>
-<h1>Setting up active mode</h1>
-<p>For DC++ to work properly in active mode, it requires access on <acronym
- title="Transmission Control Protocol">TCP</acronym> and <acronym
- title="User Datagram Protocol">UDP</acronym> listening ports, as well
-as outgoing access on all ports for both TCP and UDP.</p>
-
-<h2>If you are NOT behind a router:</h2>
+<h1>How to set up manual port forwarding?</h1>
+
+<p>In most cases DC++ should be able to automatically detect the appropriate
+connection method for the user, however, there can still be cases when there are no
+ways to map the port automatically so a manual configuration required to achieve
+active mode. This FAQ gives detailed information how to set up port forwarding
+manually in case of the <a href="settings_connectivity.html">
+automatic connectivity setup</a> fails or you have gateway devices without 
+<a href="faq_mapping.html">automatic port mapping</a> support.</p>
+
+<p>This FAQ assumes that
 <ul>
-	<li>	
-      Click on File menu and then Settings. Click on <a href="settings_connectivity_manual.html">Connection Settings</a>.
-	</li>	
-	<li>	
-      Select the <b>My computer is directly connected to the Internet (no router)</b> radio button.  Leave the IP fields blank. This will make DC++ use the current IP assigned to your network card. You must NOT have an internal IP address for this to work. 
-	</li>	
-	<li>	
-      Leave the TCP/UDP/TLS ports blank also. This will make DC++ randomize the port it uses each time.
-	</li>	
-	<li>	
-      Leave the Outgoing Connection settings set to Direct Connection. Click OK.  
-	</li>	
-	<li>	
-      You may need to allow DC++ in your <a href="#firewall">built-in</a> or third party made <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">software firewall</a>. Consult its documentation on how to do this.
-	</li>	
-	<li>	
-      Test active mode by joining several hubs and doing a search for a common term. You should get results back. If not, then you are likely behind a router, have an internal IP address or haven't properly configured your <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">software firewall</a>.
-	</li>	
+	<li>You're familiar with <a href="faq_connection.html#connbasics">DC++ connectivity concepts</a></li>
+	<li>You already tried the <a href="faq_connection.html#automap">automatic ways of port mapping</a> 
+	without success (or you are certain that you don't have supporting devices in your network)</li>
+	<li>You have basic understanding of computer networking</li>
+	<li>You have proper access to the configuration layout of your gateway (router) device</li>
 </ul>
-
-<h2>If you are behind a router:</h2>
-
-<p>You can simplify the process of setting up active mode if your router supports NAT-PMP or
-<acronym title="Universal Plug and Play">UPnP</acronym>. For more information, see
-<a href="faq_upnp.html">What is NAT-PMP / UPnP?</a>. If you are unable to automate port forwarding
-with NAT-PMP or UPnP, follow the steps below.</p>
-
-<p>The second option for using active mode behind a router or a gateway is to <i>set up port forwarding manually</i>.
-For an in-depth, but still easy to understand explanation of port forwarding, read 
+</p>
+
+<p>For DC++ to work properly in active mode, it requires access on <acronym title="Transmission Control Protocol">
+TCP</acronym> and <acronym title="User Datagram Protocol">UDP</acronym> listening ports, as well as outgoing access
+on all ports for both TCP and UDP. If you are in a private network behind a NAT device the incoming information
+to the listening ports should be forwarded to the proper computer.</p>
+
+<p>For an in-depth, but still easy to understand explanation of port forwarding, read 
 <a href="http://portforward.com/help/portforwarding.htm"; target="_blank" class="external">What is Port Forwarding?</a>
-The following steps describe the configuration of port forwarding in general. Later you will find links to get configuration information specific to your own router device.</p>
+The following steps describe the configuration of port forwarding in general as the exact configuration method
+and layout varies in the different type of gateway devies.</p>
+
 <ol>
   <li>First you need to set up the router to forward the connections to
 the computer with DC++. This is could be called Port mapping, port
 redirecting, port forwarding or something like that in your router configuration. 
 Find out how to do this with your router / <acronym title="Network Address Translation">NAT</acronym>
 in the user manual came with your device.</li>
-  <li>You need to forward a port for both TCP and UDP protocols. You can use the same port number for both protocol type
-or different ones for each. Select one or two numbers between 1024 - 65535, they should mostly all be free. 
-Make sure you select the corresponding protocol types (TCP, UDP or Both) when you create port forwarding rule(s).
-</li>
+  <li>You need to forward three ports: 2 ports for transfers and encrypted transfers (both use TCP protocol) and
+one port for searches what uses the UDP protocol. You can use the same port number for transfers and searches,
+but <b>you need a different one for the encrypted transfers</b>. Of course you can choose different port numbers
+for each as well. So select two or three numbers between 1024 - 65535, they should mostly all be free. 
+Make sure you <b>select the correct protocol types</b> (TCP, UDP or Both) for each port number when you cerate the 
+port forwarding rules in the gateway's config interface.</li>
   <li>The IP that you are forwarding to should be the <b>internal</b> IP address of your computer running DC++.
  It usually begins with <a href="non-routable.html">"192.168",
 "172.16." or "10.x."</a>. To see your internal IP address go to the command prompt and type:
 <i>ipconfig</i> (Start Menu -&gt; Run
 -&gt; <i>cmd /k ipconfig</i>)</li>
   <li>When you have mapped the port(s) on the router, open up DC++ and
-go to <a href="settings_connectivity_manual.html#connection">Incoming connection settings</a>. 
+go to <a href="settings_connectivity_manual.html#connection">Manual configuration settings</a>.
 Select <b>Manual port forwarding (I have configured my router by myself)</b>. In the port fields, enter the port
 number(s) that you forwarded on the router. </li>
   <li>In the External / WAN IP field, you need to enter the <b>external</b> IP address of your router.
@@ -71,17 +64,25 @@
  href="http://whatismyip.com"; target="_blank" class="external">WhatIsMyIP.com</a>. </li>
   <li>Active mode should now be working. For checking or troubleshooting if you have properly
   	 forwarded the port(s) to DC++, use <a
- href="http://www.canyouseeme.org"; target="_blank" class="external">www.canyouseeme.org</a>. Make sure DC++ is open. Then, from the site, enter in the port you're forwarding and click Check. If everything has been properly set up, the site should say Success. If you get an error message in red, then you need to double-check the port forwarding on the router, DC++ settings and possibly your <a href="#firewall">built-in</a> or <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">3rd party software firewall</a> settings.</li>
+ href="http://www.canyouseeme.org"; target="_blank" class="external">www.canyouseeme.org</a>. Make sure DC++ is open. Then, in the site, enter the port you're forwarded and click Check. If everything has been properly set up, the site should say Success. If you get an error message in red, then you need to double-check the port forwarding on the router, DC++ settings and possibly your <a href="faq_unblock.html">built-in or 3rd party software firewall</a> settings.</li>
 </ol>
-<p>You may find detailed how-to guides with screen shots for various router models at <a
- href="http://www.portforward.com/routers.htm"; target="_blank" class="external">www.portforward.com</a>. There is a huge list of models there, click on your model name,
+
+<p><u>TIP:</u>Before you fill out the required settings it may worth to check if DC++ is able to automatically detect
+some of the required parameters. To do this, go to the Connectivity pane in the Settings, enable <a href="settings_connectivity.html">
+automatic connectivity detection</a>, click 'Detect Now' and when the detection is finished click 'Edit detected settings'.
+Depending on the results this way you may speed up setting up manual port forwarding if DC++ is able to detect any subset of
+the required settings.</p>
+
+<h2>Troubleshooting</h2>
+
+<p>If you have problems finding the correct port forwarding settings in your gateway setup you may get detailed help, how-to guide and screen shots for various router models at <a href="http://www.portforward.com/routers.htm"; target="_blank" class="external">www.portforward.com</a>. There is a huge list of models there, click on your model name,
  then select DC++ from the list of applications. An interactive guide will appear to help you how 
  to access your router's configuration page and how to set up port forwarding for DC++. 
  You can find some more how-to's for popular router models at the <a href="http://www.dslreports.com/faq/dc/3.2_Hardware_Firewalls___Routers"; target="_blank" class="external">DSLReport FAQ page</a> as well.
 </p>
+
 <p>If active mode is working for a while, but <u>the next time when you use DC++</u>, you only get <i>Connection Timeout</i>s or no
-results when searching, your IP (either <b>external</b> or <b>internal</b>) is likely to have changed. Of course you can update your IP settings manually each time 
- they changed, but there are better solutions to avoid constant IP address updates:
+results when searching, your IP (either <b>external</b> or <b>internal</b>) is likely to have changed. Of course you can update your IP settings manually each time they changed, but there are better solutions to avoid constant IP address updates:
 </p> 
 <ul>
 	<li>
@@ -92,41 +93,11 @@
  class="external">Dynip</a>  or <a
  href="http://www.dyndns.org/"; target="_blank" class="external">DynDns</a>
     and put your dynamic DNS address into the External / WAN IP field in DC++ <a href="settings_connectivity_manual.html#connection">Connection Settings</a>. Each DDNS provider has a downloadable IP updater software what updates the dynamic name service with your latest IP. Make sure you download, configure and  run this program while using DC++. Many router models have DDNS client software included for specific DDNS provider(s) so it worth a check in your router configurations before choosing a provider. After you setup the built-in DDNS client you won't need to run any IP updater software, your router will automatically take care of updating your DNS name.</li>
-	<li>
-If you find that your internal IP changes when you restart your computer then your operating system is obtaining an IP address from your router at boot using <a href="http://www.portforward.com/networking/dhcp.htm"; target="_blank" class="external">DHCP protocol</a>. If you want your computer to always have the same internal IP address you must setup Static DHCP in your router configuration. Static DHCP is a useful feature which makes your router always assign the same IP address to a specific computer on your network. You will have to <a href="http://www.dur.ac.uk/its/services/network/lan/mac/windows/"; target="_blank" class="external">find MAC address of your network card</a> to set up Static DHCP.<br/>
-Another option to ensure you'll always have the same internal IP address is to set up static IP address for your computer. Here's a <a href="http://www.portforward.com/networking/staticip.htm"; target="_blank" class="external">FAQ</a> how to do this for different versions of Windows.
-    </li>
-</ul>    
-<p>Besides normal file transfers DC++ is capable of <a href="settings_certs.html">secure</a> (<a href="http://en.wikipedia.org/wiki/Secure_Sockets_Layer"; target="_blank" class="external">SSL encrypted</a>) way of receiving and transmitting files on ADC hubs. If you plan (or required) to use this feature and you <i>use DC++ in active mode with manual port forwarding</i> you should forward one more port for SSL handshake. You must choose and forward another free port between 1024 - 65535 for TLS which is <b>different than the one(s) you use for TCP and UDP</b>. In the port forwarding rule you should set the protocol type to <b>TCP or Both</b> for the TLS port. Finally you must put the port number to the TLS field in <a href="settings_connectivity_manual.html#connection">Incoming connections settings</a> to be able to download from users who have secure transfers enabled.</p>
-	
-
-<h2 id="firewall">Troubleshooting Windows built-in firewall</h2>
-<p>The firewall component included in recent Windows operating systems is enabled by default. While it does not offer a plethora of options, its suitable to use by itself for protection. If its enabled and you have problems accessing the Internet with DC++ the best practice is to check for and delete existing exception(s) for DC++ then let the operating system properly readd it at next start of DC++ application. To do this, close DC++ and
-<ul> 
-  <li><u>in Windows XP Service Pack 2 & 3 or Windows Vista</u>:
-go to Control Panel -&gt; Windows Firewall -&gt; Exceptions Tab. Select DC++ and click Delete.
-  </li>
-  <li><u>in Windows 7</u>:
-go to Control Panel -&gt; Windows Firewall -&gt; Allow a program or feature through Windows Firewall. Select DC++ and click Remove.
-  </li>
-</ul>
-Start DC++ again and if a firewall popup window appears asking permission for DC++, click Allow.
-</p>
-<p>If the above doesn't help its wise to enable logging of packets that the firewall drops for troubleshooting DC++ (or any other applications') access. To do this,
-<ul>
-  <li><u>in Windows XP (Service Pack 2 or 3)</u>:
-go to Control Panel -&gt; Windows Firewall -&gt; Advanced Tab -&gt; Security Logging -&gt; Settings. Enable <i>Log
-Dropped Packets</i>. The log file is located at: C:\WINDOWS\pfirewall.log</li>
-  <li><u>in Windows Vista</u>:
-you can find the firewall logging properties at Start Menu -&gt; All Programs -&gt; Administrative Tools -&gt; Windows Firewall with Advanced Security -&gt; Windows Firewall Properties -&gt; Profile tabs -&gt; Customize button under the Logging section under each of the profile tabs. You can also specify the path of the log file there.</li>
-  <li><u>in Windows 7</u>:
-go to Control Panel -&gt; Windows Firewall -&gt; Advanced Settings -&gt; Monitoring -&gt; Firewall. You can browse the firewall events here in great detail.</li>
-</ul>
-</p>
-<p>
-Here's a complete guide of <a
- href="http://www.microsoft.com/technet/security/smallbusiness/prodtech/windowsxp/cfgfwall.mspx";
- target="_blank" class="external">How to Configure Windows Firewall on Windows XP SP2 & SP3</a> which seems to be largely apply to Windows Vista as well.
-</p>
+	<li>If you find that your internal IP changes when you restart your computer then your operating system is obtaining an IP address from your router at boot using <a href="http://www.portforward.com/networking/dhcp.htm"; target="_blank" class="external">DHCP protocol</a>. If you want your computer to always have the same internal IP address you must setup Static DHCP in your router configuration. Static DHCP is a useful feature which makes your router always assign the same IP address to a specific computer on your network. You will have to <a href="http://www.dur.ac.uk/its/services/network/lan/mac/windows/"; target="_blank" class="external">find MAC address of your network card</a> to set up Static DHCP.<br/>
+	Another option to ensure you'll always have the same internal IP address is to set up static IP address for your computer. Here's a <a href="http://www.portforward.com/networking/staticip.htm"; target="_blank" class="external">FAQ</a> how to do this for different versions of Windows.</li>
+</ul>
+
+<p>Besides normal file transfers DC++ is capable of <a href="settings_certs.html">secure</a> (<a href="http://en.wikipedia.org/wiki/Secure_Sockets_Layer"; target="_blank" class="external">SSL encrypted</a>) way of receiving and transmitting files on ADC hubs. If you're able to download in NMDC hubs but not in ADC ones then most probably you have a problem with the secure transfer port. You should check if the secure transfer port is forwarded correctly to be able to download from ADC users who have secure transfers enabled.</p>
+
 </body>
 </html>

=== added file 'help/faq_unblock.html'
--- help/faq_unblock.html	1970-01-01 00:00:00 +0000
+++ help/faq_unblock.html	2011-11-29 17:27:23 +0000
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link type="text/css" rel="stylesheet" href="office11.css"/>
+<link type="text/css" rel="stylesheet" href="style.css"/>
+</head>
+<body>
+
+<h1>How to unblock DC++ in firewalls and other installed security software?</h1>
+
+<p>Under Windows, using security software and certain operating system features to prevent the computer
+from various attacks and security hazards is a common and highly recommended 
+practice. However, any misconfigured security feature can cause cause problems using DC++
+ranging from partial feature blocking to a complety blocked network access.
+If you experience connection problems (can't connect to <b>any</b> hub or download <b>any</b> hublist,
+file transfers aren't possible in any direction, <b>neither downloads nor uploads</b>) 
+<u>while your other installed programs are able to access the Internet without problems</u> 
+then it's possible that something blocks DC++.</p>
+
+<p>Whether it is the operating system's built-in firewall or any installed 3rd party security
+software that keeps DC++ from work, you must find out why's the blocking and how to unblock DC++.</p>
+
+<h2>Signs of blocking</h2>
+<p>You might suspect that DC++ is blocked if you experience any combination of the following:</p>
+<ul>
+	<li>you are unable to connect to any hub</li>
+	<li>you can't download any hublist</li>
+	<li>no file transfers (neither uploads nor downloads)</li>
+	<li>weird messages at start complaining about unable to open ports</li>
+	<li>cannot start DC++ itself at all</li>
+</ul>
+
+<p>Another way to check if DC++ is blocked is to go the Help/About menu in
+DC++ and check if it can download the Latest Version number (bottom box of the
+window). A version number should appear in the box soon. If you get error
+message instead it means something is preventing DC++ from accessing the
+Internet.</p>
+
+<p><u>Important:</u> If you have problems with <b>searches and/or file downloads only</b>, 
+while uploads and other functions are working properly then most likely the problem is with
+the <a href="settings_connectivity.html">connectivity settings</a> instead. While it does not
+hurt to go on with this FAQ and check if DC++ is properly allowed in various places, if the 
+case above applies to you, you may solve the problem sooner if you follow the
+<a href="faq_connection.html">Connection setup guide</a> instead.</p>
+
+<h2>What OS components or software can block DC++?</h2>
+<ul>
+	<li>Windows internal firewall</li>
+	<li>3rd party firewall software</li>
+	<li>Anti-virus software</li>
+	<li>Anti-spyware software</li>
+	<li>Security suites with features combined of the above</li>
+</ul>
+
+<h2>Troubleshooting Windows built-in firewall</h2>
+
+<p>The firewall component included in recent Windows operating systems is enabled by default. While it does not offer a plethora of options, its suitable to use by itself for protection. If it's enabled and you have problems accessing the Internet with DC++ the best practice is to check for and delete existing exception(s) for DC++ then let the operating system properly readd it at next start of the DC++ application. To do this, close DC++ and
+<ul> 
+  <li><u>in Windows XP Service Pack 2 & 3 or Windows Vista</u>:
+go to Control Panel -&gt; Windows Firewall -&gt; Exceptions Tab. Select DC++ and click Delete.
+  </li>
+  <li><u>in Windows 7</u>:
+go to Control Panel -&gt; Windows Firewall -&gt; Allow a program or feature through Windows Firewall. Select DC++ and click Remove.
+  </li>
+</ul>
+Start DC++ again and if a firewall popup window appears asking permission for DC++, click Allow.
+</p>
+
+<p>If the above doesn't help its wise to enable logging of packets that the firewall drops for troubleshooting DC++ (or any other applications') access. To do this,
+<ul>
+  <li><u>in Windows XP (Service Pack 2 or 3)</u>:
+go to Control Panel -&gt; Windows Firewall -&gt; Advanced Tab -&gt; Security Logging -&gt; Settings. Enable <i>Log
+Dropped Packets</i>. The log file is located at: C:\WINDOWS\pfirewall.log</li>
+  <li><u>in Windows Vista</u>:
+you can find the firewall logging properties at Start Menu -&gt; All Programs -&gt; Administrative Tools -&gt; Windows Firewall with Advanced Security -&gt; Windows Firewall Properties -&gt; Profile tabs -&gt; Customize button under the Logging section under each of the profile tabs. You can also specify the path of the log file there.</li>
+  <li><u>in Windows 7</u>:
+go to Control Panel -&gt; Windows Firewall -&gt; Advanced Settings -&gt; Monitoring -&gt; Firewall. You can browse the firewall events here in great detail.</li>
+</ul>
+</p>
+
+<p>
+Here's a complete guide of <a
+ href="http://www.microsoft.com/technet/security/smallbusiness/prodtech/windowsxp/cfgfwall.mspx";
+ target="_blank" class="external">How to Configure Windows Firewall on Windows XP SP2 & SP3</a> which seems to be largely apply to Windows Vista as well.
+</p>
+
+<h2>Unblock DC++ in various 3rd party security software</h2>
+
+<p>The method for unblocking programs in 3rd party security software varies from product to product.
+Check the program's help or manual for proper instructions. The best general practice is to
+exit DC++ and remove ALL the rules for DC++ in the appropriate configuration place of your 
+security software. If you run a complete security suite you may have to unblock DC++ in more parts
+of the application (eg. in the firewall part and the application control part).</p>
+
+<p>After deleting the rules restart DC++. In most cases you'll be shown a popup window or a taskbar
+alert from the security software where you can properly enable (make an exception rule for) DC++.</p>
+
+<p>Some additional tips:
+<ul>
+	<li>Almost all anti-virus suites (Norton 360, McAfee, CA, Eset, Kaspersky, F-Secure, AVG, etc.) include a firewall
+component with their "typical" install method. Because of this, you can still have a firewall running even if you've 
+never installed a separate firewall product or seen a sign of its operation.</li>
+
+	<li>If you use a third party software firewall or securty suite then make 
+sure you have the <a href="http://support.microsoft.com/kb/283673"; target="_blank" class="external">internal Windows firewall disabled</a>. 
+On Vista and Windows 7 this should be more likely done by your 3rd party firewall application automatically.</li>
+
+	<li>You can find configuration instructions for some popular firewall software <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">here</a>.</li>
+</ul>
+</p>
+
+</body>
+</html>

=== modified file 'help/get_started.html'
--- help/get_started.html	2011-04-11 20:39:22 +0000
+++ help/get_started.html	2011-11-29 17:27:23 +0000
@@ -16,7 +16,7 @@
 file sharing using a protocol called <a href="http://adc.sourceforge.net/"; target="_blank" class="external">Advanced Direct Connect (ADC)</a>.</p> 
 
 <p>The newest version of DC++ should work well on any officially supported Windows
-client operating system, including XP SP3, Vista SP1 and Windows 7. Some older 
+client operating system, including XP SP3, Vista SP2 and Windows 7. Some older 
 versions will run on Windows 2000 or Win9x/ME but using DC++ on these old, discontinued
 and vulnerable operating systems is neither recommended nor supported. 
 As long as it downloaded from the <a href="http://dcplusplus.sourceforge.net/"; target="_blank" class="external">official site</a>,
@@ -77,70 +77,46 @@
 
 <h2>Basic settings and usage</h2>
 
-<p><a href="http://dcplusplus.sourceforge.net/tutorial.html#settings"; target="_blank" class="external">The DC++ Quick Start Tutorial</a> is an easy to understand guide to newcomers. It contains plenty of screenshots and 
-explains basic DC++ usage and the minimum settings required to get things up
-and running. Make sure you gone through the guide and configured all the minimum 
-required settings (eg. entered a unique nick in <a href="settings_general.html">General settings</a>, etc...) or
-you won't be able to connect to any hub.</p>
-
-<h2 id="firewall">Checking software firewall settings</h2>
-
-<p>Software firewalls often cause problems as they can completely prevent DC++
-from connecting to the Internet. You can skip this section if you can download
-hublists and connect to hubs. However, if you can't connect to any hub or
-download any hublist <u>while your other programs are able to access the
-Internet</u> then it's possible that a software firewall is blocking DC++.
-</p>
-
-<p>All officially supported Windows operating systems (XP with Service Pack 3, Vista and Windows 7) have
-a built in firewall enabled by default. Moreover, almost all anti-virus suites
-(Norton, McAfee, CA, Eset, Kaspersky, F-Secure, AVG, etc.) include a firewall
-component with their "typical" install method. Because of this, you can still
-have a firewall running even if you've never installed a separate firewall
-product or seen a sign of its operation.</p>
-
-<p>If you use Windows XP with third party software firewall installed then make 
-sure you have the <a href="http://support.microsoft.com/kb/283673"; target="_blank" class="external">internal Windows firewall disabled</a>. 
-On Vista and Windows 7 this should be automatically done by your 3rd party firewall application.
-</p>
-
-<p>The easiest way to check if DC++ is blocked is to go the Help/About menu in
-DC++ and check if it can download the Latest Version number (bottom box of the
-window). A version number should appear in the box soon. If you get error
-message instead it means something is preventing DC++ from accessing the
-Internet.</p>
-
-<p><a href="faq_activemode.html#firewall">Here are some tips</a> how to try to unblock DC++ in the built-in Windows firewall.</p>
-
-<p>The method for unblocking programs in 3rd party firewalls varies from product to product.
-Check your firewall's help or manual for instructions. The best general practice is to
-exit DC++ and remove ALL the rules for DC++ in the firewall configuration. In
-most cases the time of next start of DC++ you'll be shown a popup window where
-you can re-enable DC++. You can find configuration instructions for some
-popular firewall software <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">here</a>.</p>
-
-<h2 id="connection">Setting up your connection</h2>
-
-<p>To make your life easier while using DC++ your connection must be set up correctly.
-In other words your incoming connection type must be correctly chosen for searches and
-downloads to work. The available connection modes depend on the structure of your network
-and the way you access the Internet. From a protocol perspective, there are two connection
-methods available: <b>active mode</b> and <b>passive mode</b>. While passive
-mode is almost guaranteed to work, it does not work as well as a properly
-configured active mode connection. For a more in-depth explanation, read
-<a href="faq_whyactive.html">Why do I need active mode?</a></p>
-
-<p>In most cases DC++ should be able to configure connectivity settings on your behalf, provided
-the <a href="settings_connectivity.html">Automatic connectivity setup</a> feature is enabled.
-If you able to search and download from the users of the hubs you are connected to, then
-you're done.</p>
-
-<p>If searches and/or downloads are not working, make sure that the <a href="settings_connectivity.html">
-Let DC++ determine the best connectivity settings</a> option is enabled. If it doesn't help
-(or it forces you into passive mode and you want to improve your connectivity) then follow
-<a href="faq_connection.html">the FAQ that explains how to manually configure connectivity settings.</a></p>
-
-<h2>Help resources</h2>
+<p><a href="http://dcplusplus.sourceforge.net/tutorial.html#settings"; target="_blank" class="external">The DC++ Quick Start Tutorial</a> is an easy to understand guide to newcomers. It contains plenty of screenshots as well as
+a video tutorial that explains basic DC++ usage and the minimum settings required to 
+get things up and running. Make sure you gone through the tutorial and configured all
+the minimum required settings (eg. entered a unique nick in <a href="settings_general.html">General settings</a>, etc...)
+or you won't be able to connect to any hub.</p>
+
+<p>In most cases, after concluding this basic setup you must be able to connect to hubs,
+search for files and download from any user. If you don't experience any issues then 
+you can entirely <a href="#morehelp">skip the next section</a>.</p>
+
+<h2>Troubleshooting connectivity problems</h2>
+
+<p>If you experience any connectivity problems after the required basic setup
+(eg. not able to connect to any hub, no search results, downloads don't start) then you 
+may need to do some additional configuration. Beside some less frequent issues in most 
+cases the possible source of the connectivity issues can be narrowed down to reasons:</p>
+
+<ul>
+	<li><p><u>DC++ itself or its access to the Internet is blocked by some security software</u>.
+	Typical sympthoms of this problem are that you cannot connect to hubs and unable to download
+	hublists or you cannot start DC++ itself at all.</p>
+	<p>In this case you have to allow (unblock) DC++ in <b>all</b> the installed security 
+	software (firewall, anti-virus, anti-spyware, etc..). For additional information and
+	tips about how to unblock DC++ in the Windows firewall and other 3rd party security 
+	software follow <a href="faq_unblock.html">this FAQ</a>.</p></li>
+
+	<li><p><u>Misconfigured or incorrectly detected connectivity settings</u>. The most obivious
+	sign of this problem is that you are <i>able</i> to pull down the hublists and can connect
+	to hubs without problems, even <b>others can upload from you</b> but searches and/or
+	downloads are not working (no search results / connection timeouts).</p>
+	<p>In most cases DC++ should be able to configure connectivity settings on your behalf, provided
+	the <a href="settings_connectivity.html">Automatic connectivity setup</a> feature is enabled.
+	If searches and/or downloads are not working, make sure that the <a href="settings_connectivity.html">
+	Let DC++ determine the best connectivity settings</a> option is enabled. If it doesn't help
+	(or it forces you into <a href="faq_whyactive.html">passive mode</a> and you want to improve 
+	your connectivity) then follow <a href="faq_connection.html">the FAQ that explains how to manually
+	configure DC++ connectivity settings</a>.</p></li>
+</ul>
+
+<h2 id="morehelp">Help resources</h2>
 <p>
 Need more help?
 </p>

=== modified file 'help/index.html'
--- help/index.html	2011-11-15 19:05:59 +0000
+++ help/index.html	2011-11-29 17:27:23 +0000
@@ -116,7 +116,8 @@
 <ul>
 <li><placeholder><a href="faq_whyactive.html">Why do I need active mode?</a></placeholder></li>
 <li><placeholder><a href="faq_connection.html">How to set up connection manually?</a></placeholder></li>
-<li><placeholder><a href="faq_activemode.html">How to set up active mode?</a></placeholder></li>
+<li><placeholder><a href="faq_portforward.html">How to set up manual port forwarding?</a></placeholder></li>
+<li><placeholder><a href="faq_unblock.html">How to unblock DC++ in firewalls and other security software?</a></placeholder></li>
 <li><placeholder><a href="faq_mapping.html">What is NAT-PMP / UPnP?</a></placeholder></li>
 <li><placeholder><a href="faq_university.html">My ISP or University blocks DC++</a></placeholder></li>
 <li><placeholder><a href="faq_nosearch.html">Why don't I get any search results?</a></placeholder></li>

=== modified file 'help/settings_connectivity_manual.html'
--- help/settings_connectivity_manual.html	2011-10-22 16:41:13 +0000
+++ help/settings_connectivity_manual.html	2011-11-29 17:27:23 +0000
@@ -11,7 +11,8 @@
 	</h1>
 <h2 id="connection">Incoming connection settings</h2>
 <p>
-Use these settings to manually configure DC++ for incoming connections. If unsure, you may want to follow the <a href="get_started.html#connection">connection setup part</a> of the <a href="get_started.html">Get Started guide</a>.
+Use these settings to manually configure DC++ for incoming connections. If unsure about these settings, 
+you may want to follow the <a href="faq_connection.html">Manual connection setup guide</a>.
 </p>
 <p style="margin-left: 40px;">Before setting up the following settings, make sure you are familiar
 with the meaning of each connection mode and with the <a href="faq_whyactive.html">differences
@@ -19,7 +20,7 @@
 	users</a> of the DC network.</p>
   <h3 style="margin-left: 40px;"><u>Active connection modes</u></h3>
   <p style="margin-left: 40px;">Active mode is highly preferred in the DC network. For more
-  information, refer to the <a href="faq_activemode.html">Active mode FAQ</a>.</p>
+  information, refer to the <a href="faq_whyactive.html">FAQ that explains the advantages of the active mode</a>.</p>
 <dl style="margin-left: 40px;">
   <dt>My computer is directly connected to the Internet (no router)</dt>
   <dd cshelp="IDH_SETTINGS_CONNECTIVITY_DIRECT">Select this mode if your computer is connected directly to the
@@ -27,8 +28,8 @@
 you have a router or any external firewall.</b> 
 If your computer is not behind a router all you have to do is to choose this option and usually 
 you don't need to alter anything more in the connection settings. However, if you have a software firewall
-installed or built-in Windows firewall enabled, you may need further configuration in the firewall 
-to allow Internet access for DC++.</dd>
+installed or built-in Windows firewall enabled, you may need <a href="faq_unblock.html">further configuration 
+in the firewall or other security software</a> to allow Internet access for DC++.</dd>
   <dt>Let DC++ configure my router (NAT-PMP / UPnP)</dt>
   <dd cshelp="IDH_SETTINGS_CONNECTIVITY_FIREWALL_UPNP">
   Select this mode if you are behind a router that supports standard port forwarding methods such
@@ -43,7 +44,7 @@
   external IP address of your router in the field below as well (although in most cases, hubs you
   connect to - especially ADC ones - will fill it on your behalf). Use this mode only if the
   previous ones are not options for you. For more information, refer to the
-  <a href="faq_activemode.html">Active mode guide</a>.</dd>
+  <a href="faq_portforward.html">Manual port forwarding guide</a>.</dd>
 </dl>
   <h3 style="margin-left: 40px;"><u>Passive connection mode</u></h3> 
 <dl style="margin-left: 40px;">
@@ -66,7 +67,7 @@
 <dd><p>These settings specify the communication ports DC++ listens on for incoming connections.
 Generally you don't need to add specific ports unless you configured your port forwarding settings
 manually. If port settings are left blank, DC++ will let the operating system generate a random
-port number. Port values are ignored when <a href="autoconn">Automatic connectivity setup</a> is
+port number. Port values are ignored when <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> is
 enabled.</p>
 <dl>
 	<dt>Transfer port (TCP)</dt>
@@ -85,7 +86,7 @@
 	search results.</dd>
 </dl>
 </dd>
-<dt>External / WAN IP</dt>
+<dt id="extip">External / WAN IP</dt>
 <dd cshelp="IDH_SETTINGS_CONNECTIVITY_EXTERNAL_IP">
 This field specifies your external IP address. <i>If you are unsure and use any other connection mode
 	option than 'Manual port forwarding (I have configured my router by myself)', then leave this
@@ -93,19 +94,15 @@
 external IP will be the same and can easily be automatically detected. Fill this box <b>only</b> if
 you need to override said auto-detection. Ordinarily, only users behind a router (NAT
 device) need to fill in this box. If you put a DNS name here, DC++ will try to resolve it into an
-IP address before use. To determine your external IP address, follow the
-<a href="get_started.html#connection">connection setup part</a> of the
-<a href="get_started.html">Get Started guide</a> or the detailed
-<a href="faq_activemode.html">Active mode FAQ</a>. The IP address set here will be erased if the
-<a href="autoconn">Automatic connectivity setup</a> feature is in use.</dd>
+IP address before use. For additional information like how to determine your external IP address, follow the
+<a href="faq_connection.html">Manual connection setup guide</a>.</dd>
   <dt id="noipoverride">Don't allow hubs/NAT-PMP/UPnP to override</dt>
   <dd cshelp="IDH_SETTINGS_CONNECTIVITY_OVERRIDE">Enable this to always use the IP address in "External
   / WAN IP", and not let either NAT-PMP, UPnP nor connected hubs change it. If unsure, leave
-  this setting disabled. This option will be cleared out if the
-  <a href="autoconn">Automatic connectivity setup</a> feature is in use.</dd>
+  this setting disabled.</dd>
 </dl>
 
-<h2>Preferred port mapping interface</h2>
+<h2 id="prefmap">Preferred port mapping interface</h2>
 <p cshelp="IDH_SETTINGS_CONNECTIVITY_MAPPER">
 DC++ has several interfaces available it can use to try to automatically map the ports it requires
 on the router:
@@ -120,12 +117,19 @@
 the preferred port mapping interface were to fail.
 </p>
 
-<h2>Bind address</h2>
+<h2 id="bindaddress">Bind address</h2>
 <p cshelp="IDH_SETTINGS_CONNECTIVITY_BIND_ADDRESS">
-This setting allows binding DC++ network connections to a specific IP address, rather than relying
-on the operating system to find the best adapter. If binding fails, it will do so silently and
-INADDR_ANY will be used instead. This value is ignored when
-<a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> is enabled.
+This setting allows binding DC++ network connections to a specific network adapter by its IP address.
+Useful when you have more than one physical or virtual network adapter installed and you want to
+assign a specfic device for all the network traffic generated by DC++.<br/>
+If this setting is empty (it is by default) it means that DC++ is relying on the operating system to
+find the best adapter. In case of the adapter offered by the operating system does not suit you, you can
+override it here by specifying the local IP address of the required adapter. To get the list of
+available network adapters with their IP adresses open up a Command Prompt window and use the 'ipconfig'
+command.<br/>
+If binding with the given IP address fails, it will do so silently and the default value (INADDR_ANY)
+will be used instead. This setting is ignored when <a href="settings_connectivity.html#autoconn">
+Automatic connectivity setup</a> is enabled.
 </p>
 </body>
 </html>

=== modified file 'help/window_download_queue.html'
--- help/window_download_queue.html	2011-04-07 13:40:55 +0000
+++ help/window_download_queue.html	2011-11-29 17:27:23 +0000
@@ -62,7 +62,7 @@
   		<p>The file cannot be downloaded from the source at the moment. Either the user's filelist was outdated when this file was added to the queue or the user removed the file from his/her share since then.</p>
   	</li>	
   	<li><p><i>Passive user</i></p>
-  		<p>You can get this error only if you are in <a href="settings_connectivity_manual.html#connection">Passive connection mode</a>. The client of the given source is in passive mode, either and two <a href="faq_whyactive.html">passive users cannot download from each other</a>. The source will be used automatically if at least one of the peers <a href="faq_activemode.html">switches to Active mode</a>.</p>
+  		<p>You can get this error only if you are in <a href="settings_connectivity_manual.html#connection">Passive connection mode</a>. The client of the given source is in passive mode, either and two <a href="faq_whyactive.html">passive users cannot download from each other</a>. The source will be used automatically if at least one of the peers <a href="faq_whyactive.html">switches to Active mode</a>.</p>
   	</li>	
   	<li><p><i>CRC32 inconsistency (SFV-Check)</i></p>
   	<p>The file was downloaded but its CRC32 checksum does not match the checksum stored in an accompanying .sfv file. The file will be redownloaded from another source. You can disable this integrity check with the corresponding checkbox in <a href="settings_advanced.html#sfvcheck">Advanced settings</a>.</p>

=== modified file 'help/window_main.html'
--- help/window_main.html	2011-10-15 22:58:51 +0000
+++ help/window_main.html	2011-11-29 17:27:23 +0000
@@ -73,7 +73,7 @@
 
 			<dt><img src="Users.ico" width="16" height="16" alt="Users"/> Users</dt>
 			<dd><div>Open the <placeholder><a href="window_users.html">Users</a></placeholder> window.</div>
-			<div>In there, you can store and manage your favorite DC users here as well as grant extra access to your share for any of them.</div></dd>
+			<div>You can see all the users of the connected hubs listed in there. Additionally you can manage your favorite DC users here as well as grant extra access to your share for any of them.</div></dd>
 
 			<dt><img src="Queue.ico" width="16" height="16" alt="Download Queue"/> Download Queue</dt>
 			<dd><div>Open the <placeholder><a href="window_download_queue.html">Download Queue</a></placeholder> window.</div>

=== modified file 'help/window_system_log.html'
--- help/window_system_log.html	2011-09-19 19:38:50 +0000
+++ help/window_system_log.html	2011-11-29 17:27:23 +0000
@@ -76,7 +76,7 @@
 	<dt>Port mapping: Failed to remove port mappings from the [router name] device with the [interface identification] interface</dt>
 	<dd>DC++ has failed to remove the existing port forwarding rules from the router made by <a href="faq_mapping.html">NAT-PMP or UPnP</a>.</dd>
 	<dt>Connectivity: Unable to open TCP/UDP/TLS port(s); connectivity settings must be configured manually</dt>
-	<dd>You can get this message only when <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> is enabled and DC++ failed to open port(s) before trying to determine the available conncetion types. Possible reasons include the choosen port(s) are already occupied by another application or DC++ is blocked by a <a href="get_started.html#firewall">software firewall</a>.</dd>
+	<dd>You can get this message only when <a href="settings_connectivity.html#autoconn">Automatic connectivity setup</a> is enabled and DC++ failed to open port(s) before trying to determine the available conncetion types. Possible reasons include the choosen port(s) are already occupied by another application or <a href="faq_unblock.html">DC++ is blocked by a software firewall</a>.</dd>
 	<dt>Not listening for connections - please restart DC++</dt>
 	<dd>An unrecoverable low level networking error keeps DC++ from listening for connections. Search and download won't work until you restart DC++.</dd>
 	<dt>Connectivity error: [error message]</dt>