From 3b5f3ca7b5aacaadb60a02a1f1a8f842c85aebc4 Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Fri, 4 Nov 2011 10:48:12 +0100
Subject: [PATCH] cosmetics

---
 release/src/router/nvram/defaults.c | 8 ++++----
 release/src/router/www/Makefile     | 2 +-
 release/src/router/www/tomato.js    | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 1cdc3da016..f43b7a19a6 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -182,8 +182,8 @@ 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_ssid",			"Tomato24"		},	// Service set ID (network name)
+	{ "wl1_ssid",			"Tomato50"		},
 	{ "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
@@ -350,7 +350,7 @@ const defaults_t defaults[] = {
 	{ "ddnsx_refresh",		"28"			},
 
 // basic-ident
-	{ "router_name",		"tomatoRAF"		},
+	{ "router_name",		"TomatoUSB"		},
 	{ "wan_hostname",		"unknown"		},
 	{ "wan_domain",			""				},
 
@@ -1057,7 +1057,7 @@ const defaults_t defaults[] = {
 #ifdef TCONFIG_NOCAT
 	{ "NC_enable",				"0"			}, // enable NoCatSplash
 	{ "NC_Verbosity",			"2"			},
-	{ "NC_GatewayName",			"Tomato RAF Portal"	},
+	{ "NC_GatewayName",			"Tomato Captive Portal"	},
 	{ "NC_GatewayPort",			"5280"			},
 	{ "NC_GatewayMode",			"Open"			},
 	{ "NC_DocumentRoot",			"/tmp/splashd"		},
diff --git a/release/src/router/www/Makefile b/release/src/router/www/Makefile
index 106f99f15a..28701de25a 100644
--- a/release/src/router/www/Makefile
+++ b/release/src/router/www/Makefile
@@ -165,7 +165,7 @@ endif
 
 	cd $(INSTALLDIR)/www && \
 	for F in $(wildcard *.asp); do \
-		sed -e "s,<div class='version'>Version <% version(); %></div>,<div class='version'>Version <% version(); %> RAF by shibby</div>," $$F > $$F.tmp; \
+		sed -e "s,<div class='version'>Version <% version(); %></div>,<div class='version'>Version <% version(); %> by shibby</div>," $$F > $$F.tmp; \
 		mv $$F.tmp $$F; \
 	done
 
diff --git a/release/src/router/www/tomato.js b/release/src/router/www/tomato.js
index f9e771160f..f8af3ffcfc 100644
--- a/release/src/router/www/tomato.js
+++ b/release/src/router/www/tomato.js
@@ -2398,12 +2398,10 @@ function navi()
 			['View Details',	'detailed.asp'],
 			['Transfer Rates',	'ctrate.asp']
 			] ],
-		['RAF Features',		'new', 0, [
+		['Bandwidth Limiter',	'new-qoslimit.asp'],
 /* NOCAT-BEGIN */
-			['Captive Portal',	'splashd.asp'],
+		['Captive Portal',	'new-splashd.asp'],
 /* NOCAT-END */
-			['MAC/IP BW Limit',	'qoslimit.asp']
-			] ],
 		['Access Restriction',	'restrict.asp'],
 /* REMOVE-BEGIN
 		['Scripts',				'sc', 0, [
-- 
2.11.4.GIT