dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch

d9d99f
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
d9d99f
From: Peter Jones <pjones@redhat.com>
d9d99f
Date: Fri, 6 May 2016 18:43:08 -0400
d9d99f
Subject: [PATCH] Make our info pages say "grub2" where appropriate.
d9d99f
d9d99f
This needs to be hooked up to --program-transform=, but I haven't had
d9d99f
time.
d9d99f
d9d99f
Signed-off-by: Peter Jones <pjones@redhat.com>
d9d99f
---
d9d99f
 docs/grub-dev.texi |   4 +-
d9d99f
 docs/grub.texi     | 318 ++++++++++++++++++++++++++---------------------------
d9d99f
 2 files changed, 161 insertions(+), 161 deletions(-)
d9d99f
d9d99f
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
d9d99f
index a9f4de6318c..3ce827ab726 100644
d9d99f
--- a/docs/grub-dev.texi
d9d99f
+++ b/docs/grub-dev.texi
d9d99f
@@ -1,7 +1,7 @@
d9d99f
 \input texinfo
d9d99f
 @c -*-texinfo-*-
d9d99f
 @c %**start of header
d9d99f
-@setfilename grub-dev.info
d9d99f
+@setfilename grub2-dev.info
d9d99f
 @include version-dev.texi
d9d99f
 @settitle GNU GRUB Developers Manual @value{VERSION}
d9d99f
 @c Unify all our little indices for now.
d9d99f
@@ -32,7 +32,7 @@ Invariant Sections.
d9d99f
 
d9d99f
 @dircategory Kernel
d9d99f
 @direntry
d9d99f
-* grub-dev: (grub-dev).                 The GRand Unified Bootloader Dev
d9d99f
+* grub2-dev: (grub2-dev).                 The GRand Unified Bootloader Dev
d9d99f
 @end direntry
d9d99f
 
d9d99f
 @setchapternewpage odd
d9d99f
diff --git a/docs/grub.texi b/docs/grub.texi
d9d99f
index a7155c22ffe..2b7b7faf847 100644
d9d99f
--- a/docs/grub.texi
d9d99f
+++ b/docs/grub.texi
d9d99f
@@ -1,7 +1,7 @@
d9d99f
 \input texinfo
d9d99f
 @c -*-texinfo-*-
d9d99f
 @c %**start of header
d9d99f
-@setfilename grub.info
d9d99f
+@setfilename grub2.info
d9d99f
 @include version.texi
d9d99f
 @settitle GNU GRUB Manual @value{VERSION}
d9d99f
 @c Unify all our little indices for now.
d9d99f
@@ -32,15 +32,15 @@ Invariant Sections.
d9d99f
 
d9d99f
 @dircategory Kernel
d9d99f
 @direntry
d9d99f
-* GRUB: (grub).                 The GRand Unified Bootloader
d9d99f
-* grub-install: (grub)Invoking grub-install.    Install GRUB on your drive
d9d99f
-* grub-mkconfig: (grub)Invoking grub-mkconfig.  Generate GRUB configuration
d9d99f
-* grub-mkpasswd-pbkdf2: (grub)Invoking grub-mkpasswd-pbkdf2.
d9d99f
-* grub-mkrelpath: (grub)Invoking grub-mkrelpath.
d9d99f
-* grub-mkrescue: (grub)Invoking grub-mkrescue.  Make a GRUB rescue image
d9d99f
-* grub-mount: (grub)Invoking grub-mount.        Mount a file system using GRUB
d9d99f
-* grub-probe: (grub)Invoking grub-probe.        Probe device information
d9d99f
-* grub-script-check: (grub)Invoking grub-script-check.
d9d99f
+* GRUB2: (grub2).                 The GRand Unified Bootloader
d9d99f
+* grub2-install: (grub2)Invoking grub2-install.    Install GRUB on your drive
d9d99f
+* grub2-mkconfig: (grub2)Invoking grub2-mkconfig.  Generate GRUB configuration
d9d99f
+* grub2-mkpasswd-pbkdf2: (grub2)Invoking grub2-mkpasswd-pbkdf2.
d9d99f
+* grub2-mkrelpath: (grub2)Invoking grub2-mkrelpath.
d9d99f
+* grub2-mkrescue: (grub2)Invoking grub2-mkrescue.  Make a GRUB rescue image
d9d99f
+* grub2-mount: (grub2)Invoking grub2-mount.        Mount a file system using GRUB
d9d99f
+* grub2-probe: (grub2)Invoking grub2-probe.        Probe device information
d9d99f
+* grub2-script-check: (grub2)Invoking grub2-script-check.
d9d99f
 @end direntry
d9d99f
 
d9d99f
 @setchapternewpage odd
d9d99f
@@ -103,15 +103,15 @@ This edition documents version @value{VERSION}.
d9d99f
 * Platform-specific operations:: Platform-specific operations
d9d99f
 * Supported kernels::           The list of supported kernels
d9d99f
 * Troubleshooting::             Error messages produced by GRUB
d9d99f
-* Invoking grub-install::       How to use the GRUB installer
d9d99f
-* Invoking grub-mkconfig::      Generate a GRUB configuration file
d9d99f
-* Invoking grub-mkpasswd-pbkdf2::
d9d99f
+* Invoking grub2-install::       How to use the GRUB installer
d9d99f
+* Invoking grub2-mkconfig::      Generate a GRUB configuration file
d9d99f
+* Invoking grub2-mkpasswd-pbkdf2::
d9d99f
                                 Generate GRUB password hashes
d9d99f
-* Invoking grub-mkrelpath::     Make system path relative to its root
d9d99f
-* Invoking grub-mkrescue::      Make a GRUB rescue image
d9d99f
-* Invoking grub-mount::         Mount a file system using GRUB
d9d99f
-* Invoking grub-probe::         Probe device information for GRUB
d9d99f
-* Invoking grub-script-check::  Check GRUB script file for syntax errors
d9d99f
+* Invoking grub2-mkrelpath::     Make system path relative to its root
d9d99f
+* Invoking grub2-mkrescue::      Make a GRUB rescue image
d9d99f
+* Invoking grub2-mount::         Mount a file system using GRUB
d9d99f
+* Invoking grub2-probe::         Probe device information for GRUB
d9d99f
+* Invoking grub2-script-check::  Check GRUB script file for syntax errors
d9d99f
 * Obtaining and Building GRUB:: How to obtain and build GRUB
d9d99f
 * Reporting bugs::              Where you should send a bug report
d9d99f
 * Future::                      Some future plans on GRUB
d9d99f
@@ -230,7 +230,7 @@ surprising.
d9d99f
 
d9d99f
 @item
d9d99f
 @file{grub.cfg} is typically automatically generated by
d9d99f
-@command{grub-mkconfig} (@pxref{Simple configuration}).  This makes it
d9d99f
+@command{grub2-mkconfig} (@pxref{Simple configuration}).  This makes it
d9d99f
 easier to handle versioned kernel upgrades.
d9d99f
 
d9d99f
 @item
d9d99f
@@ -244,7 +244,7 @@ scripting language: variables, conditionals, and loops are available.
d9d99f
 @item
