Fix formatting on the UPnP page, fixes #5970

1 files changed, 39 insertions, 18 deletions

diff --git a/src/usr/local/pkg/miniupnpd.xml b/src/usr/local/pkg/miniupnpd.xml
index 5192155..fb11688 100644
--- a/src/usr/local/pkg/miniupnpd.xml
+++ b/src/usr/local/pkg/miniupnpd.xml
@@ -23,81 +23,102 @@
 			<enablefields>enable_upnp,enable_natpmp,ext_iface,iface_array,download,upload,overridewanip,upnpqueue,logpackets,sysuptime,permdefault</enablefields>
 		</field>
 		<field>
-			<fielddescr>Enable UPnP &amp; NAT-PMP</fielddescr>
+			<fielddescr>Enable</fielddescr>
 			<fieldname>enable</fieldname>
 			<type>checkbox</type>
 			<enablefields>enable_upnp,enable_natpmp,ext_iface,iface_array,download,upload,overridewanip,upnpqueue,logpackets,sysuptime,permdefault</enablefields>
+			<sethelp>Enable UPnP &amp; NAT-PMP</sethelp>
 		</field>
 		<field>
-			<fielddescr>Allow UPnP Port Mapping</fielddescr>
+			<fielddescr>UPnP Port Mapping</fielddescr>
 			<fieldname>enable_upnp</fieldname>
 			<type>checkbox</type>
-			<description>This protocol is often used by Microsoft-compatible systems.</description>
+			<description>Allow UPnP Port Mapping</description>
+			<sethelp>This protocol is often used by Microsoft-compatible systems.</sethelp>
 		</field>
 		<field>
-			<fielddescr>Allow NAT-PMP Port Mapping</fielddescr>
+			<fielddescr>NAT-PMP Port Mapping</fielddescr>
 			<fieldname>enable_natpmp</fieldname>
 			<type>checkbox</type>
-			<description>This protocol is often used by Apple-compatible systems.</description>
+			<description>Allow NAT-PMP Port Mapping</description>
+			<sethelp>This protocol is often used by Apple-compatible systems.</sethelp>
 		</field>
 		<field>
-			<fielddescr>External Interface (generally WAN)</fielddescr>
+			<fielddescr>External Interface</fielddescr>
 			<fieldname>ext_iface</fieldname>
 			<default_value>wan</default_value>
 			<type>interfaces_selection</type>
 			<hideinterfaceregex>loopback</hideinterfaceregex>
-			<description>Select only your primary WAN interface (interface with your default route). Only one interface is allowed here, not multiple.</description>
+			<description>Select only the primary WAN interface (interface with the default gateway). Only one interface may be chosen.</description>
 			<required/>
 		</field>
 		<field>
-			<fielddescr>Interfaces (generally LAN)</fielddescr>
+			<fielddescr>Interfaces</fielddescr>
 			<fieldname>iface_array</fieldname>
 			<default_value>lan</default_value>
 			<type>interfaces_selection</type>
-			<description>You can use the CTRL or COMMAND key to select multiple interfaces.</description>
+			<description>Select the internal interfaces, such as LAN, where UPnP/NAT-PMP clients reside. Use the CTRL or COMMAND key to select multiple interfaces.</description>
 			<required/>
 			<multiple/>
 		</field>
 		<field>
-			<fielddescr>Maximum Download Speed (Kbits/second)</fielddescr>
+			<fielddescr>Download Speed</fielddescr>
 			<fieldname>download</fieldname>
+			<description>Set the Maximum Download Speed in Kbits/second.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Maximum Upload Speed (Kbits/second)</fielddescr>
+			<fielddescr>Upload Speed</fielddescr>
 			<fieldname>upload</fieldname>
+			<description>Set the Maximum Upload Speed in Kbits/second.</description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Override WAN address</fielddescr>
 			<fieldname>overridewanip</fieldname>
+			<description>Use an alternate WAN address to accept inbound connections, such as an IP Alias or CARP Virtual IP address.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Traffic Shaping Queue</fielddescr>
+			<fielddescr>Traffic Shaping</fielddescr>
 			<fieldname>upnpqueue</fieldname>
+			<description>Enter the ALTQ traffic shaping queue in which the connections should be placed.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Log packets handled by UPnP &amp; NAT-PMP rules?</fielddescr>
+			<fielddescr>Log packets</fielddescr>
 			<fieldname>logpackets</fieldname>
 			<type>checkbox</type>
+			<description>Log packets handled by UPnP &amp; NAT-PMP rules.</description>
 		</field>
 		<field>
-			<fielddescr>Use system uptime instead of UPnP &amp; NAT-PMP service uptime?</fielddescr>
+			<fielddescr>Uptime</fielddescr>
 			<fieldname>sysuptime</fieldname>
 			<type>checkbox</type>
+			<description>Use system uptime instead of UPnP &amp; NAT-PMP service uptime.</description>
 		</field>
 		<field>
-			<fielddescr>By default deny access to UPnP &amp; NAT-PMP?</fielddescr>
+			<fielddescr>Default Deny</fielddescr>
 			<fieldname>permdefault</fieldname>
 			<type>checkbox</type>
+			<description>Deny access to UPnP &amp; NAT-PMP by default.</description>
 		</field>
 		<field>
-			<fielddescr>User specified permissions</fielddescr>
-			<fieldname>none</fieldname>
-			<description>Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range]
+			<name>UPnP Access Control Lists</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<name>ACL Help</name>
+			<type>info</type>
+			<description>
+			These entries control access to the UPnP service. Client systems may be granted or denied access based on several criteria.
+			&lt;br /&gt;&lt;br /&gt;
+			Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range]
 			&lt;br /&gt;Example: allow 1024-65535 192.168.0.0/24 1024-65535</description>
+		</field>
+		<field>
+			<fielddescr>ACL Entries</fielddescr>
+			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
 				<rowhelperfield>