no_comment

4 files changed, 6 insertions, 6 deletions

diff --git a/docs/TODO b/docs/TODO
index d9365f347..6ae4226a5 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -22,8 +22,6 @@ suggested partition tables must be better foreach installClass
 
 (fpons)verify the free space is big enough.
 
-have a better time estimation of the remaining time in install packages
-
 (fpons)pb with dependencies ``missing'': icewm do not require XFree86 and so you can have icewm but no X server
 
 (fpons)modem config
@@ -37,6 +35,8 @@ have a better time estimation of the remaining time in install packages
 (done,pix)ask for more than the memory size detected
 
 --------------------------------------------------------------------------------
+have a better time estimation of the remaining time in install packages
+
 smaller zsh (or ash in initrd)
 
 initrd in bzip2
diff --git a/make_boot_img b/make_boot_img
index 45eb6fbe7..560c4c688 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -89,10 +89,11 @@ sub msg_boot_img {
     _ "cat vmlinuz > $mnt/vmlinuz";
     initrd("${mnt}2", "$mnt/$type.rdz");
     
+    my $timeout = $ks ? 1 : 72;
     output("$mnt/syslinux.cfg", "
 default linux
 prompt 1
-timeout 72
+timeout $timeout
 display boot.msg
 F1 boot.msg
 F2 general.msg
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 795d859b1..406ecbbdf 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -81,7 +81,6 @@ sub write($;$) {
 
 sub detect() {
     my %l;
-    eval { modules::load("serial") };
     @l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) or die "mouseconfig failed";
     \%l;
 }
diff --git a/perl-install/share/po/Changelog b/perl-install/share/po/Changelog
index 663b3e876..2f055b01c 100644
--- a/perl-install/share/po/Changelog
+++ b/perl-install/share/po/Changelog
@@ -1,10 +1,10 @@
 1999-11-05  Pablo Saratxaga <pablo@mandrakesoft.com>
 	* pl.po: added Polish language file
 	* ru.po: updated russian file
-	* no.po: compelted norwegian file
+	* no.po: completed norwegian file
 
 1999-11-04  Pablo Saratxaga <pablo@mandrakesoft.com>
-	* es.po: updated andcompleted spanish language file
+	* es.po: updated and completed spanish language file
 	* wa.po: updated walon language file
 
 1999-10-30  Pablo Saratxaga <pablo@mandrakesoft.com>