d9d99f
 A small amount of persistent storage is available across reboots, using the
d9d99f
 @command{save_env} and @command{load_env} commands in GRUB and the
d9d99f
-@command{grub-editenv} utility.  This is not available in all configurations
d9d99f
+@command{grub2-editenv} utility.  This is not available in all configurations
d9d99f
 (@pxref{Environment block}).
d9d99f
 
d9d99f
 @item
d9d99f
@@ -549,7 +549,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
d9d99f
 OS name. E.g. for GNU/Linux:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install /dev/sda}
d9d99f
+# @kbd{grub2-install /dev/sda}
d9d99f
 @end example
d9d99f
 
d9d99f
 On AROS we use another syntax. For volumes:
d9d99f
@@ -572,7 +572,7 @@ For disks we use syntax:
d9d99f
 E.g.
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install //:ata.device/0/0}
d9d99f
+# @kbd{grub2-install //:ata.device/0/0}
d9d99f
 @end example
d9d99f
 
d9d99f
 On Windows we use UNC path. For volumes it's typically
d9d99f
@@ -599,7 +599,7 @@ For disks it's
d9d99f
 E.g.
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install \\?\PhysicalDrive0}
d9d99f
+# @kbd{grub2-install \\?\PhysicalDrive0}
d9d99f
 @end example
d9d99f
 
d9d99f
 Beware that you may need to further escape the backslashes depending on your
d9d99f
@@ -609,7 +609,7 @@ When compiled with cygwin support then cygwin drive names are automatically
d9d99f
 when needed. E.g.
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install /dev/sda}
d9d99f
+# @kbd{grub2-install /dev/sda}
d9d99f
 @end example
d9d99f
 
d9d99f
 @node Installation
d9d99f
@@ -622,7 +622,7 @@ from the source tarball, or as a package for your OS.
d9d99f
 
d9d99f
 After you have done that, you need to install the boot loader on a
d9d99f
 drive (floppy or hard disk) by using the utility
d9d99f
-@command{grub-install} (@pxref{Invoking grub-install}) on a UNIX-like OS.
d9d99f
+@command{grub2-install} (@pxref{Invoking grub2-install}) on a UNIX-like OS.
d9d99f
 
d9d99f
 GRUB comes with boot images, which are normally put in the directory
d9d99f
 @file{/usr/lib/grub/<cpu>-<platform>} (for BIOS-based machines
d9d99f
@@ -633,22 +633,22 @@ loader needs to find them (usually @file{/boot}) will be called
d9d99f
 the @dfn{boot directory}.
d9d99f
 
d9d99f
 @menu
d9d99f
-* Installing GRUB using grub-install::
d9d99f
+* Installing GRUB using grub2-install::
d9d99f
 * Making a GRUB bootable CD-ROM::
d9d99f
 * Device map::
d9d99f
 * BIOS installation::
d9d99f
 @end menu
d9d99f
 
d9d99f
 
d9d99f
-@node Installing GRUB using grub-install
d9d99f
-@section Installing GRUB using grub-install
d9d99f
+@node Installing GRUB using grub2-install
d9d99f
+@section Installing GRUB using grub2-install
d9d99f
 
d9d99f
 For information on where GRUB should be installed on PC BIOS platforms,
d9d99f
 @pxref{BIOS installation}.
d9d99f
 
d9d99f
 In order to install GRUB under a UNIX-like OS (such
d9d99f
-as @sc{gnu}), invoke the program @command{grub-install} (@pxref{Invoking
d9d99f
-grub-install}) as the superuser (@dfn{root}).
d9d99f
+as @sc{gnu}), invoke the program @command{grub2-install} (@pxref{Invoking
d9d99f
+grub2-install}) as the superuser (@dfn{root}).
d9d99f
 
d9d99f
 The usage is basically very simple. You only need to specify one
d9d99f
 argument to the program, namely, where to install the boot loader. The
d9d99f
@@ -657,13 +657,13 @@ For example, under Linux the following will install GRUB into the MBR
d9d99f
 of the first IDE disk:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install /dev/sda}
d9d99f
+# @kbd{grub2-install /dev/sda}
d9d99f
 @end example
d9d99f
 
d9d99f
 Likewise, under GNU/Hurd, this has the same effect:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install /dev/hd0}
d9d99f
+# @kbd{grub2-install /dev/hd0}
d9d99f
 @end example
d9d99f
 
d9d99f
 But all the above examples assume that GRUB should put images under
d9d99f
@@ -677,7 +677,7 @@ boot floppy with a filesystem. Here is an example:
d9d99f
 # @kbd{mke2fs /dev/fd0}
d9d99f
 # @kbd{mount -t ext2 /dev/fd0 /mnt}
d9d99f
 # @kbd{mkdir /mnt/boot}
d9d99f
-# @kbd{grub-install --boot-directory=/mnt/boot /dev/fd0}
d9d99f
+# @kbd{grub2-install --boot-directory=/mnt/boot /dev/fd0}
d9d99f
 # @kbd{umount /mnt}
d9d99f
 @end group
d9d99f
 @end example
d9d99f
@@ -689,16 +689,16 @@ floppy instead of exposing the USB drive as a hard disk (they call it
d9d99f
 @example
d9d99f
 # @kbd{losetup /dev/loop0 /dev/sdb1}
d9d99f
 # @kbd{mount /dev/loop0 /mnt/usb}
d9d99f
-# @kbd{grub-install --boot-directory=/mnt/usb/bugbios --force --allow-floppy /dev/loop0}
d9d99f
+# @kbd{grub2-install --boot-directory=/mnt/usb/bugbios --force --allow-floppy /dev/loop0}
d9d99f
 @end example
d9d99f
 
d9d99f
 This install doesn't conflict with standard install as long as they are in
d9d99f
 separate directories.
d9d99f
 
d9d99f
-Note that @command{grub-install} is actually just a shell script and the
d9d99f
-real task is done by other tools such as @command{grub-mkimage}. Therefore,
d9d99f
+Note that @command{grub2-install} is actually just a shell script and the
d9d99f
+real task is done by other tools such as @command{grub2-mkimage}. Therefore,
d9d99f
 you may run those commands directly to install GRUB, without using
d9d99f
-@command{grub-install}. Don't do that, however, unless you are very familiar
d9d99f
+@command{grub2-install}. Don't do that, however, unless you are very familiar
d9d99f
 with the internals of GRUB. Installing a boot loader on a running OS may be
d9d99f
 extremely dangerous.
d9d99f
 
d9d99f
@@ -706,20 +706,20 @@ On EFI systems for fixed disk install you have to mount EFI System Partition.
d9d99f
 If you mount it at @file{/boot/efi} then you don't need any special arguments:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install}
d9d99f
+# @kbd{grub2-install}
d9d99f
 @end example
d9d99f
 
d9d99f
 Otherwise you need to specify where your EFI System partition is mounted:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install --efi-directory=/mnt/efi}
d9d99f
+# @kbd{grub2-install --efi-directory=/mnt/efi}
d9d99f
 @end example
d9d99f
 
d9d99f
 For removable installs you have to use @option{--removable} and specify both
d9d99f
 @option{--boot-directory} and @option{--efi-directory}:
