updated help files

macosx/Transmission Help/html/pffirewall.html

@@ -21,8 +21,11 @@
 								<li>Description: Transmission </li>
 							</ul>
 						<li>Click OK. </li>
+						<p>NB: To disable the firewall, click Stop.
 					</ol>
 				</div>
+				
+				
 			<a href="../index.html">Home</a>
 		</div>
 	</body>

macosx/Transmission Help/html/pfrouter.html

@@ -13,6 +13,8 @@
 			</div>
 			<p>In this case, it is probably OK to disable the OS X firewall, as you are already being protected by the router. To disable the firewall, open System Prefs >> Sharing >> Firewall. Click Stop.
 			
+			<p>To forward a port in your router manually:
+			
 			<div summary="To do this" id="taskbox">
 				<ol>
 					<li>Find out what your IP address is. You can find your computer's IP address by going to System Prefs >> Network, double-clicking on your connection (for instance, Built-in Ethernet), and clicking the TCP/IP tab. It's probably something like 192.168.1.100, or 10.0.1.2.</li>
@@ -33,6 +35,32 @@
 			<p>For more comprehensive instructions specific to your router, click <a href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">here</a> and choose your router from the list.
 			<p>
 			</div>
+			
+			<p>If you find yourself having to change your router settings all the time, a static IP address might be beneficial.
+			
+			<div id="pagetitle">
+				<h1>What is a static IP?</h1>
+			</div>
+			<p>Where your computer is assigned an IP address which does not change. This can be helpful if you have a laptop or have multiple computers on your network. While it makes things a bit simpler, you don't have to have a static IP for BitTorrent or Port Forwarding to work.
+			<p>A dynamic IP address assigned by your wireless router for example will most likely not change unless you reboot your computer, or leave and rejoin the network. Thus, having a static IP isn't really necessary, especially if your router supports UPnP.
+			<p>
+			<div id="pagetitle">
+				<h1>How do I get a static IP address?</h1>
+			</div>
+			<div summary="To do this" id="taskbox">
+				<ol>
+					<li>Go to System Prefs >> Network, double-click on your connection (for instance, Built-in Ethernet), and click the TCP/IP tab. 
+					<li>Write down the IP, Subnet Mask and Router addresses. 
+					<li>Go to your router 'status' page via your web browser (Airport Admin Utility if you are using an Airport BS), and write down the DNS Server addresses. Alternatively, you can enter your router's internal IP (e.g. 192.168.0.1). This is sometimes quicker, as it refers to the router instead of the server. 
+					<li>Then, return to the TCP/IP page in System Prefs. 
+					<li>Choose "Manually" from the Configure IPv4 drop down menu. 
+					<li>Enter the IP address you wish to have, eg 192.168.0.100, or 10.0.1.100. It should be of a similar format to the IP address you found in step 2, with only the last number changing. 
+					<br>NB: You cannot have a static IP address that's within the DHCP range. Thus it is recommended that you make the last digit of your address large enough to discount this possibility, like we have done in our examples. 
+					<li>Fill in the other boxes using the addresses you wrote down in steps 2 and 3. 
+					<li>Click 'Apply Now'.
+				</ol>
+			</div>
+			
 			<a href="../index.html">Home</a>
 		</div>
 	</body>

macosx/Transmission Help/html/portforward.html

@@ -9,70 +9,56 @@
 		<div id="mainbox">
 			<a href="../index.html">Home</a>
 			<div id="pagetitle">
-				<h1>What is Port Forwarding?</h1>
+				<h1>Why do I see a red dot and "Port is closed"?</h1>
 			</div>
-			<p>If you are connected to the internet via a router, or have a firewall running, port forwarding is the act of opening a port in the firewall/router so that incoming connections from the outside world can be made with your computer.
+			<p>You haven't port forwarded correctly. Port forwarding opens a port in your firewall or router so that incoming connections from the outside world can be made with Transmission.
 			<p>
 			<div id="pagetitle">
 				<h1>Why do I need to Port Forward?</h1>
 			</div>
-			<p>Transmission uses a single port for all the torrents you are downloading. If the port has not been opened (ie forwarded) that means only you can make connections to others in the swarm. If the port is forwarded, others can connect to you, thus increasing the potential number of people connected to you, and more importantly increasing the speed of your download.
+			<p>Transmission uses a single port for all the torrents you are downloading. If the port has not been opened (ie forwarded) that means only you can make connections to others in the swarm.
+			If the port is forwarded, others can connect to you, thus increasing the potential number of people connected to you, and more importantly increasing the speed of your download.
 			<p>
 			<div id="pagetitle">
 				<h1>How do I Port Forward?</h1>
 			</div>
-			<p>If you have an Apple Airport, or a UPnP compatible router, Transmission can map your ports automatically. Most routers manufactured since 2001 have this feature. Go to Preferences >> Network, and check the box.
-			If the port mapping is unsuccessful, <a href="upnp.html">click here</a>.
-			
-			<p>Forwarding Transmission's port manually is fairly straightforward:
-			
 			<ul>
