Modified x86-help.msg to remove agpgart line, add noload= line, and replace tabs...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@540 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index cae6b9e5c47173282514892c08d3ebfc0333b81b..3f8038e06af244426f265a7f72beb020502e03f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.166 2005/01/29 14:33:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.167 2005/01/29 14:43:42 wolf31o2 Exp $
+
+  29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/x86-help.msg:
+  Modified x86-help.msg to remove agpgart line, add noload= line, and replace
+  tabs with spaces.
 
   29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/x86-archscript.sh:

diff --git a/livecd/files/x86-help.msg b/livecd/files/x86-help.msg
index db0984d61c19b142d11219c6dba6522da52f56b4..af1b79b74222a886b7525606bc0df7ad17ecb5c8 100755 (executable)
--- a/livecd/files/x86-help.msg
+++ b/livecd/files/x86-help.msg
@@ -6,19 +6,19 @@ and splash images. Additionally, the memtest86 boot option is available
 to test local RAM for errors. To use memtest86, just type 'memtest86'.
 
 Options available to pass to your kernel of choice.
-- agpgart       loads agpgart (use if you have graphic problems,lockups)
 - acpi=on       loads support for ACPI firmware
 - ide=nodma     force disabling of DMA for malfunctioning IDE devices
-- doscsi        scan for scsi devices (breaks some ethernet cards)
-- dopcmcia      starts pcmcia service for PCMCIA cdroms
-- nofirewire    disables firewire modules in initrd (for firewire cdroms,etc)
-- nokeymap      disables keymap selection for non-us keyboard layouts
-- docache       cache the entire runtime portion of cd in RAM, allows you
-               to umount /mnt/cdrom to mount another cdrom.
-- nodetect      causes hwsetup/kudzu and hotplug not to run
-- nousb         disables usb module load from initrd, disables hotplug
-- nodhcp        dhcp does not automatically start if nic detected
-- nohotplug     disables loading hotplug service
-- noapic        disable apic (try if having hardware problems nics,scsi,etc)
-- hdx=stroke   allows you to partition the whole harddrive even when your BIOS
-               can't handle large harddrives
+- doscsi        scan for SCSI devices (breaks some ethernet cards)
+- dopcmcia      starts card services for PCMCIA CDROMs
+- nofirewire    disables firewire modules in initrd (for firewire CDROMs,etc)
+- nokeymap      disables keymap selection for non-US keyboard layouts
+- docache       cache the entire runtime portion of CD in RAM, allows you
+                to umount /mnt/cdrom to mount another CDROM.
+- nodetect      causes hwsetup/kudzu and hotplug/coldplug not to run
+- nousb         disables USB modules load from initrd
+- nodhcp        DHCP does not automatically start if NIC detected
+- nohotplug     disables loading hotplug/coldplug services
+- noapic        disable APIC (try if having hardware problems NICs,SCSI,etc)
+- hdx=stroke    allows you to partition the whole hard disk even when your BIOS
+                can't handle large hard disks
+- noload=       disables loading a specific module(s), good for debugging