From 858211ddde3b2a5eff0de609bf47070c4a7a776f Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 19 Nov 2013 08:45:22 -0200
Subject: Improve text on outbound NAT page to reflect last changes, it should
 fix #2416

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

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index fbc8903..308d9f6 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -599,19 +599,19 @@ if (is_subsystem_dirty('natconf'))
 					<td colspan="12">
 						<p><span class="vexpl">
 							<span class="red"><strong><?=gettext("Note:"); ?><br/></strong></span>
-							<?=gettext("With automatic outbound NAT enabled, a mapping is automatically created " .
+							<?=gettext("If automatic outbound NAT selected, 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 " .
+								"on \"Mappings\" section of this page are ignored.<br/><br/> " .
+								"If manual outbound NAT is selected, outbound NAT rules will not be " .
 								"automatically generated and only the mappings you specify on this page " .
 								"will be used. <br/><br/> " .
+								"If hybrid outbound NAT is selected, mappings you specify on this page will " .
+								"be used, followed by the automatically generated ones. <br/><br/>" .
+								"If disable outbound NAT is selected, no rules 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 "); ?>
 								<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>
 								<?= gettext(" may also be required.") ?>
-								<br/><br/>
-								<?= gettext("To completely disable outbound NAT, switch to Manual Outbound NAT then delete any " .
-								"NAT rules that appear in the list.") ?>
 						</span></p>
 					</td>
 				</tr>
-- 
cgit v1.1