*** empty log message ***

5 files changed, 14 insertions, 10 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 462c289ba..19fe1c317 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,8 +1,16 @@
+2000-10-06  François Pons  <fpons@mandrakesoft.com>
+
+	* install_steps_interactive.pm, install_steps_gtk.pm: updated
+	license.
+
+	* Xconfigurator.pm: removed Matrox G200/G400 3D acceleration by
+	DRI, use only Mesa with Utah GLX.
+
 2000-10-06  DrakX <install@linux-mandrake.com>
 
 	* snapshot uploaded
 
-2000-10-05  François Pons  <fpons@mandrakesoft.com>
+2000-10-06  François Pons  <fpons@mandrakesoft.com>
 
 	* install2.pm: fixed bad call to hasUsb...
 
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 203d184fe..3f0863592 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -200,7 +200,7 @@ sub cardConfiguration(;$$$) {
 				      $card->{type} =~ /SiS /);
     #- 3D acceleration configuration for XFree 4.0 using DRI.
     $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || $card->{identifier} =~ /Voodoo Banshee/ || #- 16bit only
-			$card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI)
+			#$card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI)
 			$card->{identifier} =~ /8281[05].* CGC/ || #- 16bit (Intel 810 & 815).
 			$card->{identifier} =~ /Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA.
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index d4ae5563f..a3ca086a4 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -532,7 +532,7 @@ sub installPackages {
 Warning
 
 Please read carefully the terms below. If you disagree with any
-portion, you are not allowed to install the next CD media. Press 'Cancel' 
+portion, you are not allowed to install the next CD media. Press 'Refuse' 
 to continue the installation without using these media.
 
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a0361cf6a..848b8c11c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -93,12 +93,8 @@ Software Products.
 2. Limited Warranty
 
 The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
-extent permitted by law. Should the Software Products be defective, MandrakeSoft S.A. will at its 
-own will either replace the Software Products, or reimburse the paid fee.
-This limited warranty is void if you fail to comply to the recommendations, instructions and 
-conditions 
-of use listed in the documentation or license agreements of the Software Products.
-To the extent permitted by law, MandrakeSoft S.A. will in no circumstances be liable for any special, 
+extent permitted by law.
+MandrakeSoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
 incidental, direct or indirect damages whatsoever (including without limitation damages for loss of 
 business, interruption of business, financial loss, legal fees and penalties resulting from a court 
 judgment, or any other consequential loss) arising out of  the use or inability to use the Software 
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 9f811fd34..4131ca2a4 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-10-06 13:06+0200\n"
+"POT-Creation-Date: 2000-10-06 14:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"