From f772bf06569aca924310abd4cd867048cee6b637 Mon Sep 17 00:00:00 2001
From: Jeremy Chadwick <jdc@koitsu.org>
Date: Wed, 28 Dec 2016 02:40:17 +0700
Subject: [PATCH] UI cleanup, phase 1 (purely cosmetic)

One of several commits that are intended to "clean up" parts of
the TomatoUSB GUI.  Expect more in the future (some are hard to
test).  Changes in question:

admin-access.asp
  - Make Authorized Keys textarea more consistent with rest of GUI
  - Grammatical fixups
  - Wrap some text descriptions in parens
  - Better align SSH/Telnet texts, remove unnecessary slash
  - Use smaller font sizes where applicable, and denote units properly
admin-bwm.asp
  - Rename "Link" to "Direct Download Link"
  - Move "Direct Download Link" to right of Backup button
admin-config.asp
  - Rename "Link" to "Direct Download Link"
  - Move "Direct Download Link" to right of Backup button
  - Remove superfluous "Select the configuration file..." text
admin-upgrade.asp
  - Remove unnecessary padding preceding <td> elements
  - Typo: aprox. -> approx.
advanced-firewall.asp
  - Remove unnecessary spaces preceding ICMP/Traceroute fields
  - Clarify what "Enable DSCP Fix" does (reword description)
advanced-misc.asp
  - Capitalisation: Bytes -> bytes
advanced-wlanvifs.asp
  - Add acronymn (VIF) definition to section title
  - Add Notes section sub-headers for each respective area
  - Move <ul> inside LINUX24-BEGIN block; we shouldn't start an
    unordered list if there's no content due to conditionals
  - Make consistent sub-headers and descriptions
  - Remove what appears to be some superfluous HTML
basic-ddns.asp
  - Denote that @IP refers to the WAN IP address
basic-ipv6.asp
  - Remove Notes section; Request PD Only can get its own description
    using a suffix field
  - Remove PPPoE/DSL/Fiber mention; if we aren't sure/don't know, then
    let the user decide.  Don't speculate!
basic-network.asp
  - Use <small> where applicable (i.e. not <i>)
  - Remove parens on things that denote units (ex. minutes, seconds)
  - In Static DNS, IP is supported (not just IP:port)
  - Grammatical fixups
forward-basic-ipv6.asp
  - Change "Proto" to "Protocol" in table; consistent with rest of GUI
  - Fix up Notes section, including spacing and sub-headers
  - Make example syntaxes consistent with rest of GUI
  - Add closing </li> tags
forward-basic.asp
  - Pretty much same as forward-basic-ipv6.asp
forward-triggered.asp
  - Add Notes section designator
  - Add closing </li> tags
forward-upnp.asp
  - Make Miniupnpd Custom Configuration textarea more consistent with
    rest of GUI
  - Make Miniupnpd text actually point to a valid link (example
    miniupnpd.conf file on GitHub); weird that someone left </a>!
  - Remove spurious blank link
tools-ping.asp
  - Remove parens on things that denote units (ex. minutes, seconds)
tools-trace.asp
  - Remove parens on things that denote units (ex. minutes, seconds)
---
 .../src-rt-6.x.4708/router/www/admin-access.asp    | 14 +++++++-------
 release/src-rt-6.x.4708/router/www/admin-bwm.asp   |  2 +-
 .../src-rt-6.x.4708/router/www/admin-config.asp    |  9 ++++-----
 .../src-rt-6.x.4708/router/www/admin-upgrade.asp   |  4 ++--
 .../router/www/advanced-firewall.asp               |  6 +++---
 .../src-rt-6.x.4708/router/www/advanced-misc.asp   |  2 +-
 .../router/www/advanced-wlanvifs.asp               | 20 +++++++-------------
 release/src-rt-6.x.4708/router/www/basic-ddns.asp  |  2 +-
 release/src-rt-6.x.4708/router/www/basic-ipv6.asp  | 13 ++-----------
 .../src-rt-6.x.4708/router/www/basic-network.asp   | 18 +++++++++---------
 .../router/www/forward-basic-ipv6.asp              | 22 ++++++++++++++--------
 .../src-rt-6.x.4708/router/www/forward-basic.asp   | 21 +++++++++++----------
 .../router/www/forward-triggered.asp               | 13 ++++++++-----
 .../src-rt-6.x.4708/router/www/forward-upnp.asp    |  7 +++++--
 release/src-rt-6.x.4708/router/www/tools-ping.asp  |  2 +-
 release/src-rt-6.x.4708/router/www/tools-trace.asp |  2 +-
 16 files changed, 77 insertions(+), 80 deletions(-)

diff --git a/release/src-rt-6.x.4708/router/www/admin-access.asp b/release/src-rt-6.x.4708/router/www/admin-access.asp
index 5a107cf15a..4ae336d31e 100644
--- a/release/src-rt-6.x.4708/router/www/admin-access.asp
+++ b/release/src-rt-6.x.4708/router/www/admin-access.asp
@@ -20,8 +20,8 @@
 
 <style type='text/css'>
 textarea {
-	width: 99%;
-	height: 10em;
+	width: 98%;
+	height: 9em;
 }
 </style>
 
