no_comment

2 files changed, 21 insertions, 19 deletions

diff --git a/docs/README b/docs/README
index b38d47b3e..781867732 100644
--- a/docs/README
+++ b/docs/README
@@ -70,12 +70,12 @@ Mandrake/base/mdkinst_stage2.gz
 	generated from Mandrake/mdkinst tree using misc/make_mdkinst_stage2
 	See ``Ramdisk or not'' below for more.
 
-images/gi_*.img
+images/*.img
 	boot images to use with DrakX. Use:
-	- gi_hd for hard-disk install
-	- gi_cdrom for cdrom install
-	- gi_network for ftp/nfs install
-	- gi_pcmcia for pcmcia install (see ``PCMCIA install'' below for more)
+	- hd for hard-disk install
+	- cdrom for cdrom install
+	- network for ftp/nfs install
+	- pcmcia for pcmcia install (see ``PCMCIA install'' below for more)
 
 
 Some optional files :
@@ -127,9 +127,9 @@ not'' to know if you have to regenerate the mdkinst_stage2.gz)
 * PCMCIA install ***************************************************************
 ********************************************************************************
 If the media you use to install is a pcmcia device, you have two choices:
-- use the gi_pcmcia boot disk
+- use the pcmcia boot disk
 - use another boot disk and it will ask you a supplementary disk. Give it the
-gi_pcmcia disk.
+pcmcia disk.
 
 
 ********************************************************************************
@@ -169,8 +169,8 @@ Modules can be found in at least 3 places:
 - in /lib/modules/modules.cpio.bz2
 
 /modules/modules.cgz is used in stage1. It contains only modules interesting for
-one kind of install. For example in an gi_hd install, it contains scsi modules.
-For an gi_network install, it contains network card modules.
+one kind of install. For example in an hd install, it contains scsi modules.
+For an network install, it contains network card modules.
 
 /lib/modules/ contains modules that should be in /lib/modules/modules.cpio.bz2
 but are not for speed up. The serial.o module is there to speed up mouseconfig.
diff --git a/docs/TODO b/docs/TODO
index e408e8d20..228cdbb7b 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,25 +1,23 @@
-cyrillic font buggy in DrakX
-
-mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as 
+pcmcia.img does not handle hd/cdrom
 
-in ftp install, bug with X server install with wu-ftpd 2.6 (see http://www.wu-ftpd.org/broken-clients.html)
+cyrillic font buggy in DrakX
 
 remove xfs user from kdm
 
-bug rpmdrake: just after installing a package, switch to `Installed', the package has wrong name
-
 bug in users: mandrake user is added twice in strange installs
 (mixed of security 0 + ???)
 
-bug in diskdrake:
-in expert: blank, create hda5 at beginning, create hda6 at the end, create hda7
-in the middle, remove the first one. Result hda5 at the end and bug.
+mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as 
+
+in ftp install, bug with X server install with wu-ftpd 2.6 (see http://www.wu-ftpd.org/broken-clients.html)
+
+--------------------------------------------------------------------------------
+bug rpmdrake: just after installing a package, switch to `Installed', the package has wrong name
 
 urpmi: pb if XXX-devel requires XXX = 1.2.3 and we updgrade XXX-1.2.3
 
 standalone applications for configuration (netdrake, authentificationconf, soundcard)
 
---------------------------------------------------------------------------------
 Xconfiguration: if "can't open fixed font", relaunch xfs.
 
 bug in defcfg in with lang=fr_FR, display is buggy
@@ -38,6 +36,10 @@ paride in stage1
 
 bug in diskdrake: can in strange cases create a primary partition at sector #0
 
+(done,pix(partly, protection against bugging))bug in diskdrake:
+in expert: blank, create hda5 at beginning, create hda6 at the end, create hda7
+in the middle, remove the first one. Result hda5 at the end and bug.
+
 (pix)add paride.o (and the others)
 
 (pix)install text on mem=8M, mem=16M?