Index: TipAndDoc/boot/grub.cfg
===================================================================
--- TipAndDoc/boot/grub.cfg	(revision 3a04f866516143b8b0d83ded10313b4dda56ff9f)
+++ TipAndDoc/boot/grub.cfg	(revision 7c49e8f805c44fe804e1a134d5c0040dbd9bb6dc)
@@ -16,8 +16,8 @@
 
 menuentry "memtest86+ 4.20" {
-	linux16 /boot/memtest.plus
+	linux16 /boot/memtest.bin
 }
 
-menuentry "Plop Boot Manager 5.0.13" {
+menuentry "Plop Boot Manager 5.0.14" {
 	linux16 /boot/plpbt.bin
 }
@@ -34,4 +34,20 @@
 	loopback loop /boot/iso/debian-squeeze-x86_64.iso
 	echo 'Loading Linux 2.6.32-5-amd64 ...'
+	linux (loop)/linux vga=788 initrd=initrd.gz
+	echo 'Loading initrd.gz ...'
+	initrd (loop)/initrd.gz
+}
+
+menuentry "Ubuntu 12.04 (i386) installer" {
+	loopback loop /boot/iso/12.04-i386.iso
+	echo 'Loading Linux 3.2.0-23-generic-pae i386 ...'
+	linux (loop)/linux vga=788 initrd=initrd.gz
+	echo 'Loading initrd.gz ...'
+	initrd (loop)/initrd.gz
+}
+
+menuentry "Ubuntu 12.04 (x86_64) installer" {
+	loopback loop /boot/iso/12.04-x86_64.iso
+	echo 'Loading Linux 3.2.0-23-generic x86_64 ...'
 	linux (loop)/linux vga=788 initrd=initrd.gz
 	echo 'Loading initrd.gz ...'
@@ -55,23 +71,6 @@
 }
 
-menuentry "Ubuntu 11.10 (i386) installer" {
-	loopback loop /boot/iso/11.10-i386.iso
-	echo 'Loading Linux 3.0.0-12-generic i386 ...'
-	linux (loop)/linux vga=normal initrd=initrd.gz
-	echo 'Loading initrd.gz ...'
-	initrd (loop)/initrd.gz
-}
-
-menuentry "Ubuntu 11.10 (x86_64) installer" {
-	loopback loop /boot/iso/11.10-x86_64.iso
-	echo 'Loading Linux 3.0.0-12-generic x86_64 ...'
-	linux (loop)/linux vga=normal initrd=initrd.gz
-	echo 'Loading initrd.gz ...'
-	initrd (loop)/initrd.gz
-}
-
 menuentry "FreeDOS/V V01L38" {
-	loopback loop /boot/iso/fdbasecd.iso
-	linux16 (loop)/isolinux/data/memdisk
+	linux16 /boot/memdisk
 	echo 'Loading fdos0138.img ...'
 	initrd16 /boot/fdos0138.img
@@ -79,7 +78,6 @@
 
 menuentry "FreeDOS 1.0 Final" {
-	loopback loop /boot/iso/fdbasecd.iso
-	linux16 (loop)/isolinux/data/memdisk
+	linux16 /boot/memdisk
 	echo 'Loading fdboot.img ...'
-	initrd16 (loop)/isolinux/data/fdboot.img
+	initrd16 /boot/fdboot.img
 }