d9d99f
 
d9d99f
 @example
d9d99f
-# @kbd{grub-install --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --removable}
d9d99f
+# @kbd{grub2-install --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --removable}
d9d99f
 @end example
d9d99f
 
d9d99f
 @node Making a GRUB bootable CD-ROM
d9d99f
@@ -739,10 +739,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
d9d99f
 other GRUB modules.
d9d99f
 
d9d99f
 To make a simple generic GRUB rescue CD, you can use the
d9d99f
-@command{grub-mkrescue} program (@pxref{Invoking grub-mkrescue}):
d9d99f
+@command{grub2-mkrescue} program (@pxref{Invoking grub2-mkrescue}):
d9d99f
 
d9d99f
 @example
d9d99f
-$ @kbd{grub-mkrescue -o grub.iso}
d9d99f
+$ @kbd{grub2-mkrescue -o grub.iso}
d9d99f
 @end example
d9d99f
 
d9d99f
 You will often need to include other files in your image. To do this, first
d9d99f
@@ -765,7 +765,7 @@ directory @file{iso/}.
d9d99f
 Finally, make the image:
d9d99f
 
d9d99f
 @example
d9d99f
-$ @kbd{grub-mkrescue -o grub.iso iso}
d9d99f
+$ @kbd{grub2-mkrescue -o grub.iso iso}
d9d99f
 @end example
d9d99f
 
d9d99f
 This produces a file named @file{grub.iso}, which then can be burned
d9d99f
@@ -781,7 +781,7 @@ storage devices.
d9d99f
 @node Device map
d9d99f
 @section The map between BIOS drives and OS devices
d9d99f
 
