master david says: stay closer to what it actually does. Still keeping the deeper sense in the help

svn path=/trunk/kdebase/src/kreadconfig/; revision=380175

src/kreadconfig/kreadconfig.cpp

@@ -39,7 +39,7 @@ static KCmdLineOptions options[] =
         { "key <key>", I18N_NOOP("Key to look for"), 0 },
         { "default <default>", I18N_NOOP("Default value"), 0 },
 	{ "type <type>", I18N_NOOP("Type of variable"), 0 },
-	{ "merged", I18N_NOOP("Ensure kiosk settings are honored (slow)"), "KDE" },
+	{ "usekdeglobals", I18N_NOOP("Read KDE global config. Also ensures kiosk settings are honored"), "KDE" },
         KCmdLineLastOption
 };
 int main(int argc, char **argv)
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 	   konfig = KGlobal::config();
 	else
         {
-	   konfig = new KConfig(file, true, args->isSet("merged"));
+	   konfig = new KConfig(file, true, args->isSet("usekdeglobals"));
            configMustDeleted=true;
         }
 	konfig->setGroup(group);