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

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