From 82c51231c64ee6a737aa46c4979fee1983a8fef2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Jun 2001 10:43:27 +0000
Subject: s/Linux-Mandrake/Mandrake Linux/ s/linux-mandrake/mandrakesoft/ (hand
 made, no i18n messages done)

---
 docs/README                    | 2 +-
 mdk-stage1/init.c              | 2 +-
 perl-install/detect_devices.pm | 2 +-
 rescue/tree/etc/issue          | 2 +-
 rescue/tree/etc/rc.sysinit     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/README b/docs/README
index 6aaeae06d..08d5613cc 100644
--- a/docs/README
+++ b/docs/README
@@ -6,7 +6,7 @@ to the RH newt install.
 ********************************************************************************
 Like all good free software, DrakX is in CVS :)
 
-You can access it at http://www.linux-mandrake.com/cgi-bin/cvsweb.cgi/gi
+You can access it at http://www.mandrakelinux.com/cgi-bin/cvsweb.cgi/gi
 
 or via
 
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index eb84c5e06..e0587f2a4 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
 		printf("*** TESTING MODE ***\n");
 
 
-	printf("\n\t\t\t\033[1;40mWelcome to Linux-\033[1;36mMandrake\033[0;39m\n\n");
+	printf("\n\t\t\t\033[1;40mWelcome to \033[1;36mMandrake\033[0;39m Linux\n\n");
 	
 	if (!testing) {
 		if (mount("/proc", "/proc", "proc", 0, NULL))
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 769cd0fe5..4afe2a120 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -228,7 +228,7 @@ sub stringlist {
 sub check {
     my ($l) = @_;
     my $ok = $l->{driver} !~ /(unknown|ignore)/;
-    $ok or log::l("skipping $l->{description}, no module available (if you know one, please mail bugs\@linux-mandrake.com)");
+    $ok or log::l("skipping $l->{description}, no module available (if you know one, please mail install\@mandrakesoft.com)");
     $ok
 }
 
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index 82433dac0..c7306ecb2 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -18,7 +18,7 @@
                       
 
 
-Linux Mandrake release 8.0 (Cooker)
+Mandrake Linux release 8.0 (Cooker)
 
 Use loadkeys to change your keyboard layout (eg: loadkeys fr)
 Use modprobe to load modules (eg: modprobe snd-card-fm801)
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index 3b2e4aebd..2c36c31c5 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -4,7 +4,7 @@ action() { echo $1; shift; $*; }
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
-echo -e "\t\t\tWelcome to Linux \\033[1;36mMandrake\\033[0;39m"
+echo -e "\t\t\tWelcome to \\033[1;36mMandrake\\033[0;39m Linux"
 
 action "Mounting proc filesystem" mount -n -t proc /proc /proc
 action "Remounting root filesystem in read-write mode" mount -n -o remount,rw /
-- 
cgit v1.2.1