From 64d42525afb0c714310d45e7fa4a8948ae7996f2 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 10 Mar 2011 11:24:26 -0500
Subject: Clarify text on outbound NAT page.

---
 usr/local/www/firewall_nat_out.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'usr/local/www/firewall_nat_out.php')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 0a8af47..958f903 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -447,14 +447,18 @@ include("head.inc");
                 </tr>
                 <tr>
                   <td colspan="12">
-					<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br>
-                      </strong></span><?=gettext("If advanced outbound NAT is enabled, no outbound NAT " .
-                      "rules will be automatically generated any longer. Instead, only the mappings " .
-                      "you specify below will be used. With advanced outbound NAT disabled, " .
-                      "a mapping is automatically created for each interface's subnet " .
-                      "(except WAN).  If you use target addresses other than the WAN interface's " .
-		      "IP address, then depending on the way your WAN connection is setup, you " .
-	              "may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a></span><br>
+			<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br>
+			</strong></span>
+			<?=gettext("With automatic outbound NAT enabled, a mapping is automatically created " .
+			"for each interface's subnet (except WAN-type connections) and the rules " .
+			"on this page are ignored.<br/><br/> " .
+			"If manual outbound NAT is enabled, outbound NAT rules will not be " .
+			"automatically generated and only the mappings you specify on this page " .
+			"will be used. <br/><br/> " .
+			"If a target address other than a WAN-type interface's IP address is used, " .
+			"then depending on the way the WAN connection is setup, a " .
+			"need a "); ?><a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>
+			<?= gettext(" may also be required.") ?></span><br>
                     </td>
                 </tr>
 
-- 
cgit v1.1


From d0404e467ab5c6c6cb4b5bd244043572fb9ca983 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 10 Mar 2011 20:37:34 -0500
Subject: Fix typo

---
 usr/local/www/firewall_nat_out.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www/firewall_nat_out.php')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 958f903..4649795 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -456,8 +456,8 @@ include("head.inc");
 			"automatically generated and only the mappings you specify on this page " .
 			"will be used. <br/><br/> " .
 			"If a target address other than a WAN-type interface's IP address is used, " .
-			"then depending on the way the WAN connection is setup, a " .
-			"need a "); ?><a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>
+			"then depending on the way the WAN connection is setup, a "); ?>
+			<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>
 			<?= gettext(" may also be required.") ?></span><br>
                     </td>
                 </tr>
-- 
cgit v1.1