@@ -298,7 +298,7 @@ var m = [
 	{ title: 'Allow Wireless Access', name: 'f_http_wireless', type: 'checkbox', value:  nvram.web_wl_filter == 0 },
 	null,
 	{ title: 'Directory with GUI files', name: 'web_dir', type: 'select',
-		options: [['default','Default: /www'], ['jffs', 'Custom: /jffs/www (Experts Only!)'], ['opt', 'Custom: /opt/www (Experts Only!)'], ['tmp', 'Custom: /tmp/www (Experts Only!)']], value: nvram.web_dir, suffix: ' <small>Please be sure of your decision before change this settings!</small>' },
+		options: [['default','Default: /www'], ['jffs', 'Custom: /jffs/www (Experts Only!)'], ['opt', 'Custom: /opt/www (Experts Only!)'], ['tmp', 'Custom: /tmp/www (Experts Only!)']], value: nvram.web_dir, suffix: ' <small>(please be sure of your decision before changing this setting!)</small>' },
 	{ title: 'Color Scheme', name: 'web_css', type: 'select',
 		options: [['red','Tomato'],['asus','Asustek'],['black','Black'],['blue','Blue'],['bluedream','Bluedream'],['brownlight','Brownlight'],['brown','Brown'],['cisco','Cisco'],['cyan','Cyan'],['enlightened','Enlightened'],['linksys','Linksys'],['olive','Olive'],['tijuana','Tijuana'],['ext/custom','Custom (ext/custom.css)'], ['online', 'On-line from TTB']], value: nvram.web_css },
 	{ title: 'TTB ID#', indent: 2, name: 'ttb_css', type: 'text', maxlen: 25, size: 30, value: nvram.ttb_css, suffix: ' Theme name from <a href="http://www.tomatothemebase.eu" target="_blanc"><u><i>TTB themes gallery</i></u></a>' },
@@ -351,12 +351,12 @@ createFieldTable('', [
 	{ title: 'Allowed Remote<br>IP Address', name: 'f_rmgt_sip', type: 'text', maxlen: 512, size: 64, value: nvram.rmgt_sip,
 		suffix: '<br><small>(optional; ex: "1.1.1.1", "1.1.1.0/24", "1.1.1.1 - 2.2.2.2" or "me.example.com")</small>' },
 	{ title: 'Limit Connection Attempts', multi: [
-		{ suffix: '&nbsp; SSH &nbsp; / &nbsp;', name: 'f_limit_ssh', type: 'checkbox', value: (shlimit[0] & 1) != 0 },
-		{ suffix: '&nbsp; Telnet &nbsp;', name: 'f_limit_telnet', type: 'checkbox', value: (shlimit[0] & 2) != 0 }
+		{ suffix: '&nbsp;SSH &nbsp;&nbsp;', name: 'f_limit_ssh', type: 'checkbox', value: (shlimit[0] & 1) != 0 },
+		{ suffix: '&nbsp;Telnet', name: 'f_limit_telnet', type: 'checkbox', value: (shlimit[0] & 2) != 0 }
 	] },
 	{ title: '', indent: 2, multi: [
-		{ name: 'f_limit_hit', type: 'text', maxlen: 4, size: 6, suffix: '&nbsp; every &nbsp;', value: shlimit[1] },
-		{ name: 'f_limit_sec', type: 'text', maxlen: 4, size: 6, suffix: '&nbsp; seconds', value: shlimit[2] }
+		{ name: 'f_limit_hit', type: 'text', maxlen: 4, size: 6, suffix: '&nbsp;<small>every</small>&nbsp;&nbsp;', value: shlimit[1] },
+		{ name: 'f_limit_sec', type: 'text', maxlen: 4, size: 6, suffix: '&nbsp;<small>seconds</small>', value: shlimit[2] }
 	] }	
 ]);
 </script>
