update help documentation

diff --git a/macosx/TransmissionHelp/TransmissionHelp.helpindex b/macosx/TransmissionHelp/TransmissionHelp.helpindex
index aeca6fb39a9c979f43496104283ae22ae2417f77..bc629634db2ce0457d52ac912dd17d73e9f2224a 100644 (file)
Binary files a/macosx/TransmissionHelp/TransmissionHelp.helpindex and b/macosx/TransmissionHelp/TransmissionHelp.helpindex differ

diff --git a/macosx/TransmissionHelp/html/troubleshoot.html b/macosx/TransmissionHelp/html/troubleshoot.html
index bedda1870c77315b85bce986969ea2ad8b71d2d6..71c8be81c251b548056579a53855f5121007d3f7 100644 (file)
--- a/macosx/TransmissionHelp/html/troubleshoot.html
+++ b/macosx/TransmissionHelp/html/troubleshoot.html
@@ -21,6 +21,17 @@
                        </div>
                        
                        <p>If your port is still not open, even after you have enabled automatic port forwarding, here are some tips you can use which may get it working.
+
+                               <div summary="To do this" id="taskbox">
+                               <p>If you are still having problems, open the Message Log (in the Window menu) and post the debug output on the <a href="http://transmission.m0k.org/forum/viewforum.php?f=2">support forums</a>.
+                               <ol>
+                                       <li>Pause your torrents</li>
+                                       <li>Clear the log and set it to 'Debug'</li>
+                                       <li>Toggle "Automatically forward port" in Network Preferences</li>
+                                       <li>Post the resultant output</li>
+                               </ol>
+                               </div>
+                               
                        <div id="pagetitle">
                                <h1>UPnP</h1>
                        </div>
@@ -31,30 +42,14 @@
                                <li>The port has not already been forwarded manually.
                        </ul>
                        
-                       <p>If you are still having problems, open the Message Log (in the Window menu) and post the debug output on the <a href="http://transmission.m0k.org/forum/viewforum.php?f=2">support forums</a>.
-                       Make sure you pause your torrents first; then clear the log, and toggle "Automatically forward port". Post this output.
-                       
                        <div id="pagetitle">
                                <h1>Airport</h1>
                        </div>
                        <p>If you have an Apple Airport, make sure NAT-PMP is enabled.
-                               <div summary="To do this" id="taskbox">
-                               <p>To do this on Tiger/'Airport Admin Utility':
-                               <ol>
-                                       <li>Open Airport Admin Utility</li>
-                                       <li>Select your base station and click "Configure".</li>
-                                       <li>In the "AirPort" tab, click "Base Station Options...".</li>
-                                       <li>In the "Ethernet Port Security" tab, check the "Enable NAT Port Mapping Protocol" checkbox.</li>
-                                       <li>Click "OK".</li>
-                                       <li>Click "Update".
-                                       <p>NB: NAT-PMP requires MacOS X 10.4 Tiger, as well as up to date Airport software and firmware.</li>
-                               </ol>
-                               </div>
                                
                                        <div summary="To do this" id="taskbox">
-                                       <p>To do this on Leopard and 'Airport Utility':
                                        <ol>
-                                               <li>Open Airport Utility</li>
+                                               <li>Open Airport Utility (located in /Applications/Utilities)</li>
                                                <li>Select your base station, and then choose Manual Setup from the Base Station menu. Enter the base station password if necessary.</li>
                                                <li>Click Internet in the toolbar, and then check the "Enable NAT Port Mapping Protocol" checkbox.</li>
                                                <li>Click "Update".</li>
@@ -68,13 +63,16 @@
                                                <h1>Double NAT</h1>
                                        </div>
                                        <p>Another possible reason your port remains closed could be because your router is not the only device on the network which needs to be configured.
-                                       
-                                       <p>Make sure the OS X firewall is either disabled, or you have <a href="pffirewall.html">allowed Transmission's port</a>.
-                                       The firewall can cause the port to remain closed, even if it has been successfully mapped by the router.
 
-                                       <p>If you have multiple routers in your home network, you must forward Transmission's port on all of them, otherwise it will continue to show up as closed.
-                                       Transmission can only automatically port map the router the computer is directly connected to. Any others in between this router and your modem will have to be <a href="pfrouter.html">forwarded manually</a>.
-                                       For detailed instructions, <a href="http://www.portforward.com/help/doublerouterportforwarding.htm">click here</a>.
+                                       <p>For example, your network might resemble the following: <b>ADSL modem/router --> Airport extreme --> MacBook.</b>
+
+                                       <p>If you have multiple routers in your home network (such as in the example above), you have two options. The easiest way is to turn one of the routers into 'Bridge mode' which means you then only have to configure one device rather than all of them. So, in our above example, we would set the Airport extreme to 'Bridge'. See your router's help documentation for instructions.
+                                                                                               
+                                       <p>The second way is to map Transmission's port on all of the devices on your network.
+                                       Transmission can only automatically port map the router the computer is directly connected to. Any others in between this router and your modem will have to be <a href="pfrouter.html">forwarded manually</a>. For detailed instructions, <a href="http://www.portforward.com/help/doublerouterportforwarding.htm">click here</a>.
+                                       
+                                       <p>Finally make sure the OS X firewall is either disabled, or you have <a href="pffirewall.html">allowed Transmission's port</a>.
+                                       The firewall can cause the port to remain closed, even if it has been successfully mapped by the router(s).
                                        </div>
 
                                </div>