From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 18 May 2011 15:53:36 +0000 (+0100)
Subject: merge trunk
X-Git-Tag: 2.00~1156^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e806ce60eeac7ef2303e47aebae4e744bdc505cc;p=thirdparty%2Fgrub.git

merge trunk
---

e806ce60eeac7ef2303e47aebae4e744bdc505cc
diff --cc docs/grub.texi
index 885bb4731,818417d41..26c51ed8b
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@@ -1140,8 -1203,7 +1203,8 @@@ listed in @file{/boot/grub/video.lst}
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
  you can only use modes which your graphics card supports via VESA BIOS
  Extensions (VBE), so for example native LCD panel resolutions may not be
 -available.  The default is @samp{640x480}.  @xref{gfxmode}.
 +available.  The default is @samp{auto}, which tries to select a preferred
- resolution.
++resolution.  @xref{gfxmode}.
  
  @item GRUB_BACKGROUND
  Set a background image for use with the @samp{gfxterm} graphical terminal.