nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0258-docs-grub.texi-Document-more-user-commands.patch

f96e0b
From be47d58313f553c6a6b057ec9554a1a67480e102 Mon Sep 17 00:00:00 2001
f96e0b
From: Andrey Borzenkov <arvidjaar@gmail.com>
f96e0b
Date: Fri, 5 Apr 2013 10:18:42 +0200
f96e0b
Subject: [PATCH 258/482] 	* docs/grub.texi: Document more user commands.
f96e0b
f96e0b
---
f96e0b
 ChangeLog      |   4 +
f96e0b
 docs/grub.texi | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
f96e0b
 2 files changed, 347 insertions(+), 9 deletions(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 6113a39..d63c0e5 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,3 +1,7 @@
f96e0b
+2013-04-04  Andrey Borzenkov <arvidjaar@gmail.com>
f96e0b
+
f96e0b
+	* docs/grub.texi: Document more user commands.
f96e0b
+
f96e0b
 2013-04-04  Andrey Borzenkov  <arvidjaar@gmail.com>
f96e0b
 
f96e0b
 	* docs/grub.texi: Document menuentry --id option.
f96e0b
diff --git a/docs/grub.texi b/docs/grub.texi
f96e0b
index 742d406..bd366a6 100644
f96e0b
--- a/docs/grub.texi
f96e0b
+++ b/docs/grub.texi
f96e0b
@@ -1554,6 +1554,10 @@ Causes a function to exit with the return value specified by @code{n}.  If
f96e0b
 in the function body.  If used outside a function the return status is
f96e0b
 false.
f96e0b
 
f96e0b
+@item setparams [@code{arg}] @dots{}
f96e0b
+Replace positional parameters starting with @code{$1} with arguments to
f96e0b
+@command{setparams}.
f96e0b
+
f96e0b
 @item shift [@code{n}]
f96e0b
 The positional parameters from @code{n}+1 @dots{} are renamed to
f96e0b
 @code{$1}@dots{}.  Parameters represented by the numbers @code{$#} down to
f96e0b
@@ -1751,8 +1755,8 @@ Colors can be specified in several ways:
f96e0b
 The fonts GRUB uses ``PFF2 font format'' bitmap fonts.  Fonts are specified
f96e0b
 with full font names.  Currently there is no
f96e0b
 provision for a preference list of fonts, or deriving one font from another.
f96e0b
-Fonts are loaded with the ``loadfont'' command in GRUB.  To see the list of
f96e0b
-loaded fonts, execute the ``lsfonts'' command.  If there are too many fonts to
f96e0b
+Fonts are loaded with the ``loadfont'' command in GRUB (@ref{loadfont}).  To see the list of
f96e0b
+loaded fonts, execute the ``lsfonts'' command (@ref{lsfonts}).  If there are too many fonts to
f96e0b
 fit on screen, do ``set pager=1'' before executing ``lsfonts''.
f96e0b
 
f96e0b
 
f96e0b
@@ -3365,16 +3369,25 @@ you forget a command, you can run the command @command{help}
f96e0b
 (@pxref{help}).
f96e0b
 
f96e0b
 @menu
f96e0b
+* [::                           Check file types and compare values
f96e0b
 * acpi::                        Load ACPI tables
f96e0b
+* authenticate::                Check whether user is in user list
f96e0b
+* background_color::            Set background color for active terminal
f96e0b
+* background_image::            Load background image for active terminal
f96e0b
 * badram::                      Filter out bad regions of RAM
f96e0b
 * blocklist::                   Print a block list
f96e0b
 * boot::                        Start up your operating system
f96e0b
 * cat::                         Show the contents of a file
f96e0b
 * chainloader::                 Chain-load another boot loader
f96e0b
+* clear::                       Clear the screen
f96e0b
+* cmosclean::                   Clear bit in CMOS
f96e0b
+* cmosdump::                    Dump CMOS contents
f96e0b
+* cmostest::                    Test bit in CMOS
f96e0b
 * cmp::                         Compare two files
f96e0b
 * configfile::                  Load a configuration file
f96e0b
 * cpuid::                       Check for CPU features
f96e0b
-* crc::                         Calculate CRC32 checksums
f96e0b
+* crc::                         Compute or check CRC32 checksums
f96e0b
+* cryptomount::                 Mount a crypto device
f96e0b
 * date::                        Display or set current date and time
f96e0b
 * drivemap::                    Map a drive to another
f96e0b
 * echo::                        Display a line of text
f96e0b
@@ -3383,6 +3396,7 @@ you forget a command, you can run the command @command{help}
f96e0b
 * gettext::                     Translate a string
f96e0b
 * gptsync::                     Fill an MBR based on GPT entries
f96e0b
 * halt::                        Shut down your computer
f96e0b
+* hashsum::                     Compute or check hash checksum
f96e0b
 * help::                        Show help messages
f96e0b
 * initrd::                      Load a Linux initrd
f96e0b
 * initrd16::                    Load a Linux initrd (16-bit mode)
f96e0b
@@ -3391,29 +3405,50 @@ you forget a command, you can run the command @command{help}
f96e0b
 * linux::                       Load a Linux kernel
f96e0b
 * linux16::                     Load a Linux kernel (16-bit mode)
f96e0b
 * list_env::                    List variables in environment block
f96e0b
+* loadfont::                    Load font files
f96e0b
 * load_env::                    Load variables from environment block
f96e0b
 * loopback::                    Make a device from a filesystem image
f96e0b
 * ls::                          List devices or files
f96e0b
+* lsfonts::                     List loaded fonts
f96e0b
+* lsmod::                       Show loaded modules
f96e0b
+* md5sum::                      Compute or check MD5 hash
f96e0b
 * normal::                      Enter normal mode
f96e0b
 * normal_exit::                 Exit from normal mode
f96e0b
 * parttool::                    Modify partition table entries
f96e0b
 * password::                    Set a clear-text password
f96e0b
 * password_pbkdf2::             Set a hashed password
f96e0b
 * play::                        Play a tune
f96e0b
+* probe::                       Retrieve device info
f96e0b
 * pxe_unload::                  Unload the PXE environment
f96e0b
 * read::                        Read user input
f96e0b
 * reboot::                      Reboot your computer
f96e0b
+* regexp::                      Test if regular expression matches string
f96e0b
+* rmmod::                       Remove a module
f96e0b
 * save_env::                    Save variables to environment block
f96e0b
 * search::                      Search devices by file, label, or UUID
f96e0b
 * sendkey::                     Emulate keystrokes
f96e0b
 * set::                         Set an environment variable
f96e0b
+* sha1sum::                     Compute or check SHA1 hash
f96e0b
+* sha256sum::                   Compute or check SHA256 hash
f96e0b
+* sha512sum::                   Compute or check SHA512 hash
f96e0b
+* sleep::                       Wait for a specified number of seconds
f96e0b
 * source::                      Read a configuration file in same context
f96e0b
+* test::                        Check file types and compare values
f96e0b
 * true::                        Do nothing, successfully
f96e0b
 * unset::                       Unset an environment variable
f96e0b
 * uppermem::                    Set the upper memory size
f96e0b
+@comment * vbeinfo::                     List available video modes
f96e0b
+* videoinfo::                   List available video modes
f96e0b
 @end menu
f96e0b
 
f96e0b
 
f96e0b
+@node [
f96e0b
+@subsection [
f96e0b
+@deffn Command @code{[} expression @code{]}
f96e0b
+Alias for @code{test @var{expression}} (@pxref{test}).
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node acpi
f96e0b
 @subsection acpi
f96e0b
 
f96e0b
@@ -3435,6 +3470,42 @@ Normally, this command will replace the Root System Description Pointer
f96e0b
 GRUB, but may be used by GRUB's EFI emulation.
f96e0b
 @end deffn
f96e0b
 
f96e0b
+
f96e0b
+@node authenticate
f96e0b
+@subsection authenticate
f96e0b
+@deffn Command authenticate [userlist]
f96e0b
+Check whether user is in @var{userlist} or listed in the value of variable
f96e0b
+@samp{superusers}. See @pxref{superusers} for valid user list format.
f96e0b
+If @samp{superusers} is empty, this command returns true. @xref{Security}.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node background_color
f96e0b
+@subsection background_color
f96e0b
+
f96e0b
+@deffn Command background_color color
f96e0b
+Set background color for active terminal. For valid color specifications see
f96e0b
+@pxref{Theme file format, ,Colors}. Background color can be changed only when
f96e0b
+using @samp{gfxterm} for terminal output.
f96e0b
+
f96e0b
+This command sets color of empty areas without text. Text background color
f96e0b
+is controlled by environment variables @var{color_normal}, @var{color_highlight},
f96e0b
+@var{menu_color_normal}, @var{menu_color_highlight}. @xref{Special environment variables}.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node background_image
f96e0b
+@subsection background_image
f96e0b
+
f96e0b
+@deffn Command background_image [[@option{--mode} @samp{stretch}|@samp{normal}] file]
f96e0b
+Load background image for active terminal from @var{file}. Image is stretched
f96e0b
+to fill up entire screen unless option @option{--mode} @samp{normal} is given.
f96e0b
+Without arguments remove currently loaded background image. Background image
f96e0b
+can be changed only when using @samp{gfxterm} for terminal output.
f96e0b
+
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node badram
f96e0b
 @subsection badram
f96e0b
 
f96e0b
@@ -3507,6 +3578,42 @@ load a defective boot loader, such as SCO UnixWare 7.1.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node clear
f96e0b
+@subsection clear
f96e0b
+
f96e0b
+@deffn Command clear
f96e0b
+Clear the screen.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node cmosclean
f96e0b
+@subsection cmosclean
f96e0b
+
f96e0b
+@deffn Command cmosclean byte:bit
f96e0b
+Clear value of bit in CMOS at location @var{byte}:@var{bit}. This command
f96e0b
+is available only on platforms that support CMOS.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node cmosdump
f96e0b
+@subsection cmosdump
f96e0b
+
f96e0b
+@deffn Dump CMOS contents
f96e0b
+Dump full CMOS contents as hexadecimal values. This command is available only
f96e0b
+on platforms that support CMOS.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node cmostest
f96e0b
+@subsection cmostest
f96e0b
+
f96e0b
+@deffn Command cmostest byte:bit
f96e0b
+Test value of bit in CMOS at location @var{byte}:@var{bit}. Exit status
f96e0b
+is zero if bit is set, non zero otherwise. This command is available only
f96e0b
+on platforms that support CMOS.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node cmp
f96e0b
 @subsection cmp
f96e0b
 
f96e0b
@@ -3557,8 +3664,24 @@ invoked with @option{-l}.  This may change in the future.
f96e0b
 @node crc
f96e0b
 @subsection crc
f96e0b
 
f96e0b
-@deffn Command crc file
f96e0b
-Display the CRC32 checksum of @var{file}.
f96e0b
+@deffn Command crc arg @dots{}
f96e0b
+Alias for @code{hashsum --hash crc32 arg @dots{}}. See command @command{hashsum}
f96e0b
+(@pxref{hashsum}) for full description.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node cryptomount
f96e0b
+@subsection cryptomount
f96e0b
+
f96e0b
+@deffn Command cryptomount device|@option{-u} uuid|@option{-a}|@option{-b}
f96e0b
+Setup access to encrypted device. If necessary, passphrase
f96e0b
+is requested interactively. Option @var{device} configures specific grub device
f96e0b
+(@pxref{Naming convention}); option @option{-u} @var{uuid} configures device
f96e0b
+with specified @var{uuid}; option @option{-a} configures all detected encrypted
f96e0b
+devices; option @option{-b} configures all geli containers that have boot flag set.
f96e0b
+
f96e0b
+GRUB suports devices encrypted using LUKS and geli. Note that necessary modules (@var{luks} and @var{geli}) have to be loaded manually before this command can
f96e0b
+be used.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
@@ -3704,6 +3827,29 @@ is shut down using APM.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node hashsum
f96e0b
+@subsection hashsum
f96e0b
+
f96e0b
+@deffn Command hashsum @option{--hash} hash @option{--keep-going} @option{--uncompress} @option{--check} file [@option{--prefix} dir]|file @dots{}
f96e0b
+Compute or verify file hashes. Hash type is selected with option @option{--hash}.
f96e0b
+Supported hashes are: @samp{adler32}, @samp{crc64}, @samp{crc32},
f96e0b
+@samp{crc32rfc1510}, @samp{crc24rfc2440}, @samp{md4}, @samp{md5},
f96e0b
+@samp{ripemd160}, @samp{sha1}, @samp{sha224}, @samp{sha256}, @samp{sha512},
f96e0b
+@samp{sha384}, @samp{tiger192}, @samp{tiger}, @samp{tiger2}, @samp{whirlpool}.
f96e0b
+Option @option{--uncompress} uncompresses files before computing hash.
f96e0b
+
f96e0b
+When list of files is given, hash of each file is computed and printed,
f96e0b
+followed by file name, each file on a new line.
f96e0b
+
f96e0b
+When option @option{--check} is given, it points to a file that contains
f96e0b
+list of @var{hash name} pairs in the same format as used by UNIX
f96e0b
+@command{md5sum} command. Option @option{--prefix}
f96e0b
+may be used to give directory where files are located. Hash verification
f96e0b
+stops after the first mismatch was found unless option @option{--keep-going}
f96e0b
+was given.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node help
f96e0b
 @subsection help
f96e0b
 
f96e0b
@@ -3822,6 +3968,16 @@ block.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node loadfont
f96e0b
+@subsection loadfont
f96e0b
+
f96e0b
+@deffn Command loadfont file @dots{}
f96e0b
+Load specified font files. Unless absolute pathname is given, @var{file}
f96e0b
+is assumed to be in directory @samp{$prefix/fonts} with
f96e0b
+suffix @samp{.pf2} appended. @xref{Theme file format,,Fonts}.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node loopback
f96e0b
 @subsection loopback
f96e0b
 
f96e0b
@@ -3855,6 +4011,31 @@ name syntax}), then list the contents of that directory.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node lsfonts
f96e0b
+@subsection lsfonts
f96e0b
+
f96e0b
+@deffn Command lsfonts
f96e0b
+List loaded fonts.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node lsmod
f96e0b
+@subsection lsmod
f96e0b
+
f96e0b
+@deffn Command lsmod
f96e0b
+Show list of loaded modules.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node md5sum
f96e0b
+@subsection md5sum
f96e0b
+
f96e0b
+@deffn Command md5sum arg @dots{}
f96e0b
+Alias for @code{hashsum --hash md5 arg @dots{}}. See command @command{hashsum}
f96e0b
+(@pxref{hashsum}) for full description.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node normal
f96e0b
 @subsection normal
f96e0b
 
f96e0b
@@ -3940,7 +4121,7 @@ to generate password hashes.  @xref{Security}.
f96e0b
 @node play
f96e0b
 @subsection play
f96e0b
 
f96e0b
-@deffn Command play file | tempo [pitch1 duration1] [pitch2 duration2] ...
f96e0b
+@deffn Command play file | tempo [pitch1 duration1] [pitch2 duration2] @dots{}
f96e0b
 Plays a tune
f96e0b
 
f96e0b
 If the argument is a file name (@pxref{File name syntax}), play the tune
f96e0b
@@ -3956,6 +4137,15 @@ a rest.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node probe
f96e0b
+@subsection probe
f96e0b
+
f96e0b
+@deffn Command probe [@option{--set} var] @option{--driver}|@option{--partmap}|@option{--fs}|@option{--fs-uuid}|@option{--label} device
f96e0b
+Retrieve device information. If option @option{--set} is given, assign result
f96e0b
+to variable @var{var}, otherwise print information on the screen.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node pxe_unload
f96e0b
 @subsection pxe_unload
f96e0b
 
f96e0b
@@ -3984,6 +4174,26 @@ Reboot the computer.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node regexp
f96e0b
+@subsection regexp
f96e0b
+
f96e0b
+@deffn Command regexp [@option{--set} [number:]var] regexp string
f96e0b
+Test if regular expression @var{regexp} matches @var{string}. Supported
f96e0b
+regular expressions are POSIX.2 Extended Regular Expressions. If option
f96e0b
+@option{--set} is given, store @var{number}th matched subexpression in
f96e0b
+variable @var{var}. Subexpressions are numbered in order of their opening
f96e0b
+parentheses starting from @samp{1}.  @var{number} defaults to @samp{1}.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node rmmod
f96e0b
+@subsection rmmod
f96e0b
+
f96e0b
+@deffn Command rmmod module
f96e0b
+Remove a loaded @var{module}.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node save_env
f96e0b
 @subsection save_env
f96e0b
 
f96e0b
@@ -4176,6 +4386,43 @@ arguments, print all environment variables with their values.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node sha1sum
f96e0b
+@subsection sha1sum
f96e0b
+
f96e0b
+@deffn Command sha1sum arg @dots{}
f96e0b
+Alias for @code{hashsum --hash sha1 arg @dots{}}. See command @command{hashsum}
f96e0b
+(@pxref{hashsum}) for full description.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node sha256sum
f96e0b
+@subsection sha256sum
f96e0b
+
f96e0b
+@deffn Command sha256sum arg @dots{}
f96e0b
+Alias for @code{hashsum --hash sha256 arg @dots{}}. See command @command{hashsum}
f96e0b
+(@pxref{hashsum}) for full description.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node sha512sum
f96e0b
+@subsection sha512sum
f96e0b
+
f96e0b
+@deffn Command sha512sum arg @dots{}
f96e0b
+Alias for @code{hashsum --hash sha512 arg @dots{}}. See command @command{hashsum}
f96e0b
+(@pxref{hashsum}) for full description.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
+@node sleep
f96e0b
+@subsection sleep
f96e0b
+
f96e0b
+@deffn Command sleep [@option{--verbose}] [@option{--interruptible}] count
f96e0b
+Sleep for @var{count} seconds. If option @option{--interruptible} is given,
f96e0b
+allow @key{ESC} to interrupt sleep. With @option{--verbose} show countdown
f96e0b
+of remaining seconds.
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node source
f96e0b
 @subsection source
f96e0b
 
f96e0b
@@ -4189,6 +4436,74 @@ will not be shown immediately.
f96e0b
 @end deffn
f96e0b
 
f96e0b
 
f96e0b
+@node test
f96e0b
+@subsection test
f96e0b
+
f96e0b
+@deffn Command test expression
f96e0b
+Evaluate @var{expression} and return zero exit status if result is true,
f96e0b
+non zero status otherwise.
f96e0b
+
f96e0b
+@var{expression} is one of:
f96e0b
+
f96e0b
+@table @asis
f96e0b
+@item @var{string1} @code{==} @var{string2}
f96e0b
+the strings are equal
f96e0b
+@item @var{string1} @code{!=} @var{string2}
f96e0b
+the strings are not equal
f96e0b
+@item @var{string1} @code{<} @var{string2}
f96e0b
+@var{string1} is lexicographically less than @var{string2}
f96e0b
+@item @var{string1} @code{<=} @var{string2}
f96e0b
+@var{string1} is lexicographically less or equal than @var{string2}
f96e0b
+@item @var{string1} @code{>} @var{string2}
f96e0b
+@var{string1} is lexicographically greater than @var{string2}
f96e0b
+@item @var{string1} @code{>=} @var{string2}
f96e0b
+@var{string1} is lexicographically greater or equal than @var{string2}
f96e0b
+@item @var{integer1} @code{-eq} @var{integer2}
f96e0b
+@var{integer1} is equal to @var{integer2}
f96e0b
+@item @var{integer1} @code{-ge} @var{integer2}
f96e0b
+@var{integer1} is greater than or equal to @var{integer2}
f96e0b
+@item @var{integer1} @code{-gt} @var{integer2}
f96e0b
+@var{integer1} is greater than @var{integer2}
f96e0b
+@item @var{integer1} @code{-le} @var{integer2}
f96e0b
+@var{integer1} is less than or equal to @var{integer2}
f96e0b
+@item @var{integer1} @code{-lt} @var{integer2}
f96e0b
+@var{integer1} is less than @var{integer2}
f96e0b
+@item @var{integer1} @code{-ne} @var{integer2}
f96e0b
+@var{integer1} is not equal to @var{integer2}
f96e0b
+@item @var{prefix}@var{integer1} @code{-pgt} @var{prefix}@var{integer2}
f96e0b
+@var{integer1} is greater than @var{integer2} after stripping off common non-numeric @var{prefix}.
f96e0b
+@item @var{prefix}@var{integer1} @code{-plt} @var{prefix}@var{integer2}
f96e0b
+@var{integer1} is less than @var{integer2} after stripping off common non-numeric @var{prefix}.
f96e0b
+@item @var{file1} @code{-nt} @var{file2}
f96e0b
+@var{file1} is newer than @var{file2} (modification time). Optionally numeric @var{bias} may be directly appended to @code{-nt} in which case it is added to the first file modification time.
f96e0b
+@item @var{file1} @code{-ot} @var{file2}
f96e0b
+@var{file1} is older than @var{file2} (modification time). Optionally numeric @var{bias} may be directly appended to @code{-ot} in which case it is added to the first file modification time.
f96e0b
+@item @code{-d} @var{file}
f96e0b
+@var{file} exists and is a directory
f96e0b
+@item @code{-e} @var{file}
f96e0b
+@var{file} exists
f96e0b
+@item @code{-f} @var{file}
f96e0b
+@var{file} exists and is not a directory
f96e0b
+@item @code{-s} @var{file}
f96e0b
+@var{file} exists and has a size greater than zero
f96e0b
+@item @code{-n} @var{string}
f96e0b
+the length of @var{string} is nonzero
f96e0b
+@item @var{string}
f96e0b
+@var{string} is equivalent to @code{-n @var{string}}
f96e0b
+@item @code{-z} @var{string}
f96e0b
+the length of @var{string} is zero
f96e0b
+@item @code{(} @var{expression} @code{)}
f96e0b
+@var{expression} is true
f96e0b
+@item @code{!} @var{expression}
f96e0b
+@var{expression} is false
f96e0b
+@item @var{expression1} @code{-a} @var{expression2}
f96e0b
+both @var{expression1} and @var{expression2} are true
f96e0b
+@item @var{expression1} @code{-o} @var{expression2}
f96e0b
+either @var{expression1} or @var{expression2} is true
f96e0b
+@end table
f96e0b
+@end deffn
f96e0b
+
f96e0b
+
f96e0b
 @node true
f96e0b
 @subsection true
f96e0b
 
f96e0b
@@ -4211,6 +4526,25 @@ Unset the environment variable @var{envvar}.
f96e0b
 
f96e0b
 This command is not yet implemented for GRUB 2, although it is planned.
f96e0b
 
f96e0b
+
f96e0b
+@ignore
f96e0b
+@node vbeinfo
f96e0b
+@subsection vbeinfo
f96e0b
+
f96e0b
+@deffn Command vbeinfo [[WxH]xD]
f96e0b
+Alias for command @command{videoinfo} (@pxref{videoinfo}). It is available
f96e0b
+only on PC BIOS platforms.
f96e0b
+@end deffn
f96e0b
+@end ignore
f96e0b
+
f96e0b
+
f96e0b
+@node videoinfo
f96e0b
+@subsection videoinfo
f96e0b
+
f96e0b
+@deffn Command videoinfo [[WxH]xD]
f96e0b
+List available video modes. If resolution is given, show only matching modes.
f96e0b
+@end deffn
f96e0b
+
f96e0b
 @node Internationalisation
f96e0b
 @chapter Charset
f96e0b
 GRUB uses UTF-8 internally other than in rendering where some GRUB-specific
f96e0b
@@ -4311,7 +4645,7 @@ Identifiers containing non-ASCII may work but aren't supported.
f96e0b
 Only the ASCII space characters (space U+0020, tab U+000b, CR U+000d and
f96e0b
 LF U+000a) are recognised. Other unicode space characters aren't a valid
f96e0b
 field separator.
f96e0b
-@command{test} tests <, >, <=, >=, -pgt and -plt compare the strings in the
f96e0b
+@command{test} (@pxref{test}) tests <, >, <=, >=, -pgt and -plt compare the strings in the
f96e0b
 lexicographical order of unicode codepoints, replicating the behaviour of
f96e0b
 test from coreutils.
f96e0b
 environment variables and commands are listed in the same order.
f96e0b
@@ -4769,8 +5103,8 @@ Installing to the whole disk device is normally more robust.
f96e0b
 @item
f96e0b
 Check that GRUB actually knows how to read from the device and file system
f96e0b
 containing @file{/boot/grub}.  It will not be able to read from encrypted
f96e0b
-devices, nor from file systems for which support has not yet been added to
f96e0b
-GRUB.
f96e0b
+devices with unsupported encryption scheme, nor from file systems for which
f96e0b
+support has not yet been added to GRUB.
f96e0b
 @end itemize
f96e0b
 
f96e0b
 
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b