- replace some occurances of "kernel" with busybox

4 files changed, 14 insertions, 14 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index ca722b05d..02693b791 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -556,10 +556,10 @@ int main(int ac, char **av)
         case ask_silent:
                 if (stat(".config", &tmpstat)) {
                         printf(_("***\n"
-                                "*** You have not yet configured your kernel!\n"
+                                "*** You have not yet configured busybox!\n"
                                 "***\n"
                                 "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
-                                "*** \"make menuconfig\" or \"make xconfig\").\n"
+                                "*** \"make menuconfig\" or \"make defconfig\").\n"
                                 "***\n"));
                         exit(1);
                 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 293044654..f3f76dd99 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -27,7 +27,7 @@ const char conf_defname[] = "scripts/defconfig";
 const char *conf_confnames[] = {
         ".config",
         "/lib/modules/$UNAME_RELEASE/.config",
-        "/etc/kernel-config",
+        "/etc/busybox-config",
         "/boot/config-$UNAME_RELEASE",
         conf_defname,
         NULL,
@@ -385,7 +385,7 @@ int conf_write(const char *name)
 
         fprintf(out, _("#\n"
                        "# Automatically generated make config: don't edit\n"
-                       "# Linux kernel version: %s\n"
+                       "# Busybox version: %s\n"
                        "%s%s"
                        "#\n"),
                      sym_get_string_value(sym),
@@ -409,7 +409,7 @@ int conf_write(const char *name)
                 }
                 fprintf(out_h, "/*\n"
                                " * Automatically generated C config: don't edit\n"
-                               " * Linux kernel version: %s\n"
+                               " * Busybox version: %s\n"
                                " */\n"
                                "%s"
                                "\n",
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 24fef151c..810b018f1 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -29,10 +29,10 @@ static char menu_backtitle[128];
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some kernel features may be built directly into the kernel.\n"
-"Some may be made into loadable runtime modules.  Some features\n"
+"Some features may be built directly into busybox.\n"
+"Some may be made into standalone applets.  Some features\n"
 "may be completely removed altogether.  There are also certain\n"
-"kernel parameters which are not really features, but must be\n"
+"parameters which are not really features, but must be\n"
 "entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
 "Menu items beginning with [*], <M> or [ ] represent features\n"
@@ -148,7 +148,7 @@ static const char mconf_readme[] = N_(
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the kernel options listed in a single\n"
+"If you prefer to have all of the busybox options listed in a single\n"
 "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
 "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
@@ -193,11 +193,11 @@ load_config_text[] = N_(
         "last retrieved.  Leave blank to abort."),
 load_config_help[] = N_(
         "\n"
-        "For various reasons, one may wish to keep several different kernel\n"
+        "For various reasons, one may wish to keep several different busybox\n"
         "configurations available on a single machine.\n"
         "\n"
-        "If you have saved a previous configuration in a file other than the\n"
-        "kernel's default, entering the name of the file here will allow you\n"
+        "If you have saved a previous configuration in a file other than \n"
+        "busybox's default, entering the name of the file here will allow you\n"
         "to modify that configuration.\n"
         "\n"
         "If you are uncertain, then you have probably never used alternate\n"
@@ -207,7 +207,7 @@ save_config_text[] = N_(
         "as an alternate.  Leave blank to abort."),
 save_config_help[] = N_(
         "\n"
-        "For various reasons, one may wish to keep different kernel\n"
+        "For various reasons, one may wish to keep different busybox\n"
         "configurations available on a single machine.\n"
         "\n"
         "Entering a file name here will allow you to later retrieve, modify\n"
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 74b8470e8..605b02593 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1317,7 +1317,7 @@ void ConfigMainWindow::showIntro(void)
 void ConfigMainWindow::showAbout(void)
 {
         static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n\n"
-                "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n";
+                "Bug reports and feature request can also be entered at http://bugs.busybox.net/\n";
 
         QMessageBox::information(this, "qconf", str);
 }