From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Mar 2010 14:10:02 +0000 (+0100)
Subject: Merge mbhtag into mbtag
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc375d6161a6ac7b811879195696ddee5ae01dba;p=thirdparty%2Fgrub.git

Merge mbhtag into mbtag
---

dc375d6161a6ac7b811879195696ddee5ae01dba
diff --cc doc/multiboot.texi
index a421e1ca2,6267efd42..6b71e599b
--- a/doc/multiboot.texi
+++ b/doc/multiboot.texi
@@@ -505,6 -549,36 +549,35 @@@ a text mode. The value zero indicates t
  preference.
  @end table
  
+ @subsection The EGA text tag of Multiboot header
+ 
+ @example
+ @group
+         +-------------------+
+ 0       | type = 5          |
+ 4       | size = 12         |
+ 8-11    | optional          |
+         +-------------------+
+ @end group
+ @end example
+ 
+ This tag indicates that the OS image has EGA text support.
+ 
+ 
 -@node Module alignment header tag
+ @subsection Module alignment tag
+ 
+ @example
+ @group
+         +-------------------+
+ 0       | type = 6          |
+ 4       | size = 12         |
+ 8-11    | optional          |
+         +-------------------+
+ @end group
+ @end example
+ 
+ If this tag is present modules must be page aligned.
+ 
  
  @node Machine state
  @section Machine state