-				<li>If your modem is directly connected to your computer, and you have the OS X firewall running (which is highly recommended in this case), you'll need to open a port in the firewall.<br>
+				<li>If you have an Apple Airport, or a UPnP compatible router, Transmission can map its port automatically. Most routers manufactured since 2001 have this feature.
-				For instructions <a href="pffirewall.html">click here</a>. </li>
+				<div summary="To do this" id="taskbox">
-				<li>If your modem is connected to your computer via a router (wired/wireless) you'll need to open a port in the router.<br>
+					<ol>
-				For instructions <a href="pfrouter.html">click here</a>. </li>
+						<li>Open Transmission. </li>
+						<li>Go to Preferences >> Network, and check 'Automatically map port'. </li>
+						<li>You should see a success notification and green dots.</li>
+						<p>If you get a red dot and the message 'Error mapping port', <a href="upnp.html">click here</a>.</li>
+					</ol>				
+				</div>
+				
+				<li>If you don't have a compatible router, it is simple to forward Transmission's port manually. For instructions <a href="pfrouter.html">click here</a>.</li>
+			
+				<li>If you don't use a router, that is, your modem is directly connected to your computer, you'll need to open Transmission's port in the Mac OS X firewall. For instructions <a href="pffirewall.html">click here</a>.<br>
+				NB: it is highly recommended you enable the Mac OS X firewall if you are not using a router.</li>
 			</ul>	
+				
 			<p>
 			<div id="pagetitle">
-				<h1>How do I know if i've done it right?</h1>
+				<h1>How do I know if I've done it right?</h1>
 			</div>
 			
 			<div summary="To do this" id="taskbox">
 				<ol>
 					<li>Open Transmission. </li>
 					<li>Go to Preferences >> Network. </li>
-					<li>Check the notification. </li>
+					<li>Check the notification next to 'Incoming TCP Port'. </li>
 				</ol>
 			</div>
 			<p>
 			<ul>
-				<li>If you get 'Stealth' or 'Closed' then you haven't forwarded correctly.
+				<li>If you get a red dot and the message 'Port is Stealth' or 'Port is Closed' then you haven't forwarded correctly.<br>
-				 If Transmission has successfully mapped the port automatically, make sure the OS X firewall is either disabled, or you have <a href="pffirewall.html">allowed Transmission's port</a>. </li>
+				 NB: If Transmission has successfully mapped the port automatically in this case, make sure the OS X firewall is either disabled, or you have <a href="pffirewall.html">allowed Transmission's port</a>.
-				<li>If you get 'Open' then you have successfully port forwarded! </li>
+				  The firewall can cause the port to remain closed, even if it has been successfully mapped by the router.</li>
+				<li>If you get a green dot and 'Port is Open' then you have successfully port forwarded! </li>
 			</ul>
-			<p>
+
-			<div id="pagetitle">
-				<h1>What is a static IP?</h1>
-			</div>
-			<p>Where your computer is assigned an IP address which does not change. This can be helpful if you have a laptop or have multiple computers on your network. While it makes things a bit simpler, you don't have to have a static IP for BitTorrent or Port Forwarding to work.
-			<p>A dynamic IP address assigned by your wireless router for example will most likely not change unless you reboot your computer, or leave and rejoin the network. Thus, having a static IP isn't really necessary, especially if your router supports UPnP.
-			<p>
-			<div id="pagetitle">
-				<h1>How do I get a static IP address?</h1>
-			</div>
-			<div summary="To do this" id="taskbox">
-				<ol>
-					<li>Go to System Prefs >> Network, double-click on your connection (for instance, Built-in Ethernet), and click the TCP/IP tab. 
-					<li>Write down the IP, Subnet Mask and Router addresses. 
-					<li>Go to your router 'status' page via your web browser (Airport Admin Utility if you are using an Airport BS), and write down the DNS Server addresses. Alternatively, you can enter your router's internal IP (e.g. 192.168.0.1). This is sometimes quicker, as it refers to the router instead of the server. 
-					<li>Then, return to the TCP/IP page in System Prefs. 
-					<li>Choose "Manually" from the Configure IPv4 drop down menu. 
-					<li>Enter the IP address you wish to have, eg 192.168.0.100, or 10.0.1.100. It should be of a similar format to the IP address you found in step 2, with only the last number changing. 
-					<br>NB: You cannot have a static IP address that's within the DHCP range. Thus it is recommended that you make the last digit of your address large enough to discount this possibility, like we have done in our examples. 
-					<li>Fill in the other boxes using the addresses you wrote down in steps 2 and 3. 
-					<li>Click 'Apply Now'.
-				</ol>
-			</div>
 			</p>
 			<a href="../index.html">Home</a>
 		</div>