2 files changed, 10 insertions, 17 deletions
diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
index beaa1b7eb..d26dc20bc 100644
--- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
+++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
@@ -18,7 +18,7 @@ function index()
 	require("luci.i18n")
 	local i18n = luci.i18n.translate
 
-	entry( { "admin", "services", "coovachilli" },            cbi("coovachilli"),         i18n("coovachilli",         "coovachilli"),                 90)
+	entry( { "admin", "services", "coovachilli" },            cbi("coovachilli"),         i18n("coovachilli",         "CoovaChilli"),                90)
 	entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("coovachilli_network", "Network Configuration"),      10)
 	entry( { "admin", "services", "coovachilli", "radius"  }, cbi("coovachilli_radius"),  i18n("coovachilli_radius",  "Radius Configuration"),       20)
 	entry( { "admin", "services", "coovachilli", "auth"    }, cbi("coovachilli_auth"),    i18n("coovachilli_auth",    "UAM and MAC Authentication"), 30)
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
index 49c4fe57d..e97987dd7 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
+++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
@@ -17,22 +17,15 @@ $Id$
 m = Map("coovachilli")
 
 -- general
-s1 = m:section(TypedSection, "general")
-s1.anonymous = true
-
-s1:option( Flag, "debug" )
-s1:option( Value, "interval" )
-s1:option( Value, "pidfile" ).optional = true
-s1:option( Value, "statedir" ).optional = true
-s1:option( Value, "cmdsock" ).optional = true
-s1:option( Value, "logfacility" ).optional = true
-
--- remote config management
-s2 = m:section(TypedSection, "remoteconfig")
-s2.anonymous = true
-
-s2:option( Value, "confusername" )
-s2:option( Value, "confpassword" )
+s = m:section(TypedSection, "general")
+s.anonymous = true
+
+s:option( Flag, "debug" )
+s:option( Value, "interval" )
+s:option( Value, "pidfile" ).optional = true
+s:option( Value, "statedir" ).optional = true
+s:option( Value, "cmdsock" ).optional = true
+s:option( Value, "logfacility" ).optional = true
 
 
 return m