d9d99f
-If the device map file exists, the GRUB utilities (@command{grub-probe},
d9d99f
+If the device map file exists, the GRUB utilities (@command{grub2-probe},
d9d99f
 etc.) read it to map BIOS drives to OS devices.  This file consists of lines
d9d99f
 like this:
d9d99f
 
d9d99f
@@ -1225,23 +1225,23 @@ need to write the whole thing by hand.
d9d99f
 @node Simple configuration
d9d99f
 @section Simple configuration handling
d9d99f
 
d9d99f
-The program @command{grub-mkconfig} (@pxref{Invoking grub-mkconfig})
d9d99f
+The program @command{grub2-mkconfig} (@pxref{Invoking grub2-mkconfig})
d9d99f
 generates @file{grub.cfg} files suitable for most cases.  It is suitable for
d9d99f
 use when upgrading a distribution, and will discover available kernels and
d9d99f
 attempt to generate menu entries for them.
d9d99f
 
d9d99f
-@command{grub-mkconfig} does have some limitations.  While adding extra
d9d99f
+@command{grub2-mkconfig} does have some limitations.  While adding extra
d9d99f
 custom menu entries to the end of the list can be done by editing
d9d99f
-@file{/etc/grub.d/40_custom} or creating @file{/boot/grub/custom.cfg},
d9d99f
+@file{/etc/grub.d/40_custom} or creating @file{/boot/grub2/custom.cfg},
d9d99f
 changing the order of menu entries or changing their titles may require
d9d99f
 making complex changes to shell scripts stored in @file{/etc/grub.d/}.  This
d9d99f
 may be improved in the future.  In the meantime, those who feel that it
d9d99f
 would be easier to write @file{grub.cfg} directly are encouraged to do so
d9d99f
 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
d9d99f
-provided by their distribution to automatically run @command{grub-mkconfig}.
d9d99f
+provided by their distribution to automatically run @command{grub2-mkconfig}.
d9d99f
 
d9d99f
 The file @file{/etc/default/grub} controls the operation of
d9d99f
-@command{grub-mkconfig}.  It is sourced by a shell script, and so must be
d9d99f
+@command{grub2-mkconfig}.  It is sourced by a shell script, and so must be
d9d99f
 valid POSIX shell input; normally, it will just be a sequence of
d9d99f
 @samp{KEY=value} lines, but if the value contains spaces or other special
d9d99f
 characters then it must be quoted.  For example:
d9d99f
@@ -1279,7 +1279,7 @@ works it's not recommended since titles often contain unstable device names
d9d99f
 and may be translated
d9d99f
 
d9d99f
 If you set this to @samp{saved}, then the default menu entry will be that
d9d99f
-saved by @samp{GRUB_SAVEDEFAULT} or @command{grub-set-default}.  This relies on
d9d99f
+saved by @samp{GRUB_SAVEDEFAULT} or @command{grub2-set-default}.  This relies on
d9d99f
 the environment block, which may not be available in all situations
d9d99f
 (@pxref{Environment block}).
d9d99f
 
d9d99f
@@ -1290,7 +1290,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
d9d99f
 it as a new default entry for use by future runs of GRUB.  This is only
d9d99f
 useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
d9d99f
 @samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
d9d99f
-@command{grub-set-default}.  Unset by default.
d9d99f
+@command{grub2-set-default}.  Unset by default.
d9d99f
 This option relies on the environment block, which may not be available in
d9d99f
 all situations (@pxref{Environment block}).
d9d99f
 
d9d99f
@@ -1420,7 +1420,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
d9d99f
 @end example
d9d99f
 
d9d99f
 @item GRUB_DISABLE_LINUX_UUID
d9d99f
-Normally, @command{grub-mkconfig} will generate menu entries that use
d9d99f
+Normally, @command{grub2-mkconfig} will generate menu entries that use
d9d99f
 universally-unique identifiers (UUIDs) to identify the root filesystem to
d9d99f
 the Linux kernel, using a @samp{root=UUID=...} kernel parameter.  This is
d9d99f
 usually more reliable, but in some cases it may not be appropriate.  To
d9d99f
@@ -1442,7 +1442,7 @@ If this option is set to @samp{true}, disable the generation of recovery
d9d99f
 mode menu entries.
d9d99f
 
d9d99f
 @item GRUB_DISABLE_UUID
d9d99f
-Normally, @command{grub-mkconfig} will generate menu entries that use
d9d99f
+Normally, @command{grub2-mkconfig} will generate menu entries that use
d9d99f
 universally-unique identifiers (UUIDs) to identify various filesystems to
d9d99f
 search for files.  This is usually more reliable, but in some cases it may
d9d99f
 not be appropriate.  To disable this use of UUIDs, set this option to
d9d99f
@@ -1451,12 +1451,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
d9d99f
 @item GRUB_VIDEO_BACKEND
d9d99f
 If graphical video support is required, either because the @samp{gfxterm}
d9d99f
 graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
d9d99f
-then @command{grub-mkconfig} will normally load all available GRUB video
d9d99f
+then @command{grub2-mkconfig} will normally load all available GRUB video
d9d99f
 drivers and use the one most appropriate for your hardware.  If you need to
d9d99f
 override this for some reason, then you can set this option.
d9d99f
 
d9d99f
-After @command{grub-install} has been run, the available video drivers are
d9d99f
-listed in @file{/boot/grub/video.lst}.
d9d99f
+After @command{grub2-install} has been run, the available video drivers are
d9d99f
+listed in @file{/boot/grub2/video.lst}.
d9d99f
 
d9d99f
 @item GRUB_GFXMODE
d9d99f
 Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
d9d99f
@@ -1488,7 +1488,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
d9d99f
 GRUB will tell Linux to boot in normal text mode.
d9d99f
 
d9d99f
 @item GRUB_DISABLE_OS_PROBER
d9d99f
-Normally, @command{grub-mkconfig} will try to use the external
d9d99f
+Normally, @command{grub2-mkconfig} will try to use the external
d9d99f
 @command{os-prober} program, if installed, to discover other operating
d9d99f
 systems installed on the same system and generate appropriate menu entries
d9d99f
 for them.  Set this option to @samp{true} to disable this.
d9d99f
@@ -1498,7 +1498,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
d9d99f
 output. For efi chainloaders it's <UUID>@@<EFI FILE>
d9d99f
 
d9d99f
 @item GRUB_DISABLE_SUBMENU
d9d99f
-Normally, @command{grub-mkconfig} will generate top level menu entry for
d9d99f
+Normally, @command{grub2-mkconfig} will generate top level menu entry for
d9d99f
 the kernel with highest version number and put all other found kernels
d9d99f
 or alternative menu entries for recovery mode in submenu. For entries returned
d9d99f
 by @command{os-prober} first entry will be put on top level and all others
d9d99f
@@ -1506,11 +1506,11 @@ in submenu. If this option is set to @samp{y}, flat menu with all entries
d9d99f
 on top level will be generated instead. Changing this option will require
d9d99f
 changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
d9d99f
 and @samp{default} (@pxref{default}) environment variables as well as saved
d9d99f
-default entry using @command{grub-set-default} and value used with
d9d99f
-@command{grub-reboot}.
d9d99f
+default entry using @command{grub2-set-default} and value used with
d9d99f
+@command{grub2-reboot}.
d9d99f
 
d9d99f
 @item GRUB_ENABLE_CRYPTODISK
d9d99f
-If set to @samp{y}, @command{grub-mkconfig} and @command{grub-install} will
d9d99f
+If set to @samp{y}, @command{grub2-mkconfig} and @command{grub2-install} will
d9d99f
 check for encrypted disks and generate additional commands needed to access
d9d99f
 them during boot.  Note that in this case unattended boot is not possible
d9d99f
 because GRUB will wait for passphrase to unlock encrypted container.
d9d99f
@@ -1569,7 +1569,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
d9d99f
 
d9d99f
 @end table
d9d99f
 
d9d99f
-For more detailed customisation of @command{grub-mkconfig}'s output, you may
d9d99f
+For more detailed customisation of @command{grub2-mkconfig}'s output, you may
d9d99f
 edit the scripts in @file{/etc/grub.d} directly.
d9d99f
 @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
d9d99f
 menu entries; simply type the menu entries you want to add at the end of
d9d99f
@@ -1831,7 +1831,7 @@ images as well.
d9d99f
 Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
d9d99f
 install self-compiled latest GRUB with:
d9d99f
 
d9d99f
-@code{grub-install --boot-directory=/mnt/boot /dev/sda}
d9d99f
+@code{grub2-install --boot-directory=/mnt/boot /dev/sda}
d9d99f
 
d9d99f
 In all the OSes install GRUB tools but disable installing GRUB in bootsector,
d9d99f
 so you'll have menu.lst and grub.cfg available for use. Also disable os-prober
d9d99f
@@ -1841,20 +1841,20 @@ use by setting:
d9d99f
 
d9d99f
 in /etc/default/grub
d9d99f
 
d9d99f
-Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
d9d99f
+Then write a grub.cfg (/mnt/boot/grub2/grub.cfg):
d9d99f
 
d9d99f
 @example
d9d99f
 
d9d99f
 menuentry "OS using grub2" @{
d9d99f
    insmod xfs
d9d99f
    search --set=root --label OS1 --hint hd0,msdos8
d9d99f
-   configfile /boot/grub/grub.cfg
d9d99f
+   configfile /boot/grub2/grub.cfg
d9d99f
 @}
d9d99f
 
d9d99f
 menuentry "OS using grub2-legacy" @{
d9d99f
    insmod ext2
d9d99f
    search --set=root --label OS2 --hint hd0,msdos6
d9d99f
-   legacy_configfile /boot/grub/menu.lst
d9d99f
+   legacy_configfile /boot/grub2/menu.lst
d9d99f
 @}
d9d99f
 
d9d99f
 menuentry "Windows XP" @{
d9d99f
@@ -1917,15 +1917,15 @@ GRUB supports embedding a configuration file directly into the core image,
d9d99f
 so that it is loaded before entering normal mode.  This is useful, for
d9d99f
 example, when it is not straightforward to find the real configuration file,
d9d99f
 or when you need to debug problems with loading that file.
d9d99f
-@command{grub-install} uses this feature when it is not using BIOS disk
d9d99f
+@command{grub2-install} uses this feature when it is not using BIOS disk
d9d99f
 functions or when installing to a different disk from the one containing
d9d99f
 @file{/boot/grub}, in which case it needs to use the @command{search}
d9d99f
 command (@pxref{search}) to find @file{/boot/grub}.
d9d99f
 
d9d99f
 To embed a configuration file, use the @option{-c} option to
d9d99f
-@command{grub-mkimage}.  The file is copied into the core image, so it may
d9d99f
+@command{grub2-mkimage}.  The file is copied into the core image, so it may
d9d99f
 reside anywhere on the file system, and may be removed after running
d9d99f
-@command{grub-mkimage}.
d9d99f
+@command{grub2-mkimage}.
d9d99f
 
d9d99f
 After the embedded configuration file (if any) is executed, GRUB will load
d9d99f
 the @samp{normal} module (@pxref{normal}), which will then read the real
d9d99f
@@ -1960,13 +1960,13 @@ included in the core image:
d9d99f
 @example
d9d99f
 @group
d9d99f
 search.fs_label grub root
d9d99f
-if [ -e /boot/grub/example/test1.cfg ]; then
d9d99f
+if [ -e /boot/grub2/example/test1.cfg ]; then
d9d99f
     set prefix=($root)/boot/grub
d9d99f
-    configfile /boot/grub/example/test1.cfg
d9d99f
+    configfile /boot/grub2/example/test1.cfg
d9d99f
 else
d9d99f
-    if [ -e /boot/grub/example/test2.cfg ]; then
d9d99f
+    if [ -e /boot/grub2/example/test2.cfg ]; then
d9d99f
         set prefix=($root)/boot/grub
d9d99f
-        configfile /boot/grub/example/test2.cfg
d9d99f
+        configfile /boot/grub2/example/test2.cfg
d9d99f
     else
d9d99f
         echo "Could not find an example configuration file!"
d9d99f
     fi
d9d99f
@@ -2490,7 +2490,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
d9d99f
 @end group
d9d99f
 @end example
d9d99f
 
d9d99f
-Then follow instructions printed out by grub-mknetdir on configuring your DHCP
d9d99f
+Then follow instructions printed out by grub2-mknetdir on configuring your DHCP
d9d99f
 server.
d9d99f
 
d9d99f
 The grub.cfg file is placed in the same directory as the path output by
d9d99f
@@ -2675,7 +2675,7 @@ team are:
d9d99f
 @end table
d9d99f
 
d9d99f
 To take full advantage of this function, install GRUB into the MBR
d9d99f
-(@pxref{Installing GRUB using grub-install}).
d9d99f
+(@pxref{Installing GRUB using grub2-install}).
d9d99f
 
d9d99f
 If you have a laptop which has a similar feature and not in the above list
d9d99f
 could you figure your address and contribute?
d9d99f
@@ -2736,7 +2736,7 @@ bytes.
d9d99f
 The sole function of @file{boot.img} is to read the first sector of the core
d9d99f
 image from a local disk and jump to it.  Because of the size restriction,
d9d99f
 @file{boot.img} cannot understand any file system structure, so
d9d99f
-@command{grub-install} hardcodes the location of the first sector of the
d9d99f
+@command{grub2-install} hardcodes the location of the first sector of the
d9d99f
 core image into @file{boot.img} when installing GRUB.
d9d99f
 
d9d99f
 @item diskboot.img
d9d99f
@@ -2766,7 +2766,7 @@ images.
d9d99f
 
d9d99f
 @item core.img
d9d99f
 This is the core image of GRUB.  It is built dynamically from the kernel
d9d99f
-image and an arbitrary list of modules by the @command{grub-mkimage}
d9d99f
+image and an arbitrary list of modules by the @command{grub2-mkimage}
d9d99f
 program.  Usually, it contains enough modules to access @file{/boot/grub},
d9d99f
 and loads everything else (including menu handling, the ability to load
d9d99f
 target operating systems, and so on) from the file system at run-time.  The
d9d99f
@@ -2818,7 +2818,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
d9d99f
 In GRUB 2, images for booting from CD-ROM drives are now constructed using
d9d99f
 @file{cdboot.img} and @file{core.img}, making sure that the core image
d9d99f
 contains the @samp{iso9660} module.  It is usually best to use the
d9d99f
-@command{grub-mkrescue} program for this.
d9d99f
+@command{grub2-mkrescue} program for this.
d9d99f
 
d9d99f
 @item nbgrub
d9d99f
 There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
d9d99f
@@ -2974,8 +2974,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
d9d99f
 
d9d99f
 An absolute file name resembles a Unix absolute file name, using
d9d99f
 @samp{/} for the directory separator (not @samp{\} as in DOS). One
d9d99f
-example is @samp{(hd0,1)/boot/grub/grub.cfg}. This means the file
d9d99f
-@file{/boot/grub/grub.cfg} in the first partition of the first hard
d9d99f
+example is @samp{(hd0,1)/boot/grub2/grub.cfg}. This means the file
d9d99f
+@file{/boot/grub2/grub.cfg} in the first partition of the first hard
d9d99f
 disk. If you omit the device name in an absolute file name, GRUB uses
d9d99f
 GRUB's @dfn{root device} implicitly. So if you set the root device to,
d9d99f
 say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
d9d99f
@@ -2983,8 +2983,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
d9d99f
 
d9d99f
 On ZFS filesystem the first path component must be
d9d99f
 @var{volume}@samp{@@}[@var{snapshot}].
d9d99f
-So @samp{/rootvol@@snap-129/boot/grub/grub.cfg} refers to file
d9d99f
-@samp{/boot/grub/grub.cfg} in snapshot of volume @samp{rootvol} with name
d9d99f
+So @samp{/rootvol@@snap-129/boot/grub2/grub.cfg} refers to file
d9d99f
+@samp{/boot/grub2/grub.cfg} in snapshot of volume @samp{rootvol} with name
d9d99f
 @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
d9d99f
 snapshot name is omitted.
d9d99f
 
d9d99f
@@ -3387,7 +3387,7 @@ The more recent release of Minix would then be identified as
d9d99f
 @samp{other>minix>minix-3.4.0}.
d9d99f
 
d9d99f
 This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
d9d99f
-configuration}), @command{grub-set-default}, or @command{grub-reboot}.
d9d99f
+configuration}), @command{grub2-set-default}, or @command{grub2-reboot}.
d9d99f
 