diff --git a/release/src-rt-6.x.4708/router/www/admin-bwm.asp b/release/src-rt-6.x.4708/router/www/admin-bwm.asp
index f718004892..0802862367 100644
--- a/release/src-rt-6.x.4708/router/www/admin-bwm.asp
+++ b/release/src-rt-6.x.4708/router/www/admin-bwm.asp
@@ -265,8 +265,8 @@ createFieldTable('', [
 	</script>
 	.gz &nbsp;
 	<input type='button' name='f_backup_button' id='backup-button' onclick='backupButton()' value='Backup'>
+	&nbsp;&nbsp;&nbsp;<a href='' id='backup-link'>Direct Download Link</a>
 	</form>
-	<a href='' id='backup-link'>Link</a>
 </div>
 <br>
 
diff --git a/release/src-rt-6.x.4708/router/www/admin-config.asp b/release/src-rt-6.x.4708/router/www/admin-config.asp
index 795ab76b95..af3dc5677b 100644
--- a/release/src-rt-6.x.4708/router/www/admin-config.asp
+++ b/release/src-rt-6.x.4708/router/www/admin-config.asp
@@ -98,8 +98,8 @@ function resetButton()
 		W("<input type='text' size='40' maxlength='64' id='backup-name' onchange='backupNameChanged()' value='tomato_v" + ('<% version(); %>'.replace(/\./g, '')) + "_m" + nvram.et0macaddr.replace(/:/g, '').substring(6, 12) + "'>");
 		</script>
 		.cfg &nbsp;
-		<input type='button' name='f_backup_button' onclick='backupButton()' value='Backup'><br>
-		<a href='' id='backup-link'>Link</a>
+		<input type='button' name='f_backup_button' onclick='backupButton()' value='Backup'>
+		&nbsp;&nbsp;&nbsp;<a href='' id='backup-link'>Direct Download Link</a>
 	</form>
 </div>
 
@@ -108,9 +108,8 @@ function resetButton()
 <div class='section-title'>Restore Configuration</div>
 <div class='section'>
 	<form id='restore-form' method='post' action='cfg/restore.cgi' encType='multipart/form-data'>
-		Select the configuration file to restore:<br>
-		<input type='file' size='40' id='restore-name' name='filename'> <input type='button' name='f_restore_button' id='restore-button' value='Restore' onclick='restoreButton()'>
-		<br>
+		<input type='file' size='40' id='restore-name' name='filename'>
+		<input type='button' name='f_restore_button' id='restore-button' value='Restore' onclick='restoreButton()'>
 	</form>
 </div>
 
diff --git a/release/src-rt-6.x.4708/router/www/admin-upgrade.asp b/release/src-rt-6.x.4708/router/www/admin-upgrade.asp
index 49b3c0a84a..34f5cc7574 100644
--- a/release/src-rt-6.x.4708/router/www/admin-upgrade.asp
+++ b/release/src-rt-6.x.4708/router/www/admin-upgrade.asp
@@ -101,10 +101,10 @@ function upgrade()
 
 		<br>
 		<table border=0>
-		<tr><td>Current Version:</td><td>&nbsp; <% version(1); %></td></tr>
+		<tr><td>Current Version:</td><td><% version(1); %></td></tr>
 		<script type='text/javascript'>
 		//	<% sysinfo(); %>
-		W('<tr><td>Free Memory:</td><td>&nbsp; ' + scaleSize(sysinfo.totalfreeram) + ' &nbsp; <small>(aprox. size that can be buffered completely in RAM)</small></td></tr>');
+		W('<tr><td>Free Memory:</td><td>' + scaleSize(sysinfo.totalfreeram) + ' &nbsp; <small>(approx. size that can be buffered completely in RAM)</small></td></tr>');
 		</script>
 		</table>
 
diff --git a/release/src-rt-6.x.4708/router/www/advanced-firewall.asp b/release/src-rt-6.x.4708/router/www/advanced-firewall.asp
index 30b57496aa..5cd125b603 100644
--- a/release/src-rt-6.x.4708/router/www/advanced-firewall.asp
+++ b/release/src-rt-6.x.4708/router/www/advanced-firewall.asp
@@ -131,11 +131,11 @@ function save()
 createFieldTable('', [
 	{ title: 'Respond to ICMP ping', name: 'f_icmp', type: 'checkbox', value: nvram.block_wan == '0' },
 	{ title: 'Limits per second', name: 'f_icmp_limit', type: 'checkbox', value: nvram.block_wan_limit != '0' },
-	{ title: 'ICMP', indent: 2, name: 'f_icmp_limit_icmp', type: 'text', maxlen: 3, size: 3, suffix: ' <small> request per second</small>', value: fixInt(nvram.block_wan_limit_icmp || 1, 1, 300, 5) },
-	{ title: 'Traceroute', indent: 2, name: 'f_icmp_limit_traceroute', type: 'text', maxlen: 3, size: 3, suffix: ' <small> request per second</small>', value: fixInt(nvram.block_wan_limit_tr || 5, 1, 300, 5) },
+	{ title: 'ICMP', indent: 2, name: 'f_icmp_limit_icmp', type: 'text', maxlen: 3, size: 3, suffix: ' <small>requests per second</small>', value: fixInt(nvram.block_wan_limit_icmp || 1, 1, 300, 5) },
+	{ title: 'Traceroute', indent: 2, name: 'f_icmp_limit_traceroute', type: 'text', maxlen: 3, size: 3, suffix: ' <small>requests per second</small>', value: fixInt(nvram.block_wan_limit_tr || 5, 1, 300, 5) },
 	null,
 	{ title: 'Enable SYN cookies', name: 'f_syncookies', type: 'checkbox', value: nvram.ne_syncookies != '0' },
-	{ title: 'Enable DSCP Fix', name: 'f_DSCP_fix_enable', type: 'checkbox', value: nvram.DSCP_fix_enable != '0', suffix: ' <small>Fixes Comcast incorrect DSCP</small>' },
+	{ title: 'Enable DSCP Fix', name: 'f_DSCP_fix_enable', type: 'checkbox', value: nvram.DSCP_fix_enable != '0', suffix: ' <small>(set DSCP to 0 for all WAN packets; primarily for Comcast)</small>' },
 	{ title: 'IPv6 IPSec Passthrough', name: 'f_ipv6_ipsec', type: 'checkbox', value: nvram.ipv6_ipsec != '0' }
 ]);
 </script>
diff --git a/release/src-rt-6.x.4708/router/www/advanced-misc.asp b/release/src-rt-6.x.4708/router/www/advanced-misc.asp
index a15e0984a5..b825ae99c7 100644
--- a/release/src-rt-6.x.4708/router/www/advanced-misc.asp
+++ b/release/src-rt-6.x.4708/router/www/advanced-misc.asp
@@ -92,7 +92,7 @@ createFieldTable('', [
 /* CTF-END */
 	{ title: 'Enable Jumbo Frames *', name: 'f_jumbo_frame_enable', type: 'checkbox', value: nvram.jumbo_frame_enable != '0', hidden: !et1000 },
 	{ title: 'Jumbo Frame Size *', name: 'jumbo_frame_size', type: 'text', maxlen: 4, size: 6, value: fixInt(nvram.jumbo_frame_size, 1, 9720, 2000),
-		suffix: ' <small>Bytes (range: 1 - 9720; default: 2000)</small>', hidden: !et1000 }
+		suffix: ' <small>bytes (range: 1 - 9720; default: 2000)</small>', hidden: !et1000 }
 ]);
 </script>
 <br>
diff --git a/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp b/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp
index 14de0949d2..72d62e303b 100644
--- a/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp
+++ b/release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp
@@ -1357,7 +1357,7 @@ function escapeText(s) {
 <div id='sesdiv' style='display:none'>
 
 <!-- / / / -->
-<div class='section-title'>Virtual Wireless Interfaces</div>
+<div class='section-title'>Virtual Wireless Interfaces (VIFs)</div>
 <div class='section'>
 
 <script type='text/javascript'>
@@ -1405,6 +1405,7 @@ createFieldTable('', [
 <div class='section-title'>Notes <small><i><a href='javascript:toggleVisibility("notes");'><span id='sesdivnotesshowhide'>(Click here to show)</span></a></i></small></div>
 <div class='section' id='sesdivnotes' style='display:none'>
 
+<i>Virtual Wireless Interfaces (VIFs):</i><br>
 <ul>
 <li><b>Interface</b> - Wireless VIF name.</li>
 <li><b>Enabled</b> - If this VIF should be active and brought online.</li>
@@ -1413,27 +1414,20 @@ createFieldTable('', [
 <li><b>Bridge</b> - Which LAN bridge this VIF should be assigned.</li>
 </ul>
 
-<ul>
 <!-- LINUX24-BEGIN -->
+<i>Options:</i><br>
+<ul>
 <li><b>Use alternate NAS startup(...)</b> - <i>Only meaningful for K24 builds</i> - Enable this option if you need more than one NAS process running (i.e. to handle WPAx encryption on more than one WLVIF).</li>
-<!-- LINUX24-END -->
 </ul>
+<!-- LINUX24-END -->
 
-<small>
-<ul>
-<li><b>Other relevant notes/hints:</b>
+<i>Other relevant notes/hints:</i><br>
 <ul>
-<li>When creating/defining a new wireless VIF, it's MAC address will be shown (incorrectly) as '00:00:00:00:00:00', as it's unknown at that moment (until network is restarted and this page is reloaded).</li>
+<li>When creating/defining a new wireless VIF, its MAC address will be shown incorrectly as 00:00:00:00:00:00, as it's unknown at that moment (until network is restarted and this page is reloaded).</li>
 <li>When saving changes, the MAC addresses of all defined non-primary wireless VIFs could sometimes be (already) <i>set</i> but might be <i>recreated</i> by the WL driver (so that previously defined/saved settings might need to be updated/changed accordingly on <a href=advanced-mac.asp>Advanced/MAC Address</a> after saving settings and rebooting your router).</li>
 <li>This web interface allows configuring a maximum of 4 VIFs for each physical wireless interface available - up to 3 extra VIFs can be defined in addition to the primary VIF (<i>on devices with multiple VIF capabilities</i>).</li>
 <li>By definition, configuration settings for the <i>primary VIF</i> of any physical wireless interfaces shouldn't be touched here (use the <a href=basic-network.asp>Basic/Network</a> page instead).</li>
 </ul>
-</ul>
-</small>
-
-</div>
-
-<!-- / / / -->
 
 </div>
 
diff --git a/release/src-rt-6.x.4708/router/www/basic-ddns.asp b/release/src-rt-6.x.4708/router/www/basic-ddns.asp
index 410c9f9fa9..ef7a38701a 100644
--- a/release/src-rt-6.x.4708/router/www/basic-ddns.asp
+++ b/release/src-rt-6.x.4708/router/www/basic-ddns.asp
@@ -441,7 +441,7 @@ for (i = 0; i < 2; ++i) {
 		{ title: 'Password', name: 'f_pass' + i, type: 'password', maxlen: 64, size: 35, peekaboo: 1, value: u[1], hidden: 1 },
 		{ title: 'Hostname', name: 'f_host' + i, type: 'text', maxlen: 255, size: 80, value: v[2], hidden: 1 },
 		{ title: 'URL', name: 'f_cust' + i, type: 'text', maxlen: 255, size: 80, value: v[6], hidden: 1 },
-		{ title: ' ', text: '(Use @IP for the current IP address)', rid: ('custmsg' + i), hidden: 1 },
+		{ title: ' ', text: '(Use @IP for the current WAN IP address)', rid: ('custmsg' + i), hidden: 1 },
 		{ title: 'Wildcard', indent: 2, name: 'f_wild' + i, type: 'checkbox', value: v[3] != '0', hidden: 1 },
 		{ title: 'MX', name: 'f_mx' + i, type: 'text', maxlen: 32, size: 35, value: v[4], hidden: 1 },
 		{ title: 'Backup MX', indent: 2, name: 'f_bmx' + i, type: 'checkbox', value: v[5] != '0', hidden: 1 },
diff --git a/release/src-rt-6.x.4708/router/www/basic-ipv6.asp b/release/src-rt-6.x.4708/router/www/basic-ipv6.asp
index b070f7cb08..15e29066cb 100644
--- a/release/src-rt-6.x.4708/router/www/basic-ipv6.asp
+++ b/release/src-rt-6.x.4708/router/www/basic-ipv6.asp
@@ -368,7 +368,8 @@ createFieldTable('', [
 	{ title: '6rd Routed Prefix', name: 'ipv6_6rd_prefix', type: 'text', maxlen: 46, size: 48, value: nvram.ipv6_6rd_prefix },
 	{ title: '6rd Prefix Length', name: 'ipv6_6rd_prefix_length', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_6rd_prefix_length, suffix: ' <small>(Usually 32)</small>' },
 	{ title: 'Prefix Length', name: 'f_ipv6_prefix_length', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_prefix_length },
-	{ title: 'Request PD Only', name: 'f_ipv6_pdonly', type: 'checkbox', value: (nvram.ipv6_pdonly != '0') },
+	{ title: 'Request PD Only', name: 'f_ipv6_pdonly', type: 'checkbox', value: (nvram.ipv6_pdonly != '0'),
+		suffix: ' <small>(enable for ISPs which require Prefix Delegation)</small>' },
 	{ title: 'Router IPv6 Address', multi: [
 		{ name: 'f_ipv6_rtr_addr_auto', type: 'select', options: [['0', 'Default'],['1','Manual']], value: (nvram.ipv6_rtr_addr == '' ? '0' : '1') },
 		{ name: 'f_ipv6_rtr_addr', type: 'text', maxlen: 46, size: 48, value: nvram.ipv6_rtr_addr }
@@ -404,16 +405,6 @@ createFieldTable('', [
 
 <!-- / / / -->
 
-<div class='section-title'>Notes</div>
-<div class='section'>
-<br>
-	<ul>
-	<li><b>Request PD Only:</b> Check for ISP's that require only a Prefix Delegation(usually PPPOE(Dsl,Fiber?) connections).</li>
-	</ul>
-</div>
-
-<!-- / / / -->
-
 </td></tr>
 <tr><td id='footer' colspan=2>
 	<span id='footer-msg'></span>
diff --git a/release/src-rt-6.x.4708/router/www/basic-network.asp b/release/src-rt-6.x.4708/router/www/basic-network.asp
index 2ad97c52a4..1e336fe31b 100644
--- a/release/src-rt-6.x.4708/router/www/basic-network.asp
+++ b/release/src-rt-6.x.4708/router/www/basic-network.asp
@@ -1658,7 +1658,7 @@ createFieldTable('', [
 		['disabled','Disabled']],
 		value: nvram.wan_proto },
 	{ title: 'Modem device', name: 'modem_dev', type: 'select', options: [['ttyUSB0', '/dev/ttyUSB0'],['ttyUSB1', '/dev/ttyUSB1'],['ttyUSB2', '/dev/ttyUSB2'],['ttyUSB3', '/dev/ttyUSB3'],['ttyUSB4', '/dev/ttyUSB4'],['ttyUSB5', '/dev/ttyUSB5'],['ttyUSB6', '/dev/ttyUSB6'],['ttyACM0', '/dev/ttyACM0']], value: nvram.modem_dev },
-	{ title: 'PIN Code', name: 'modem_pin', type: 'text', maxlen: 6, size: 8, value: nvram.modem_pin, suffix: ' <i>Advised to turn off PIN Code</i>' },
+	{ title: 'PIN Code', name: 'modem_pin', type: 'text', maxlen: 6, size: 8, value: nvram.modem_pin, suffix: ' <small>(advised to turn off PIN Code)</small>' },
 	{ title: 'Modem init string', name: 'modem_init', type: 'text', maxlen: 25, size: 32, value: nvram.modem_init },
 	{ title: 'APN', name: 'modem_apn', type: 'text', maxlen: 25, size: 32, value: nvram.modem_apn },
 	{ title: 'Username', name: 'ppp_username', type: 'text', maxlen: 60, size: 64, value: nvram.ppp_username },
@@ -1673,13 +1673,13 @@ createFieldTable('', [
 	{ title: 'Options', name: 'ppp_custom', type: 'text', maxlen: 256, size: 64, value: nvram.ppp_custom },
 	{ title: 'Connect Mode', name: 'ppp_demand', type: 'select', options: [['1', 'Connect On Demand'],['0', 'Keep Alive']],
 		value: nvram.ppp_demand },
-	{ title: 'Max Idle Time', indent: 2, name: 'ppp_idletime', type: 'text', maxlen: 5, size: 7, suffix: ' <i>(minutes)</i>',
+	{ title: 'Max Idle Time', indent: 2, name: 'ppp_idletime', type: 'text', maxlen: 5, size: 7, suffix: ' <small>minutes</small>',
 		value: nvram.ppp_idletime },
-	{ title: 'Redial Interval', indent: 2, name: 'ppp_redialperiod', type: 'text', maxlen: 5, size: 7, suffix: ' <i>(seconds)</i>',
+	{ title: 'Redial Interval', indent: 2, name: 'ppp_redialperiod', type: 'text', maxlen: 5, size: 7, suffix: ' <small>seconds</small>',
 		value: nvram.ppp_redialperiod },
-	{ title: 'LCP Echo Interval', indent: 2, name: 'pppoe_lei', type: 'text', maxlen: 5, size: 7, suffix: ' <i>seconds (range: 1 - 60; default: 10)</i>',
+	{ title: 'LCP Echo Interval', indent: 2, name: 'pppoe_lei', type: 'text', maxlen: 5, size: 7, suffix: ' <small>seconds (range: 1 - 60; default: 10)</small>',
 		value: nvram.pppoe_lei },
-	{ title: 'LCP Echo Link fail limit', indent: 2, name: 'pppoe_lef', type: 'text', maxlen: 5, size: 7, suffix: ' <i>(range: 1 - 10; default: 5)</i>',
+	{ title: 'LCP Echo Link fail limit', indent: 2, name: 'pppoe_lef', type: 'text', maxlen: 5, size: 7, suffix: ' <small>(range: 1 - 10; default: 5)</small>',
 		value: nvram.pppoe_lef },
 	{ title: 'Check Connection Every', name: 'modem_watchdog', type: 'text', maxlen: 6, size: 8, value: nvram.modem_watchdog, suffix: ' <i>minutes (range: 0 - 30, default: 2, set 0 to disable)</i>' },
 	{ title: 'MTU', multi: [
@@ -1687,7 +1687,7 @@ createFieldTable('', [
 		{ name: 'f_wan_mtu', type: 'text', maxlen: 4, size: 6, value: nvram.wan_mtu } ] },
 	{ title: 'Single Line MLPPP', name: 'f_ppp_mlppp', type: 'checkbox', value: (nvram.ppp_mlppp == 1) },
 
-	{ title: 'Route Modem IP', name: 'modem_ipaddr', type: 'text', maxlen: 15, size: 17, suffix: ' <i>(must be in different subnet to router, 0.0.0.0 to disable)</i>', value: nvram.modem_ipaddr },
+	{ title: 'Route Modem IP', name: 'modem_ipaddr', type: 'text', maxlen: 15, size: 17, suffix: ' <small>(must be in different subnet to router, 0.0.0.0 to disable)</small>', value: nvram.modem_ipaddr },
 
 	{ title: 'Bridge WAN port to primary LAN (br0)', name: 'f_wan_islan', type: 'checkbox', value: (nvram.wan_islan == 1) }
 ]);
@@ -1708,11 +1708,11 @@ dns = nvram.wan_dns.split(/\s+/);
 REMOVE-END */
 createFieldTable('', [
 	{ title: 'Default Gateway', name: 'lan_gateway', type: 'text', maxlen: 15, size: 17, value: nvram.lan_gateway },
-	{ title: 'Static DNS', suffix: '&nbsp; <i>(IP:port)</i>', name: 'f_dns_1', type: 'text', maxlen: 21, size: 25, value: dns[0] || '0.0.0.0' },
+	{ title: 'Static DNS', suffix: ' <small>(IP or IP:port)</small>', name: 'f_dns_1', type: 'text', maxlen: 21, size: 25, value: dns[0] || '0.0.0.0' },
 	{ title: '', name: 'f_dns_2', type: 'text', maxlen: 21, size: 25, value: dns[1] || '0.0.0.0' },
 	{ title: '', name: 'f_dns_3', type: 'text', maxlen: 21, size: 25, value: dns[2] || '0.0.0.0' },
 /* DNSSEC-BEGIN */
-	{ title: 'Enable DNSSEC', name: 'f_dnssec_enable', type: 'checkbox', suffix: ' <i>(must be supported by the upstream nameservers)</i>', value: (nvram.dnssec_enable == 1) },
+	{ title: 'Enable DNSSEC', name: 'f_dnssec_enable', type: 'checkbox', suffix: ' <small>(must be supported by upstream nameservers)</small>', value: (nvram.dnssec_enable == 1) },
 /* DNSSEC-END */
 /* DNSCRYPT-BEGIN */
 	{ title: 'Use dnscrypt-proxy', name: 'f_dnscrypt_proxy', type: 'checkbox', value: (nvram.dnscrypt_proxy == 1) },
@@ -1806,7 +1806,7 @@ if (wl_sunit(uidx)<0) {
 		{ title: 'Shared Key', indent: 2, name: 'wl'+u+'_radius_key', type: 'password', maxlen: 80, size: 32, peekaboo: 1,
 			suffix: ' <input type="button" id="_f_wl'+u+'_psk_random2" value="Random" onclick="random_psk(\'_wl'+u+'_radius_key\')">',
 			value: eval('nvram.wl'+u+'_radius_key') },
-		{ title: 'Group Key Renewal', indent: 2, name: 'wl'+u+'_wpa_gtk_rekey', type: 'text', maxlen: 4, size: 6, suffix: ' <i>(seconds)</i>',
+		{ title: 'Group Key Renewal', indent: 2, name: 'wl'+u+'_wpa_gtk_rekey', type: 'text', maxlen: 4, size: 6, suffix: ' <small>seconds</small>',
 			value: eval('nvram.wl'+u+'_wpa_gtk_rekey') },
 		{ title: 'Radius Server', indent: 2, multi: [
 			{ name: 'wl'+u+'_radius_ipaddr', type: 'text', maxlen: 15, size: 17, value: eval('nvram.wl'+u+'_radius_ipaddr') },
diff --git a/release/src-rt-6.x.4708/router/www/forward-basic-ipv6.asp b/release/src-rt-6.x.4708/router/www/forward-basic-ipv6.asp
index 704b2489a6..bc996951cc 100644
--- a/release/src-rt-6.x.4708/router/www/forward-basic-ipv6.asp
+++ b/release/src-rt-6.x.4708/router/www/forward-basic-ipv6.asp
@@ -114,7 +114,7 @@ fog.setup = function() {
 		{ type: 'text', maxlen: 140 },
 		{ type: 'text', maxlen: 16 },
 		{ type: 'text', maxlen: 32 }]);
-	this.headerSet(['On', 'Proto', 'Src Address', 'Dest Address', 'Dest Ports', 'Description']);
+	this.headerSet(['On', 'Protocol', 'Src Address', 'Dest Address', 'Dest Ports', 'Description']);
 	var nv = nvram.ipv6_portforward.split('>');
 	for (var i = 0; i < nv.length; ++i) {
 		var r;
@@ -183,20 +183,26 @@ function init()
 	<script type='text/javascript'>fog.setup();</script>
 </div>
 
-<div>
-Opens access to ports on machines inside the LAN, but does <b>not</b> re-map ports.
+<!-- / / / -->
+
+<div class='section-title'>Notes</div>
+<div class='section'>
+<ul>
+<li>Opens access to ports on machines inside the LAN, but does <b>not</b> re-map ports.</li>
+</ul>
+<i>IPv6 Port Forwarding:</i><br>
 <ul>
-<li><b>Src Address</b> <i>(optional)</i> - Forward only if from this address. Ex: "2001:4860:800b::/48", "me.example.com".
-<li><b>Dest Address</b> <i>(optional)</i> - The destination address inside the LAN.
-<li><b>Dest Ports</b> - The ports to be opened for forwarding. Ex: "2345", "200,300", "200-300,400".
+<li><b>Src Address</b> <i>(optional)</i> - Forward only if from this address (ex: "2001:4860:800b::/48", or "me.example.com").</li>
+<li><b>Dest Address</b> <i>(optional)</i> - The destination address inside the LAN.</li>
+<li><b>Dest Ports</b> - The ports to be opened for forwarding (ex: "2345", "200,300", "200-300,400").</li>
 </ul>
 </div>
 
+<!-- / / / -->
+
 <br>
 <script type='text/javascript'>show_notice1('<% notice("ip6tables"); %>');</script>
 
-<!-- / / / -->
-
 </td></tr>
 <tr><td id='footer' colspan=2>
 	<span id='footer-msg'></span>
diff --git a/release/src-rt-6.x.4708/router/www/forward-basic.asp b/release/src-rt-6.x.4708/router/www/forward-basic.asp
index 4991a9082a..4efbeb20c9 100644
--- a/release/src-rt-6.x.4708/router/www/forward-basic.asp
+++ b/release/src-rt-6.x.4708/router/www/forward-basic.asp
@@ -139,7 +139,7 @@ fog.setup = function() {
 		{ type: 'text', maxlen: 5 },
 		{ type: 'text', maxlen: 15 },
 		{ type: 'text', maxlen: 32 }]);
-	this.headerSet(['On', 'Proto', 'Src Address', 'Ext Ports', 'Int Port', 'Int Address', 'Description']);
+	this.headerSet(['On', 'Protocol', 'Src Address', 'Ext Ports', 'Int Port', 'Int Address', 'Description']);
 	var nv = nvram.portforward.split('>');
 	for (var i = 0; i < nv.length; ++i) {
 		var r;
@@ -218,22 +218,23 @@ function init()
 	<script type='text/javascript'>fog.setup();</script>
 </div>
 
-<div>
+<!-- / / / -->
+
+<div class='section-title'>Notes</div>
+<div class='section'>
 <ul>
-<li><b>Src Address</b> <i>(optional)</i> - Forward only if from this address. Ex: "1.2.3.4", "1.2.3.4 - 2.3.4.5", "1.2.3.0/24", "me.example.com".
-<li><b>Ext Ports</b> - The ports to be forwarded, as seen from the WAN. Ex: "2345", "200,300", "200-300,400".
-<li><b>Int Port</b> <i>(optional)</i> - The destination port inside the LAN. If blank, the destination port
-is the same as <i>Ext Ports</i>. Only one port per entry is supported when forwarding to a different internal
-port.
-<li><b>Int Address</b> - The destination address inside the LAN.
+<li><b>Src Address</b> <i>(optional)</i> - Forward only if from this address (ex: "1.2.3.4", "1.2.3.0/24", "1.2.3.4 - 2.3.4.5", or "me.example.com").</li>
+<li><b>Ext Ports</b> - The ports to be forwarded, as seen from the WAN (ex: "2345", "200,300", "200-300,400").</li>
+<li><b>Int Port</b> <i>(optional)</i> - The destination port inside the LAN. If blank, the destination port is the same as <i>Ext Ports</i>. Only one port per entry is supported when forwarding to a different internal port.</li>
+<li><b>Int Address</b> - The destination address inside the LAN.</li>
 </ul>
 </div>
 
+<!-- / / / -->
+
 <br>
 <script type='text/javascript'>show_notice1('<% notice("iptables"); %>');</script>
 
-<!-- / / / -->
-
 </td></tr>
 <tr><td id='footer' colspan=2>
 	<span id='footer-msg'></span>
diff --git a/release/src-rt-6.x.4708/router/www/forward-triggered.asp b/release/src-rt-6.x.4708/router/www/forward-triggered.asp
index eab7ee9488..a3d6c83223 100644
--- a/release/src-rt-6.x.4708/router/www/forward-triggered.asp
+++ b/release/src-rt-6.x.4708/router/www/forward-triggered.asp
@@ -163,12 +163,15 @@ function init()
 	<script type='text/javascript'>tg.setup();</script>
 </div>
 
-<div>
+<!-- / / / -->
+
+<div class='section-title'>Notes</div>
+<div class='section'>
 <ul>
-<li>Use "-" to specify a range of ports (200-300).
-<li>Trigger Ports are the initial LAN to WAN "trigger".
-<li>Forwarded Ports are the WAN to LAN ports that are opened if the "trigger" is activated.
-<li>These ports are automatically closed after a few minutes of inactivity.
+<li>Use "-" to specify a range of ports (ex. "200-300").</li>
+<li>Trigger Ports are the initial LAN to WAN "trigger".</li>
+<li>Forwarded Ports are the WAN to LAN ports that are opened if the "trigger" is activated.</li>
+<li>These ports are automatically closed after a few minutes of inactivity.</li>
 </ul>
 </div>
 
diff --git a/release/src-rt-6.x.4708/router/www/forward-upnp.asp b/release/src-rt-6.x.4708/router/www/forward-upnp.asp
index d40043bba9..0f7b88eb44 100644
--- a/release/src-rt-6.x.4708/router/www/forward-upnp.asp
+++ b/release/src-rt-6.x.4708/router/www/forward-upnp.asp
@@ -31,6 +31,10 @@
 #upnp-grid .co5 {
 	width: 53%;
 }
+textarea {
+	width: 98%;
+	height: 15em;
+}
 </style>
 
 <script type='text/javascript' src='debug.js'></script>
@@ -267,12 +271,11 @@ REMOVE-END */
 	{ title: 'LAN3', indent: 2, name: 'f_upnp_lan3', type: 'checkbox', value: (nvram.upnp_lan3 == '1') },
 	{ title: 'Show In My Network Places',  name: 'f_upnp_mnp',  type: 'checkbox',  value: (nvram.upnp_mnp == '1')},
 	null,
-	{ title: 'Miniupnpd</a><br>Custom configuration', name: 'upnp_custom', type: 'textarea', value: nvram.upnp_custom }
+	{ title: '<a href="https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/miniupnpd.conf" target="_new">Miniupnpd</a><br>Custom configuration', name: 'upnp_custom', type: 'textarea', value: nvram.upnp_custom }
 ]);
 </script>
 </div>
 
-
 <!-- / / / -->
 
 </td></tr>
diff --git a/release/src-rt-6.x.4708/router/www/tools-ping.asp b/release/src-rt-6.x.4708/router/www/tools-ping.asp
index 35fcf56fc6..e4c128c5e0 100644
--- a/release/src-rt-6.x.4708/router/www/tools-ping.asp
+++ b/release/src-rt-6.x.4708/router/www/tools-ping.asp
@@ -206,7 +206,7 @@ createFieldTable('', [
 	{ title: 'Address', name: 'f_addr', type: 'text', maxlen: 64, size: 32, value: '',
 		suffix: ' <input type="button" value="Ping" onclick="ping()" id="pingb">' },
 	{ title: 'Ping Count', name: 'f_count', type: 'text', maxlen: 2, size: 7, value: '5' },
-	{ title: 'Packet Size', name: 'f_size', type: 'text', maxlen: 5, size: 7, value: '56', suffix: ' <small>(bytes)</small>' }
+	{ title: 'Packet Size', name: 'f_size', type: 'text', maxlen: 5, size: 7, value: '56', suffix: ' <small>bytes</small>' }
 ]);
 </script>
 </div>
diff --git a/release/src-rt-6.x.4708/router/www/tools-trace.asp b/release/src-rt-6.x.4708/router/www/tools-trace.asp
index 6f455f769e..47013c0bdc 100644
--- a/release/src-rt-6.x.4708/router/www/tools-trace.asp
+++ b/release/src-rt-6.x.4708/router/www/tools-trace.asp
@@ -204,7 +204,7 @@ function init()
 createFieldTable('', [
 	{ title: 'Address', name: 'f_addr', type: 'text', maxlen: 64, size: 32, value: '', suffix: ' <input type="button" value="Trace" onclick="trace()" id="traceb">' },
 	{ title: 'Maximum Hops', name: 'f_hops', type: 'text', maxlen: 2, size: 4, value: '20' },
-	{ title: 'Maximum Wait Time', name: 'f_wait', type: 'text', maxlen: 2, size: 4, value: '3', suffix: ' <small>(seconds per hop)</small>' }
+	{ title: 'Maximum Wait Time', name: 'f_wait', type: 'text', maxlen: 2, size: 4, value: '3', suffix: ' <small>seconds (per hop)</small>' }
 ]);
 </script>
 </div>
-- 
2.11.4.GIT