merge trunk

docs/Makefile.am

@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 # AM_MAKEINFOFLAGS = --no-split --no-validate
-info_TEXINFOS = grub.texi
+info_TEXINFOS = grub.texi grub-dev.texi
 grub_TEXINFOS = fdl.texi
 
 

docs/font_char_metrics.txt

@@ -0,0 +1 @@
+Please fill this in.

docs/man/grub-bin2h.h2m

@@ -1,2 +0,0 @@
-[NAME]
-grub-bin2h \- convert a binary file to a C header

docs/man/grub-editenv.h2m

@@ -1,2 +1,5 @@
 [NAME]
 grub-editenv \- edit GRUB environment block
+[SEE ALSO]
+.BR grub-reboot (8),
+.BR grub-set-default (8)

docs/man/grub-emu.h2m

@@ -1,2 +1,6 @@
 [NAME]
 grub-emu \- GRUB emulator
+[SEE ALSO]
+If you are trying to install GRUB, then you should use
+.BR grub-install (8)
+rather than this program.

docs/man/grub-fstest.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-fstest \- debug tool for GRUB filesystem drivers
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-install.h2m

@@ -1,2 +1,7 @@
 [NAME]
 grub-install \- install GRUB to a device
+[SEE ALSO]
+.BR grub-mkconfig (8),
+.BR grub-mkimage (1),
+.BR grub-setup (8),
+.BR grub-mkrescue (1)

docs/man/grub-macho2img.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-macho2img \- convert Mach-O to raw image
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-menulst2cfg.h2m

@@ -1,3 +1,4 @@
 [NAME]
 grub-menulst2cfg \- transform legacy menu.lst into grub.cfg
-
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkconfig.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkconfig \- generate a GRUB configuration file
+[SEE ALSO]
+.BR grub-install (8)

docs/man/grub-mkdevicemap.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkdevicemap \- generate a GRUB device map file automatically
+[SEE ALSO]
+.BR grub-install (8)

docs/man/grub-mkfont.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkfont \- make GRUB font files
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkimage.h2m

@@ -1,2 +1,7 @@
 [NAME]
 grub-mkimage \- make a bootable image of GRUB
+[SEE ALSO]
+.BR grub-install (8),
+.BR grub-setup (8),
+.BR grub-mkrescue (1),
+.BR grub-mknetdir (8)

docs/man/grub-mklayout.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mklayout \- generate a GRUB keyboard layout file
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mknetdir.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mknetdir \- prepare a GRUB netboot directory.
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-mkpasswd-pbkdf2.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-mkrelpath.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkrelpath \- make a system path relative to its root
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-mkrescue.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-mkrescue \- make a GRUB rescue image
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-ofpathname.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-ofpathname \- find OpenBOOT path for a device
+[SEE ALSO]
+.BR grub-probe (8)

docs/man/grub-pe2elf.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-pe2elf \- convert PE image to ELF
+[SEE ALSO]
+.BR grub-mkimage (1)

docs/man/grub-probe.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-probe \- probe device information for GRUB
+[SEE ALSO]
+.BR grub-fstest (1)

docs/man/grub-reboot.h2m

@@ -1,2 +1,5 @@
 [NAME]
 grub-reboot \- set the default boot entry for GRUB, for the next boot only
+[SEE ALSO]
+.BR grub-set-default (8),
+.BR grub-editenv (1)

docs/man/grub-script-check.h2m

@@ -1,2 +1,4 @@
 [NAME]
 grub-script-check \- check grub.cfg for syntax errors
+[SEE ALSO]
+.BR grub-mkconfig (8)

docs/man/grub-set-default.h2m

@@ -1,2 +1,5 @@
 [NAME]
 grub-set-default \- set the saved default boot entry for GRUB
+[SEE ALSO]
+.BR grub-reboot (8),
+.BR grub-editenv (1)

docs/man/grub-setup.h2m

@@ -1,2 +1,6 @@
 [NAME]
 grub-setup \- set up a device to boot using GRUB
+[SEE ALSO]
+.BR grub-install (8),
+.BR grub-mkimage (1),
+.BR grub-mkrescue (1)