d9d99f
 
d9d99f
 @node fallback
d9d99f
@@ -3477,7 +3477,7 @@ If this variable is set, it names the language code that the
d9d99f
 example, French would be named as @samp{fr}, and Simplified Chinese as
d9d99f
 @samp{zh_CN}.
d9d99f
 
d9d99f
-@command{grub-mkconfig} (@pxref{Simple configuration}) will try to set a
d9d99f
+@command{grub2-mkconfig} (@pxref{Simple configuration}) will try to set a
d9d99f
 reasonable default for this variable based on the system locale.
d9d99f
 
d9d99f
 
d9d99f
@@ -3485,10 +3485,10 @@ reasonable default for this variable based on the system locale.
d9d99f
 @subsection locale_dir
d9d99f
 
d9d99f
 If this variable is set, it names the directory where translation files may
d9d99f
-be found (@pxref{gettext}), usually @file{/boot/grub/locale}.  Otherwise,
d9d99f
+be found (@pxref{gettext}), usually @file{/boot/grub2/locale}.  Otherwise,
d9d99f
 internationalization is disabled.
d9d99f
 
d9d99f
-@command{grub-mkconfig} (@pxref{Simple configuration}) will set a reasonable
d9d99f
+@command{grub2-mkconfig} (@pxref{Simple configuration}) will set a reasonable
d9d99f
 default for this variable if internationalization is needed and any
d9d99f
 translation files are available.
d9d99f
 
d9d99f
@@ -3606,7 +3606,7 @@ input.  The default is not to pause output.
d9d99f
 
d9d99f
 The location of the @samp{/boot/grub} directory as an absolute file name
d9d99f
 (@pxref{File name syntax}).  This is normally set by GRUB at startup based
d9d99f
-on information provided by @command{grub-install}.  GRUB modules are
d9d99f
+on information provided by @command{grub2-install}.  GRUB modules are
d9d99f
 dynamically loaded from this directory, so it must be set correctly in order
d9d99f
 for many parts of GRUB to work.
d9d99f
 
d9d99f
@@ -3697,17 +3697,17 @@ GRUB provides an ``environment block'' which can be used to save a small
d9d99f
 amount of state.
d9d99f
 
d9d99f
 The environment block is a preallocated 1024-byte file, which normally lives
d9d99f
-in @file{/boot/grub/grubenv} (although you should not assume this).  At boot
d9d99f
+in @file{/boot/grub2/grubenv} (although you should not assume this).  At boot
d9d99f
 time, the @command{load_env} command (@pxref{load_env}) loads environment
d9d99f
 variables from it, and the @command{save_env} (@pxref{save_env}) command
d9d99f
 saves environment variables to it.  From a running system, the
d9d99f
-@command{grub-editenv} utility can be used to edit the environment block.
d9d99f
+@command{grub2-editenv} utility can be used to edit the environment block.
d9d99f
 
d9d99f
 For safety reasons, this storage is only available when installed on a plain
d9d99f
 disk (no LVM or RAID), using a non-checksumming filesystem (no ZFS), and
