merge anaconda-8-0-branch to HEAD

6 files changed, 16 insertions, 16 deletions

diff --git a/bootdisk/i386/boot.msg b/bootdisk/i386/boot.msg
index 1c889c5e9..572ff35db 100644
--- a/bootdisk/i386/boot.msg
+++ b/bootdisk/i386/boot.msg
@@ -5,7 +5,7 @@
     press the 0f<ENTER>07 key.
 
  -  To install or upgrade 02Red Hat07 Linux in text mode, type: 
-   0flinux text <ENTER>07.
+    0flinux text <ENTER>07.
 
  -  Use the function keys listed below for more information.
 
diff --git a/bootdisk/i386/general.msg b/bootdisk/i386/general.msg
index 33edd9084..b26f7821e 100644
--- a/bootdisk/i386/general.msg
+++ b/bootdisk/i386/general.msg
@@ -4,12 +4,12 @@
                         09General Boot Help07
 
 You are now ready to begin the installation process.  In most cases, 
-the best way to get started is to simply press the <ENTER> key.
+the best way to get started is to simply press the 0f<ENTER>07 key.
 
 If you are having problems with the graphical installer, you can use the 
 'resolution=<width>x<height>' option to try and force a particular resolution.
-For example, boot with 'linux resolution=1024x768'. You may also want to
-try 'linux lowres'.
+For example, boot with '0flinux resolution=1024x76807'. You may also want to
+try '0flinux lowres07'.
 
 Certain hardware configurations may have trouble with the automatic hardware
 detection done during the installation.  If you experience problems during the 
@@ -17,7 +17,7 @@ installation, restart the installation adding the 'noprobe' option.  The
 'skipddc' option will also skip monitor probing which hangs some systems.
 
 There are a number of parameters that can be passed to the Linux kernel
-at boot time.  Press <F4> for more information. 
+at boot time.  Press 0f<F4>07 for more information. 
 
 
 02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
diff --git a/bootdisk/i386/options.msg b/bootdisk/i386/options.msg
index dc51cb15c..c0556c861 100644
--- a/bootdisk/i386/options.msg
+++ b/bootdisk/i386/options.msg
@@ -3,20 +3,20 @@
 
                        09Installer Boot Options07
 
- -  To disable hardware probing, type: linux noprobe <ENTER>.  
+ -  To disable hardware probing, type: 0flinux noprobe <ENTER>07.  
 
- -  To test the install media you are using, type: linux mediacheck <ENTER>.  
+ -  To test the install media you are using, type: 0flinux mediacheck <ENTER>07.  
 
- -  To enable rescue mode, type: linux rescue <ENTER>.  
-    Press <F5> for more information about rescue mode.
+ -  To enable rescue mode, type: 0flinux rescue <ENTER>07.  
+    Press 0f<F5>07 for more information about rescue mode.
 
- -  If you have a driver disk, type: linux dd <ENTER>.
+ -  If you have a driver disk, type: 0flinux dd <ENTER>07.
 
  -  To prompt for the install method being used on a CD-ROM install, 
-    type linux askmethod <ENTER>.
+    type 0flinux askmethod <ENTER>07.
 
- -  If you have an installer update disk, type: linux updates <ENTER>.
+ -  If you have an installer update disk, type: 0flinux updates <ENTER>07.
 
- -  To install using a 640x480 resolution, type: linux lowres
+ -  To install using a 640x480 resolution, type: 0flinux lowres07.
 
 02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
diff --git a/bootdisk/i386/param.msg b/bootdisk/i386/param.msg
index 23ba176b0..76da7ffe1 100644
--- a/bootdisk/i386/param.msg
+++ b/bootdisk/i386/param.msg
@@ -8,12 +8,12 @@ passed to the kernel.  This does not include options to modules for devices
 such as ethernet cards or devices such as CD-ROM drives.
 
 To pass an option to the kernel, use the following format:
-     linux <options>
+     0flinux <options>07
 If a different installation mode is desired, enter it after the option(s).
 
 For example, to install on a system with 128MB of RAM using noprobe mode, 
 type the following:
-     linux mem=128M noprobe
+     0flinux mem=128M noprobe07
 
 To pass options to modules, you will need to use the noprobe mode to disable
 PCI autoprobing.  When the installer asks for your device type that needs
diff --git a/bootdisk/i386/rescue.msg b/bootdisk/i386/rescue.msg
index d83815a9e..a5ab02492 100644
--- a/bootdisk/i386/rescue.msg
+++ b/bootdisk/i386/rescue.msg
@@ -9,7 +9,7 @@ useful utilities (editor, hard drive and RAID tools, etc.) which will allow
 one to restore a system to a working state.
 
 To enter the rescue mode, boot your system from the 02Red Hat07 Linux 
-CDROM and type linux rescue <ENTER>.
+CDROM and type 0flinux rescue <ENTER>07.
 
 
 
diff --git a/bootdisk/i386/syslinux-splash.png b/bootdisk/i386/syslinux-splash.png
index 82a5df987..419678825 100644
--- a/bootdisk/i386/syslinux-splash.png
+++ b/bootdisk/i386/syslinux-splash.png