Merge mbhtag into mbtag

diff --cc doc/multiboot.texi
index a421e1ca2b71fd748c41cd3f6ec2415a1e52a096,6267efd4259aad8f97ce097bd717d066edf031e4..6b71e599b6fd63163e1cff0a3b2a8acb08416f2f
--- 1/doc/multiboot.texi
--- 2/doc/multiboot.texi
+++ b/doc/multiboot.texi
@@@ -505,6 -549,36 +549,35 @@@ a text mode. The value zero indicates t
  preference.
  @end table
  
 -@node Module alignment header tag
+ @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.
+ 
+ 
+ @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