d9d99f
 using BIOS or EFI functions (no ATA, USB or IEEE1275).
d9d99f
 
d9d99f
-@command{grub-mkconfig} uses this facility to implement
d9d99f
+@command{grub2-mkconfig} uses this facility to implement
d9d99f
 @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
d9d99f
 
d9d99f
 
d9d99f
@@ -4396,7 +4396,7 @@ Translate @var{string} into the current language.
d9d99f
 
d9d99f
 The current language code is stored in the @samp{lang} variable in GRUB's
d9d99f
 environment (@pxref{lang}).  Translation files in MO format are read from
d9d99f
-@samp{locale_dir} (@pxref{locale_dir}), usually @file{/boot/grub/locale}.
d9d99f
+@samp{locale_dir} (@pxref{locale_dir}), usually @file{/boot/grub2/locale}.
d9d99f
 @end deffn
d9d99f
 
d9d99f
 
d9d99f
@@ -4791,7 +4791,7 @@ Define a user named @var{user} with password @var{clear-password}.
d9d99f
 
d9d99f
 @deffn Command password_pbkdf2 user hashed-password
d9d99f
 Define a user named @var{user} with password hash @var{hashed-password}.
d9d99f
-Use @command{grub-mkpasswd-pbkdf2} (@pxref{Invoking grub-mkpasswd-pbkdf2})
d9d99f
+Use @command{grub2-mkpasswd-pbkdf2} (@pxref{Invoking grub2-mkpasswd-pbkdf2})
d9d99f
 to generate password hashes.  @xref{Security}.
d9d99f
 @end deffn
d9d99f
 
d9d99f
@@ -5614,8 +5614,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
d9d99f
 which has an associated password.  @samp{password} sets the password in
d9d99f
 plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
d9d99f
 sets the password hashed using the Password-Based Key Derivation Function
d9d99f
-(RFC 2898), requiring the use of @command{grub-mkpasswd-pbkdf2}
d9d99f
-(@pxref{Invoking grub-mkpasswd-pbkdf2}) to generate password hashes.
d9d99f
+(RFC 2898), requiring the use of @command{grub2-mkpasswd-pbkdf2}
d9d99f
+(@pxref{Invoking grub2-mkpasswd-pbkdf2}) to generate password hashes.
d9d99f
 
d9d99f
 In order to enable authentication support, the @samp{superusers} environment
d9d99f
 variable must be set to a list of usernames, separated by any of spaces,
d9d99f
@@ -5659,7 +5659,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
d9d99f
 @end group
d9d99f
 @end example
d9d99f
 
d9d99f
-The @command{grub-mkconfig} program does not yet have built-in support for
d9d99f
+The @command{grub2-mkconfig} program does not yet have built-in support for
d9d99f
 generating configuration files with authentication.  You can use
d9d99f
 @file{/etc/grub.d/40_custom} to add simple superuser authentication, by
d9d99f
 adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
d9d99f
@@ -5684,15 +5684,15 @@ verified with a public key currently trusted by GRUB
d9d99f
 validation fails, then file @file{foo} cannot be opened.  This failure
d9d99f
 may halt or otherwise impact the boot process.
d9d99f
 
d9d99f
-@comment Unfortunately --pubkey is not yet supported by grub-install,
d9d99f
-@comment but we should not bring up internal detail grub-mkimage here
d9d99f
+@comment Unfortunately --pubkey is not yet supported by grub2-install,
d9d99f
+@comment but we should not bring up internal detail grub2-mkimage here
d9d99f
 @comment in the user guide (as opposed to developer's manual).
d9d99f
 
d9d99f
 @comment An initial trusted public key can be embedded within the GRUB
d9d99f
 @comment @file{core.img} using the @code{--pubkey} option to
d9d99f
-@comment @command{grub-mkimage} (@pxref{Invoking grub-install}).  Presently it
d9d99f
-@comment is necessary to write a custom wrapper around @command{grub-mkimage}
d9d99f
-@comment using the @code{--grub-mkimage} flag to @command{grub-install}.
d9d99f
+@comment @command{grub2-mkimage} (@pxref{Invoking grub2-install}).  Presently it
d9d99f
+@comment is necessary to write a custom wrapper around @command{grub2-mkimage}
d9d99f
+@comment using the @code{--grub-mkimage} flag to @command{grub2-install}.
d9d99f
 
d9d99f
 GRUB uses GPG-style detached signatures (meaning that a file
d9d99f
 @file{foo.sig} will be produced when file @file{foo} is signed), and
d9d99f
@@ -5712,8 +5712,8 @@ gpg --detach-sign /path/to/file
d9d99f
 For successful validation of all of GRUB's subcomponents and the
d9d99f
 loaded OS kernel, they must all be signed.  One way to accomplish this
d9d99f
 is the following (after having already produced the desired
d9d99f
-@file{grub.cfg} file, e.g., by running @command{grub-mkconfig}
d9d99f
-(@pxref{Invoking grub-mkconfig}):
d9d99f
+@file{grub.cfg} file, e.g., by running @command{grub2-mkconfig}
d9d99f
+(@pxref{Invoking grub2-mkconfig}):
d9d99f
 
d9d99f
 @example
d9d99f
 @group
d9d99f
@@ -5735,7 +5735,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
d9d99f
 Note that internally signature enforcement is controlled by setting
d9d99f
 the environment variable @code{check_signatures} equal to
d9d99f
 @code{enforce}.  Passing one or more @code{--pubkey} options to
d9d99f
-@command{grub-mkimage} implicitly defines @code{check_signatures}
d9d99f
+@command{grub2-mkimage} implicitly defines @code{check_signatures}
d9d99f
 equal to @code{enforce} in @file{core.img} prior to processing any
d9d99f
 configuration files.
d9d99f
 
d9d99f
@@ -6092,10 +6092,10 @@ Required files are:
d9d99f
 
d9d99f
 GRUB's normal start-up procedure involves setting the @samp{prefix}
d9d99f
 environment variable to a value set in the core image by
d9d99f
-@command{grub-install}, setting the @samp{root} variable to match, loading
d9d99f
+@command{grub2-install}, setting the @samp{root} variable to match, loading
d9d99f
 the @samp{normal} module from the prefix, and running the @samp{normal}
d9d99f
 command (@pxref{normal}).  This command is responsible for reading
d9d99f
-@file{/boot/grub/grub.cfg}, running the menu, and doing all the useful
d9d99f
+@file{/boot/grub2/grub.cfg}, running the menu, and doing all the useful
d9d99f
 things GRUB is supposed to do.
d9d99f
 
d9d99f
 If, instead, you only get a rescue shell, this usually means that GRUB
d9d99f
@@ -6121,8 +6121,8 @@ normal
d9d99f
 
d9d99f
 However, any problem that leaves you in the rescue shell probably means that
d9d99f
 GRUB was not correctly installed.  It may be more useful to try to reinstall
d9d99f
-it properly using @kbd{grub-install @var{device}} (@pxref{Invoking
d9d99f
-grub-install}).  When doing this, there are a few things to remember:
d9d99f
+it properly using @kbd{grub2-install @var{device}} (@pxref{Invoking
d9d99f
+grub2-install}).  When doing this, there are a few things to remember:
d9d99f
 
d9d99f
 @itemize @bullet{}
d9d99f
 @item
d9d99f
@@ -6134,7 +6134,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
d9d99f
 drive ordering entirely.
d9d99f
 
d9d99f
 @item
d9d99f
-At least on BIOS systems, if you tell @command{grub-install} to install GRUB
d9d99f
+At least on BIOS systems, if you tell @command{grub2-install} to install GRUB
d9d99f
 to a partition but GRUB has already been installed in the master boot
d9d99f
 record, then the GRUB installation in the partition will be ignored.
d9d99f
 
d9d99f
@@ -6154,21 +6154,21 @@ support has not yet been added to GRUB.
d9d99f
 @end itemize
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-install
d9d99f
-@chapter Invoking grub-install
d9d99f
+@node Invoking grub2-install
d9d99f
+@chapter Invoking grub2-install
d9d99f
 
d9d99f
-The program @command{grub-install} generates a GRUB core image using
d9d99f
-@command{grub-mkimage} and installs it on your system.  You must specify the
d9d99f
+The program @command{grub2-install} generates a GRUB core image using
d9d99f
+@command{grub2-mkimage} and installs it on your system.  You must specify the
d9d99f
 device name on which you want to install GRUB, like this:
d9d99f
 
d9d99f
 @example
d9d99f
-grub-install @var{install_device}
d9d99f
+grub2-install @var{install_device}
d9d99f
 @end example
d9d99f
 
d9d99f
 The device name @var{install_device} is an OS device name or a GRUB
d9d99f
 device name.
d9d99f
 
d9d99f
-@command{grub-install} accepts the following options:
d9d99f
+@command{grub2-install} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item --help
d9d99f
@@ -6184,13 +6184,13 @@ separate partition or a removable disk.
d9d99f
 If this option is not specified then it defaults to @file{/boot}, so
d9d99f
 
d9d99f
 @example
d9d99f
-@kbd{grub-install /dev/sda}
d9d99f
+@kbd{grub2-install /dev/sda}
d9d99f
 @end example
d9d99f
 
d9d99f
 is equivalent to
d9d99f
 
d9d99f
 @example
d9d99f
-@kbd{grub-install --boot-directory=/boot/ /dev/sda}
d9d99f
+@kbd{grub2-install --boot-directory=/boot/ /dev/sda}
d9d99f
 @end example
d9d99f
 
d9d99f
 Here is an example in which you have a separate @dfn{boot} partition which is 
d9d99f
@@ -6198,16 +6198,16 @@ mounted on
d9d99f
 @file{/mnt/boot}:
d9d99f
 
d9d99f
 @example
d9d99f
-@kbd{grub-install --boot-directory=/mnt/boot /dev/sdb}
d9d99f
+@kbd{grub2-install --boot-directory=/mnt/boot /dev/sdb}
d9d99f
 @end example
d9d99f
 
d9d99f
 @item --recheck
d9d99f
-Recheck the device map, even if @file{/boot/grub/device.map} already
d9d99f
+Recheck the device map, even if @file{/boot/grub2/device.map} already
d9d99f
 exists. You should use this option whenever you add/remove a disk
d9d99f
 into/from your computer.
d9d99f
 
d9d99f
 @item --no-rs-codes
d9d99f
-By default on x86 BIOS systems, @command{grub-install} will use some
d9d99f
+By default on x86 BIOS systems, @command{grub2-install} will use some
d9d99f
 extra space in the bootloader embedding area for Reed-Solomon
d9d99f
 error-correcting codes. This enables GRUB to still boot successfully
d9d99f
 if some blocks are corrupted.  The exact amount of protection offered
d9d99f
@@ -6220,17 +6220,17 @@ installation}) where GRUB does not reside in any unpartitioned space
d9d99f
 outside of the MBR.  Disable the Reed-Solomon codes with this option.
