diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
| commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
| tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/grub.scm | |
| parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
| parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu/packages/grub.scm')
| -rw-r--r-- | gnu/packages/grub.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index fabbbc439d..398a6d4e49 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -101,7 +101,7 @@ (description "GRUB is a multiboot bootloader. It is used for initially loading the kernel of an operating system and then transferring control to it. The kernel -then goes on to load the rest of the operating system. As a multiboot +then goes on to load the rest of the operating system. As a multiboot bootloader, GRUB handles the presence of multiple operating systems installed on the same computer; upon booting the computer, the user is presented with a menu to select one of the installed operating systems.") |