diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/basic/Makefile | 2 | ||||
| -rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/BIG.FAT.WARNING | 2 | ||||
| -rw-r--r-- | scripts/kconfig/mconf.c | 12 | ||||
| -rw-r--r-- | scripts/kconfig/qconf.cc | 2 |
7 files changed, 12 insertions, 12 deletions
@@ -898,7 +898,7 @@ else # CONFIG_MODULES modules modules_install: FORCE @echo - @echo "The present kernel configuration has modules disabled." + @echo "The present busybox configuration has modules disabled." @echo "Type 'make config' and enable loadable module support." @echo "Then build a kernel with module support enabled." @echo diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index f22e94c3a..119f079cf 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile @@ -3,7 +3,7 @@ # The programs listed herein is what is needed to do the basic stuff, # such as splitting .config and fix dependency file. # This initial step is needed to avoid files to be recompiled -# when kernel configuration changes (which is what happens when +# when busybox configuration changes (which is what happens when # .config is included by main Makefile. # --------------------------------------------------------------------------- # fixdep: Used to generate dependency information during build process diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8012d1076..a95ba93e2 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -605,7 +605,7 @@ int main(int ac, char **av) check_conf(&rootmenu); } while (conf_cnt); if (conf_write(NULL)) { - fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); + fprintf(stderr, _("\n*** Error during writing of the busybox configuration.\n\n")); return 1; } return 0; diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 94118b059..5aabcec23 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -741,7 +741,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *intro_text = _( - "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" + "Welcome to gkc, the GTK+ graphical busybox configuration tool\n" "for Linux.\n" "For each option, a blank box indicates the feature is disabled, a\n" "check indicates it is enabled, and a dot indicates that it is to\n" diff --git a/scripts/kconfig/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING index a8999d82b..c9bfbb902 100644 --- a/scripts/kconfig/lxdialog/BIG.FAT.WARNING +++ b/scripts/kconfig/lxdialog/BIG.FAT.WARNING @@ -1,4 +1,4 @@ This is NOT the official version of dialog. This version has been significantly modified from the original. It is for use by the Linux -kernel configuration script. Please do not bother Savio Lam with +busybox configuration script. Please do not bother Savio Lam with questions about this program. diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 7f973195e..31a1f4cd9 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -115,7 +115,7 @@ static const char mconf_readme[] = N_( "-----------------------------\n" "Menuconfig supports the use of alternate configuration files for\n" "those who, for various reasons, find it necessary to switch\n" -"between different kernel configurations.\n" +"between different busybox configurations.\n" "\n" "At the end of the main menu you will find two options. One is\n" "for saving the current configuration to a file of your choosing.\n" @@ -1070,7 +1070,7 @@ int main(int ac, char **av) do { cprint_init(); cprint("--yesno"); - cprint(_("Do you wish to save your new kernel configuration?")); + cprint(_("Do you wish to save your new busybox configuration?")); cprint("5"); cprint("60"); stat = exec_conf(); @@ -1079,18 +1079,18 @@ int main(int ac, char **av) if (stat == 0) { if (conf_write(NULL)) { fprintf(stderr, _("\n\n" - "Error during writing of the kernel configuration.\n" - "Your kernel configuration changes were NOT saved." + "Error during writing of the busybox configuration.\n" + "Your busybox configuration changes were NOT saved." "\n\n")); return 1; } printf(_("\n\n" - "*** End of Linux kernel configuration.\n" + "*** End of busybox configuration.\n" "*** Execute 'make' to build the kernel or try 'make help'." "\n\n")); } else { fprintf(stderr, _("\n\n" - "Your kernel configuration changes were NOT saved." + "Your busybox configuration changes were NOT saved." "\n\n")); } diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 4590cd316..74b8470e8 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1299,7 +1299,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) void ConfigMainWindow::showIntro(void) { - static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" + static char str[] = "Welcome to the qconf graphical busybox configuration tool for Linux.\n\n" "For each option, a blank box indicates the feature is disabled, a check\n" "indicates it is enabled, and a dot indicates that it is to be compiled\n" "as a module. Clicking on the box will cycle through the three states.\n\n" |