d9d99f
 @end table
d9d99f
 
d9d99f
-@node Invoking grub-mkconfig
d9d99f
-@chapter Invoking grub-mkconfig
d9d99f
+@node Invoking grub2-mkconfig
d9d99f
+@chapter Invoking grub2-mkconfig
d9d99f
 
d9d99f
-The program @command{grub-mkconfig} generates a configuration file for GRUB
d9d99f
+The program @command{grub2-mkconfig} generates a configuration file for GRUB
d9d99f
 (@pxref{Simple configuration}).
d9d99f
 
d9d99f
 @example
d9d99f
-grub-mkconfig -o /boot/grub/grub.cfg
d9d99f
+grub-mkconfig -o /boot/grub2/grub.cfg
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-mkconfig} accepts the following options:
d9d99f
+@command{grub2-mkconfig} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item --help
d9d99f
@@ -6246,17 +6246,17 @@ it to standard output.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-mkpasswd-pbkdf2
d9d99f
-@chapter Invoking grub-mkpasswd-pbkdf2
d9d99f
+@node Invoking grub2-mkpasswd-pbkdf2
d9d99f
+@chapter Invoking grub2-mkpasswd-pbkdf2
d9d99f
 
d9d99f
-The program @command{grub-mkpasswd-pbkdf2} generates password hashes for
d9d99f
+The program @command{grub2-mkpasswd-pbkdf2} generates password hashes for
d9d99f
 GRUB (@pxref{Security}).
d9d99f
 
d9d99f
 @example
d9d99f
 grub-mkpasswd-pbkdf2
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-mkpasswd-pbkdf2} accepts the following options:
d9d99f
+@command{grub2-mkpasswd-pbkdf2} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item -c @var{number}
d9d99f
@@ -6274,23 +6274,23 @@ Length of the salt.  Defaults to 64.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-mkrelpath
d9d99f
-@chapter Invoking grub-mkrelpath
d9d99f
+@node Invoking grub2-mkrelpath
d9d99f
+@chapter Invoking grub2-mkrelpath
d9d99f
 
d9d99f
-The program @command{grub-mkrelpath} makes a file system path relative to
d9d99f
+The program @command{grub2-mkrelpath} makes a file system path relative to
d9d99f
 the root of its containing file system.  For instance, if @file{/usr} is a
d9d99f
 mount point, then:
d9d99f
 
d9d99f
 @example
d9d99f
-$ @kbd{grub-mkrelpath /usr/share/grub/unicode.pf2}
d9d99f
+$ @kbd{grub2-mkrelpath /usr/share/grub/unicode.pf2}
d9d99f
 @samp{/share/grub/unicode.pf2}
d9d99f
 @end example
d9d99f
 
d9d99f
 This is mainly used internally by other GRUB utilities such as
d9d99f
-@command{grub-mkconfig} (@pxref{Invoking grub-mkconfig}), but may
d9d99f
+@command{grub2-mkconfig} (@pxref{Invoking grub2-mkconfig}), but may
d9d99f
 occasionally also be useful for debugging.
d9d99f
 
d9d99f
-@command{grub-mkrelpath} accepts the following options:
d9d99f
+@command{grub2-mkrelpath} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item --help
d9d99f
@@ -6301,17 +6301,17 @@ Print the version number of GRUB and exit.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-mkrescue
d9d99f
-@chapter Invoking grub-mkrescue
d9d99f
+@node Invoking grub2-mkrescue
d9d99f
+@chapter Invoking grub2-mkrescue
d9d99f
 
