* docs/grub.texi (Naming convention): Use GRUB 2 syntax.

(File name syntax): Likewise.
(help): --all is no longer supported in GRUB 2.  Be more precise
about pattern matching.

diff --git a/ChangeLog b/ChangeLog
index bc1b2686ae8a89cdb588a1e348ad8053239456d1..3a463ab428ac87497ef88984369cdea8d5352e08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+       * docs/grub.texi (Naming convention): Use GRUB 2 syntax.
+       (File name syntax): Likewise.
+       (help): --all is no longer supported in GRUB 2.  Be more precise
+       about pattern matching.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
        * normal/completion.c (grub_normal_do_completion): When completing

diff --git a/docs/grub.texi b/docs/grub.texi
index 37016b1758ed534af9ad3be6646d6b3b6b8d9749..ffc6b8fe21f7c7c5912715a8ddf32e0064996694 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -390,14 +390,14 @@ GRUB searches for the first @sc{pc} slice which has a BSD @samp{a}
 partition.
 
 Of course, to actually access the disks or partitions with GRUB, you
-need to use the device specification in a command, like @samp{root
-(fd0)} or @samp{unhide (hd0,3)}. To help you find out which number
-specifies a partition you want, the GRUB command-line
+need to use the device specification in a command, like @samp{set
+root=(fd0)} or @samp{parttool (hd0,3) hidden-}. To help you find out
+which number specifies a partition you want, the GRUB command-line
 (@pxref{Command-line interface}) options have argument
 completion. This means that, for example, you only need to type
 
 @example
-root (
+set root=(
 @end example
 
 followed by a @key{TAB}, and GRUB will display the list of drives,
@@ -1186,8 +1186,8 @@ example is @samp{(hd0,1)/boot/grub/grub.cfg}. This means the file
 @file{/boot/grub/grub.cfg} in the first partition of the first hard
 disk. If you omit the device name in an absolute file name, GRUB uses
 GRUB's @dfn{root device} implicitly. So if you set the root device to,
-say, @samp{(hd1,1)} by the command @command{root} (@pxref{root}), then
-@code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
+then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
 
 
 @node Block list syntax
@@ -1742,15 +1742,13 @@ is shut down using APM.
 @node help
 @subsection help
 
-@deffn Command help @option{--all} [pattern @dots{}]
+@deffn Command help [pattern @dots{}]
 Display helpful information about builtin commands. If you do not
-specify @var{pattern}, this command shows short descriptions of most of
-available commands. If you specify the option @option{--all} to this
-command, short descriptions of rarely used commands (such as
-@ref{testload}) are displayed as well.
+specify @var{pattern}, this command shows short descriptions of all
+available commands.
 
 If you specify any @var{patterns}, it displays longer information
-about each of the commands which match those @var{patterns}.
+about each of the commands whose names begin with those @var{patterns}.
 @end deffn