From 29edfac4a1dbb77ed0fc876060eac87358617c84 Mon Sep 17 00:00:00 2001
From: Vicente <Victek@tomatoraf.com>
Date: Mon, 5 Aug 2013 23:37:12 +0200
Subject: [PATCH] SSID: Respect ASCII character Label. RAM: Typos in RAM type
 and label. QoS: Information message, BW & QoS are not compatible.

---
 release/src/router/nvram/defaults.c        | 6 +++---
 release/src/router/www/basic-network.asp   | 2 +-
 release/src/router/www/qoslimit.asp        | 2 +-
 release/src/router/www/status-overview.asp | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 14a023ee7a..edb08ebd9a 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -195,9 +195,9 @@ const defaults_t defaults[] = {
 	{ "wl_corerev",			""				},	// Current core revision
 	{ "wl_phytypes",		""				},	// List of supported wireless bands (e.g. "ga")
 	{ "wl_radioids",		""				},	// List of radio IDs
-	{ "wl_ssid",			"Tomato_RAF24"	},	// Service set ID (network name)
-	{ "wl1_ssid",			"Tomato_RAF50"	},
-	{ "wl_country_code",	""				},		// Country (default obtained from driver)
+	{ "wl_ssid",			"TomatoRAF24"			},	// Service set ID (network name for 2.4GHz)
+	{ "wl1_ssid",			"TomatoRAF50"			},	// Service set ID (network name for 5GHz)
+	{ "wl_country_code",		""				},	// Country (default obtained from driver)
 	{ "wl_radio",			"1"				},	// Enable (1) or disable (0) radio
 	{ "wl1_radio",			"1"				},	// Enable (1) or disable (0) radio
 	{ "wl_closed",			"0"				},	// Closed (hidden) network
diff --git a/release/src/router/www/basic-network.asp b/release/src/router/www/basic-network.asp
index f4888b3e6a..1b5e9d4e3b 100644
--- a/release/src/router/www/basic-network.asp
+++ b/release/src/router/www/basic-network.asp
@@ -1804,7 +1804,7 @@ if (wl_sunit(uidx)<0) {
 		{ title: 'Wireless Network Mode', name: 'wl'+u+'_net_mode', type: 'select',
 			value: (eval('nvram.wl'+u+'_net_mode') == 'disabled') ? 'mixed' : eval('nvram.wl'+u+'_net_mode'),
 			options: [], prefix: '<span id="__wl'+u+'_net_mode">', suffix: '</span>' },
-		{ title: 'SSID', name: 'wl'+u+'_ssid', type: 'text', maxlen: 32, size: 34, value: eval('nvram.wl'+u+'_ssid') },
+		{ title: 'SSID', name: 'wl'+u+'_ssid', type: 'text', maxlen: 32, size: 34, suffix: ' <i>(for full compatibility use only ASCII characters, avoid symbols!)</i>', value: eval('nvram.wl'+u+'_ssid') },
 		{ title: 'Broadcast', indent: 2, name: 'f_wl'+u+'_bcast', type: 'checkbox', value: (eval('nvram.wl'+u+'_closed') == '0') },
 		{ title: 'Channel', name: 'wl'+u+'_channel', type: 'select', options: ghz[uidx], prefix: '<span id="__wl'+u+'_channel">', suffix: '</span> <input type="button" id="_f_wl'+u+'_scan" value="Scan" onclick="scanButton('+u+')"> <img src="spin.gif" id="spin'+u+'">',
 			value: eval('nvram.wl'+u+'_channel') },
diff --git a/release/src/router/www/qoslimit.asp b/release/src/router/www/qoslimit.asp
index d52ebe7942..48ab70730c 100644
--- a/release/src/router/www/qoslimit.asp
+++ b/release/src/router/www/qoslimit.asp
@@ -253,7 +253,7 @@ function init()
 	<div class='section'>
 		<script type='text/javascript'>
 			createFieldTable('', [
-			{ title: 'Enable Limiter', name: 'f_qosl_enable', type: 'checkbox', value: nvram.qosl_enable != '0' },
+			{ title: 'Enable Limiter', name: 'f_qosl_enable', type: 'checkbox', suffix: ' <i>(BW Limiter and QoS cannot work at once!)</i>', value: nvram.qosl_enable != '0' },
 			{ title: 'Max Download Bandwidth <small>(same as used by QOS)', name: 'qos_ibw', type: 'text', maxlen: 6, size: 8, suffix: ' <small>kbit/s</small>', value: nvram.qos_ibw },
 			{ title: 'Max Upload Bandwidth <small>(same as used by QOS)', name: 'qos_obw', type: 'text', maxlen: 6, size: 8, suffix: ' <small>kbit/s</small>', value: nvram.qos_obw }
 			]);
diff --git a/release/src/router/www/status-overview.asp b/release/src/router/www/status-overview.asp
index 715645346e..9d21a2a11f 100644
--- a/release/src/router/www/status-overview.asp
+++ b/release/src/router/www/status-overview.asp
@@ -356,10 +356,10 @@ createFieldTable('', [
 	null,
 	{ title: 'Date & Time', rid: 'time', text: stats.time },
 	{ title: 'Uptime', rid: 'uptime', text: stats.uptime },
-	{ title: 'RAM Flash Size', text: stats.flashsize },
-	{ title: 'Total / Free RAM', rid: 'memory', text: stats.memory },
-	{ title: 'Total / Free NVRAM', text: scaleSize(nvstat.size) + ' / ' + scaleSize(nvstat.free) + ' <small>(' + (a).toFixed(2) + '%)</small>' },
-	{ title: 'Total / Free Swap Memory', rid: 'swap', text: stats.swap, hidden: (stats.swap == '') }
+	{ title: 'Flash RAM Size', text: stats.flashsize },
+	{ title: 'RAM Size / Free', rid: 'memory', text: stats.memory },
+	{ title: 'NVRAM Size / Free', text: scaleSize(nvstat.size) + ' / ' + scaleSize(nvstat.free) + ' <small>(' + (a).toFixed(2) + '%)</small>' },
+	{ title: 'SWAP Memory Size / Free', rid: 'swap', text: stats.swap, hidden: (stats.swap == '') }
 ]);
 </script>
 </div>
-- 
2.11.4.GIT