d9d99f
-The program @command{grub-mkrescue} generates a bootable GRUB rescue image
d9d99f
+The program @command{grub2-mkrescue} generates a bootable GRUB rescue image
d9d99f
 (@pxref{Making a GRUB bootable CD-ROM}).
d9d99f
 
d9d99f
 @example
d9d99f
 grub-mkrescue -o grub.iso
d9d99f
 @end example
d9d99f
 
d9d99f
-All arguments not explicitly listed as @command{grub-mkrescue} options are
d9d99f
+All arguments not explicitly listed as @command{grub2-mkrescue} options are
d9d99f
 passed on directly to @command{xorriso} in @command{mkisofs} emulation mode.
d9d99f
 Options passed to @command{xorriso} will normally be interpreted as
d9d99f
 @command{mkisofs} options; if the option @samp{--} is used, then anything
d9d99f
@@ -6326,7 +6326,7 @@ mkdir -p disk/boot/grub
d9d99f
 grub-mkrescue -o grub.iso disk
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-mkrescue} accepts the following options:
d9d99f
+@command{grub2-mkrescue} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item --help
d9d99f
@@ -6354,15 +6354,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
d9d99f
 default.
d9d99f
 
d9d99f
 @item --grub-mkimage=@var{file}
d9d99f
-Use @var{file} as the @command{grub-mkimage} program, rather than the
d9d99f
+Use @var{file} as the @command{grub2-mkimage} program, rather than the
d9d99f
 built-in default.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-mount
d9d99f
-@chapter Invoking grub-mount
d9d99f
+@node Invoking grub2-mount
d9d99f
+@chapter Invoking grub2-mount
d9d99f
 
d9d99f
-The program @command{grub-mount} performs a read-only mount of any file
d9d99f
+The program @command{grub2-mount} performs a read-only mount of any file
d9d99f
 system or file system image that GRUB understands, using GRUB's file system
d9d99f
 drivers via FUSE.  (It is only available if FUSE development files were
d9d99f
 present when GRUB was built.)  This has a number of uses:
d9d99f
@@ -6394,13 +6394,13 @@ even if nobody has yet written a FUSE module specifically for that file
d9d99f
 system type.
d9d99f
 @end itemize
d9d99f
 
d9d99f
-Using @command{grub-mount} is normally as simple as:
d9d99f
+Using @command{grub2-mount} is normally as simple as:
d9d99f
 
d9d99f
 @example
d9d99f
 grub-mount /dev/sda1 /mnt
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-mount} must be given one or more images and a mount point as
d9d99f
+@command{grub2-mount} must be given one or more images and a mount point as
d9d99f
 non-option arguments (if it is given more than one image, it will treat them
d9d99f
 as a RAID set), and also accepts the following options:
d9d99f
 
d9d99f
@@ -6422,13 +6422,13 @@ Show debugging output for conditions matching @var{string}.
d9d99f
 @item -K prompt|@var{file}
d9d99f
 @itemx --zfs-key=prompt|@var{file}
d9d99f
 Load a ZFS encryption key.  If you use @samp{prompt} as the argument,
d9d99f
-@command{grub-mount} will read a passphrase from the terminal; otherwise, it
d9d99f
+@command{grub2-mount} will read a passphrase from the terminal; otherwise, it
d9d99f
 will read key material from the specified file.
d9d99f
 
d9d99f
 @item -r @var{device}
d9d99f
 @itemx --root=@var{device}
d9d99f
 Set the GRUB root device to @var{device}.  You do not normally need to set
d9d99f
-this; @command{grub-mount} will automatically set the root device to the
d9d99f
+this; @command{grub2-mount} will automatically set the root device to the
d9d99f
 root of the supplied file system.
d9d99f
 
d9d99f
 If @var{device} is just a number, then it will be treated as a partition
d9d99f
@@ -6446,10 +6446,10 @@ Print verbose messages.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-probe
d9d99f
-@chapter Invoking grub-probe
d9d99f
+@node Invoking grub2-probe
d9d99f
+@chapter Invoking grub2-probe
d9d99f
 
d9d99f
-The program @command{grub-probe} probes device information for a given path
d9d99f
+The program @command{grub2-probe} probes device information for a given path
d9d99f
 or device.
d9d99f
 
d9d99f
 @example
d9d99f
@@ -6457,7 +6457,7 @@ grub-probe --target=fs /boot/grub
d9d99f
 grub-probe --target=drive --device /dev/sda1
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-probe} must be given a path or device as a non-option
d9d99f
+@command{grub2-probe} must be given a path or device as a non-option
d9d99f
 argument, and also accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
@@ -6470,16 +6470,16 @@ Print the version number of GRUB and exit.
d9d99f
 @item -d
d9d99f
 @itemx --device
d9d99f
 If this option is given, then the non-option argument is a system device
d9d99f
-name (such as @samp{/dev/sda1}), and @command{grub-probe} will print
d9d99f
+name (such as @samp{/dev/sda1}), and @command{grub2-probe} will print
d9d99f
 information about that device.  If it is not given, then the non-option
d9d99f
 argument is a filesystem path (such as @samp{/boot/grub}), and
d9d99f
-@command{grub-probe} will print information about the device containing that
d9d99f
+@command{grub2-probe} will print information about the device containing that
d9d99f
 part of the filesystem.
d9d99f
 
d9d99f
 @item -m @var{file}
d9d99f
 @itemx --device-map=@var{file}
d9d99f
 Use @var{file} as the device map (@pxref{Device map}) rather than the
d9d99f
-default, usually @samp{/boot/grub/device.map}.
d9d99f
+default, usually @samp{/boot/grub2/device.map}.
d9d99f
 
d9d99f
 @item -t @var{target}
d9d99f
 @itemx --target=@var{target}
d9d99f
@@ -6532,19 +6532,19 @@ Print verbose messages.
d9d99f
 @end table
d9d99f
 
d9d99f
 
d9d99f
-@node Invoking grub-script-check
d9d99f
-@chapter Invoking grub-script-check
d9d99f
+@node Invoking grub2-script-check
d9d99f
+@chapter Invoking grub2-script-check
d9d99f
 
d9d99f
-The program @command{grub-script-check} takes a GRUB script file
d9d99f
+The program @command{grub2-script-check} takes a GRUB script file
d9d99f
 (@pxref{Shell-like scripting}) and checks it for syntax errors, similar to
d9d99f
 commands such as @command{sh -n}.  It may take a @var{path} as a non-option
d9d99f
 argument; if none is supplied, it will read from standard input.
d9d99f
 
d9d99f
 @example
d9d99f
-grub-script-check /boot/grub/grub.cfg
d9d99f
+grub-script-check /boot/grub2/grub.cfg
d9d99f
 @end example
d9d99f
 
d9d99f
-@command{grub-script-check} accepts the following options:
d9d99f
+@command{grub2-script-check} accepts the following options:
d9d99f
 
d9d99f
 @table @option
d9d99f
 @item --help