Hi,
On Dec/26/2009, Robert Millan wrote:
> On Sat, Dec 26, 2009 at 11:20:27AM +0100, Carles Pina i Estany wrote:
> > cmd_linux = grub_register_command ("linux", grub_cmd_linux,
> > - 0, "Load linux.");
> > + 0, "Load a Linux kernel.");
>
> The construct "Linux kernel" is very ambigous because it's not clear if
> it means "the kernel known as Linux" or "the kernel of Linux". Some
> people missinterpret it as "the kernel of Linux", leading to the
> long-standing confusion you probably heard about (but I'll paste
> a link anyway, for the sake of everyone else ;-)):
>
> http://www.gnu.org/gnu/linux-and-gnu.html
yeap I heard.
When I was writig that I was thinking it. I was interpreting as: "From
the available kernels, load a Linux one.". Like having multiple kernels
and loading a Linux one.
Never mind, it's ambigous.
> But I agree it should be capitalized. Please make that "Load Linux.".
done (see attached patch).
> For consistency, these could read "Load XNU.". If that's too confusing,
> maybe "Load XNU (kernel of Darwin)" or something like that. Vladimir what
> do you think?
I send attached a new patch. Let me to comment here the relevant
changes against the previous patch:
=== modified file 'loader/i386/bsd.c'
--- loader/i386/bsd.c 2009-12-26 10:01:33 +0000
+++ loader/i386/bsd.c 2009-12-26 17:38:12 +0000
@@ -1280,15 +1280,15 @@ GRUB_MOD_INIT (bsd)
{
cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of FreeBSD.",
+ "FILE", "Load FreeBSD kernel.",
freebsd_opts);
cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of OpenBSD.",
+ "FILE", "Load OpenBSD kernel.",
openbsd_opts);
cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of NetBSD.",
+ "FILE", "Load NetBSD kernel.",
netbsd_opts);
how it sounds? maybe easier to read (if correct) "Load NetBSD kernel."
than other way?
XNU now is:
cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0,
- "Load a xnu kernel.");
+ "Load XNU.");
cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
- 0, "Load a 64-bit xnu kernel.");
+ 0, "Load 64-bit XNU.");
cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0,
"Load XNU extension package.");
cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
Vladimir, would you change something?
Thanks,
--
Carles Pina i Estany
http://pinux.info
=== modified file 'ChangeLog'
--- ChangeLog 2009-12-26 11:08:22 +0000
+++ ChangeLog 2009-12-26 17:34:40 +0000
@@ -1,5 +1,15 @@
2009-12-26 Carles Pina i Estany <car...@pina.cat>
+ * loader/i386/efi/linux.c (GRUB_MOD_INIT): Improve command summary.
+ * loader/i386/ieee1275/linux.c (GRUB_MOD_INIT): Likewise.
+ * loader/i386/linux.c (GRUB_MOD_INIT): Likewise.
+ * loader/i386/pc/linux.c (GRUB_MOD_INIT): Likewise.
+ * loader/powerpc/ieee1275/linux.c (GRUB_MOD_INIT): Likewise.
+ * loader/sparc64/ieee1275/linux.c (GRUB_MOD_INIT): Likewise.
+ * loader/xnu.c (GRUB_MOD_INIT): Likewise.
+
+2009-12-26 Carles Pina i Estany <car...@pina.cat>
+
* video/readers/jpeg.c (cmd): Declare.
(grub_cmd_jpegtest): Use `grub_command_t' type.
(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
@@ -16,7 +26,7 @@
Assign to `cmd'.
(GRUB_MOD_FINI): Use `cmd' to unregister.
-2009-12-26 Carles Pina i Estany <car...@pina.cat>
+2009-12-27 Carles Pina i Estany <car...@pina.cat>
* efiemu/main.c (GRUB_MOD_INIT): Fix capitalizations and/or full
stops.
=== modified file 'loader/i386/bsd.c'
--- loader/i386/bsd.c 2009-12-26 10:01:33 +0000
+++ loader/i386/bsd.c 2009-12-26 17:38:12 +0000
@@ -1280,15 +1280,15 @@ GRUB_MOD_INIT (bsd)
{
cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of FreeBSD.",
+ "FILE", "Load FreeBSD kernel.",
freebsd_opts);
cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of OpenBSD.",
+ "FILE", "Load OpenBSD kernel.",
openbsd_opts);
cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
GRUB_COMMAND_FLAG_BOTH,
- "FILE", "Load kernel of NetBSD.",
+ "FILE", "Load NetBSD kernel.",
netbsd_opts);
cmd_freebsd_loadenv =
grub_register_command ("kfreebsd_loadenv", grub_cmd_freebsd_loadenv,
=== modified file 'loader/i386/efi/linux.c'
--- loader/i386/efi/linux.c 2009-12-26 10:01:33 +0000
+++ loader/i386/efi/linux.c 2009-12-26 17:35:01 +0000
@@ -989,9 +989,9 @@ static grub_command_t cmd_linux, cmd_ini
GRUB_MOD_INIT(linux)
{
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
- 0, "Load linux.");
+ 0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
- 0, "Load initrd.");
+ 0, "Load an initrd.");
my_mod = mod;
}
=== modified file 'loader/i386/ieee1275/linux.c'
--- loader/i386/ieee1275/linux.c 2009-12-26 10:01:33 +0000
+++ loader/i386/ieee1275/linux.c 2009-12-26 17:35:13 +0000
@@ -276,9 +276,9 @@ static grub_command_t cmd_linux, cmd_ini
GRUB_MOD_INIT(linux)
{
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
- 0, "Load linux.");
+ 0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
- 0, "Load initrd.");
+ 0, "Load an initrd.");
my_mod = mod;
}
=== modified file 'loader/i386/linux.c'
--- loader/i386/linux.c 2009-12-26 10:01:33 +0000
+++ loader/i386/linux.c 2009-12-26 17:35:32 +0000
@@ -982,9 +982,9 @@ static grub_command_t cmd_linux, cmd_ini
GRUB_MOD_INIT(linux)
{
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
- 0, "Load linux.");
+ 0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
- 0, "Load initrd.");
+ 0, "Load an initrd.");
my_mod = mod;
}
=== modified file 'loader/i386/pc/linux.c'
--- loader/i386/pc/linux.c 2009-12-26 10:01:33 +0000
+++ loader/i386/pc/linux.c 2009-12-26 17:35:22 +0000
@@ -383,10 +383,10 @@ GRUB_MOD_INIT(linux16)
{
cmd_linux =
grub_register_command ("linux16", grub_cmd_linux,
- 0, "Load linux.");
+ 0, "Load Linux.");
cmd_initrd =
grub_register_command ("initrd16", grub_cmd_initrd,
- 0, "Load initrd.");
+ 0, "Load an initrd.");
my_mod = mod;
}
=== modified file 'loader/powerpc/ieee1275/linux.c'
--- loader/powerpc/ieee1275/linux.c 2009-12-26 10:01:33 +0000
+++ loader/powerpc/ieee1275/linux.c 2009-12-26 17:35:41 +0000
@@ -349,7 +349,7 @@ static grub_command_t cmd_linux, cmd_ini
GRUB_MOD_INIT(linux)
{
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
- 0, "Load a linux kernel.");
+ 0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
0, "Load an initrd.");
my_mod = mod;
=== modified file 'loader/sparc64/ieee1275/linux.c'
--- loader/sparc64/ieee1275/linux.c 2009-12-26 10:01:33 +0000
+++ loader/sparc64/ieee1275/linux.c 2009-12-26 17:35:57 +0000
@@ -516,7 +516,7 @@ GRUB_MOD_INIT(linux)
fetch_translations ();
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
- 0, "Load a linux kernel.");
+ 0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
0, "Load an initrd".);
my_mod = mod;
=== modified file 'loader/xnu.c'
--- loader/xnu.c 2009-12-26 10:01:33 +0000
+++ loader/xnu.c 2009-12-26 17:38:41 +0000
@@ -1404,9 +1404,9 @@ static grub_command_t cmd_kextdir, cmd_r
GRUB_MOD_INIT(xnu)
{
cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0,
- "Load a xnu kernel.");
+ "Load XNU.");
cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64,
- 0, "Load a 64-bit xnu kernel.");
+ 0, "Load 64-bit XNU.");
cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0,
"Load XNU extension package.");
cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
