s/Linux-Mandrake/Mandrake Linux/

s/linux-mandrake/mandrakesoft/
(hand made, no i18n messages done)

18 files changed, 73 insertions, 73 deletions

diff --git a/docs/HACKING b/docs/HACKING
index d2ed0662b..301d8fe0b 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -11,7 +11,7 @@ Beware, don't try this on a production machine with important data.
 Sources installation:
 
   First grab the gi.tar.bz2 archive and untar it in your home directory,
-for example from DrakX-*.src.rpm on your Linux-Mandrake distribution.
+for example from DrakX-*.src.rpm on your Mandrake Linux distribution.
 
 cd to gi
 for i in `du -a | grep CVS/Root | cut -f 2`
@@ -34,7 +34,7 @@ Preparing the compilation process:
 
 (1) target directory
 
-create a /export directory and copy a recent Mandrake-Linux CD in there.
+create a /export directory and copy a recent Mandrake Linux CD in there.
 (You don't have to put have all the RPMS...) ; you'll need roughly 1.5
 Gbytes for a full install.
 
diff --git a/docs/README b/docs/README
index 18cab9475..6aaeae06d 100644
--- a/docs/README
+++ b/docs/README
@@ -317,7 +317,7 @@ many solutions:
    4. just like 3. but you may have to mount /cdrom after typing rescue on
       syslinux prompt (oem script do it automatically if a automatic boot nfs
       network has been done as server is known). under /cdrom may be anything
-      as long as it provides an installation tree of Linux-Mandrake.
+      as long as it provides an installation tree of Mandrake Linux.
       after that run oem script by typing "/etc/oem -f" for normal installation
       or "/etc/oem -f server" for server installation (normal with server installed).
 
diff --git a/live_update b/live_update
index 02d46ea18..0778b4ae8 100644
--- a/live_update
+++ b/live_update
@@ -8,11 +8,11 @@ if [ "$UID" -ne 0 ]; then
     if [ -x "$message" ]; then
 	case "$LANG" in
 	    fr*) buttons="Arrêter:0"
-		 msg="Mise à jour en direct de Linux-Mandrake.
+		 msg="Mise à jour en direct de Mandrake Linux.
 
 Vous devez être l'utilisateur root pour lancer cette application." ;;
 	    *) buttons="Abort:0"
-	       msg="Linux-Mandrake live upgrade.
+	       msg="Mandrake Linux live upgrade.
 
 You need to be root to start this program." ;;
 	esac
@@ -31,17 +31,17 @@ if [ ! -x "$distrib/Mandrake/mdkinst/usr/bin/perl-install/live_install" ]; then
     if [ -x "$message" ]; then
 	case "$LANG" in
 	    fr*) buttons="Arrêter:0"
-		 msg="Mise à jour en direct de Linux-Mandrake.
+		 msg="Mise à jour en direct de Mandrake Linux.
 
-Impossible de trouver le Cédérom d'installation de Linux-Mandrake dans le premier lecteur." ;;
+Impossible de trouver le Cédérom d'installation de Mandrake Linux dans le premier lecteur." ;;
 	    *) buttons="Abort:0"
-	       msg="Linux-Mandrake live upgrade.
+	       msg="Mandrake Linux live upgrade.
 
-Unable to find Linux-Mandrake Installation Cd-Rom in the first drive." ;;
+Unable to find Mandrake Linux Installation Cd-Rom in the first drive." ;;
 	esac
 	$message -buttons "$buttons" -print "$msg"
     else
-	echo >&2 "Unable to find Linux-Mandrake Installation Cd-Rom in the first drive."
+	echo >&2 "Unable to find Mandrake Linux Installation Cd-Rom in the first drive."
     fi
     exit 2
 fi
@@ -49,14 +49,14 @@ fi
 if [ -x "$message" ]; then
     case "$LANG" in
 	fr*) buttons="Mise à jour:0,Annuler:1"
-	     msg="Mise à jour en direct de Linux-Mandrake.
+	     msg="Mise à jour en direct de Mandrake Linux.
 
 Appuyez sur \"Mise à jour\" pour lancer la mise à jour de votre système,
 cela prendra quelques minutes avant que l'écran de DrakX apparaisse.
 
 Appuyez sur \"Annuler\" pour ne pas mettre à jour votre système de cette manière." ;;
 	*) buttons="Upgrade:0,Cancel:1"
-	   msg="Linux-Mandrake live upgrade.
+	   msg="Mandrake Linux live upgrade.
 
 Press \"Upgrade\" to start live upgrade on your system, note this will
 take some time to prepare the system before DrakX screen appears.
diff --git a/make_boot_img b/make_boot_img
index 1077f5811..520f10680 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -324,9 +324,9 @@ To Build a Bootable CD-ROM, try:
 	-f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd("${mnt}2", "$dir/$type.rdz");
 
 	output("$dir/boot.msg", "
-Welcome to Linux-Mandrake 7.1
+Welcome to Mandrake Linux 7.1
 
-Press <Enter> to install or upgrade a system 7mLinux-Mandrake7m
+Press <Enter> to install or upgrade a system 7mMandrake Linux7m
 ");
 
 	output("$dir/silo.conf", "
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 11150314b..9ade3816d 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -21,7 +21,7 @@
 /* If we have more than that amount of memory (in Mbytes), we assume we can load the second stage as a ramdisk */
 #define MEM_LIMIT_RAMDISK 52
 
-#define DISTRIB_NAME "Linux-Mandrake"
+#define DISTRIB_NAME "Mandrake Linux"
 
 #define RAMDISK_COMPRESSION_RATIO 1.95
 
diff --git a/mdk-stage1/doc/README b/mdk-stage1/doc/README
index e3747cf30..09edce6c2 100644
--- a/mdk-stage1/doc/README
+++ b/mdk-stage1/doc/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------
-*  Stage1 of the Linux-Mandrake installation program  *
+*  Stage1 of the Mandrake Linux installation program  *
 -------------------------------------------------------
 
 
@@ -60,9 +60,9 @@
                 -=-=-- Okay, now, more details --=-=-
 
 
-	[ Installing Linux-Mandrake ]
+	[ Installing Mandrake Linux ]
 
-Per default, just insert your Linux-Mandrake Installation CD into your
+Per default, just insert your Mandrake Linux Installation CD into your
 CDROM tray, be sure your system BIOS is configured to boot on your CDROM,
 and that's all.
 
@@ -153,7 +153,7 @@ it's more basic but still usable :-).
 
 (#2) A shell is provided on second console in some cases (you need to
 compile it with -DSPAWN_SHELL and you need to provide a valid shell in the
-initrd) and of course it's not in, in image files of Linux-Mandrake
+initrd) and of course it's not in, in image files of Mandrake Linux
 releases because it's too much diskspace.
 
 (#3) The log is printed out on the third console. This is the location
@@ -176,7 +176,7 @@ feature. It's implemented with a fork and a Unix pipe.
 
         [ Rescueing a system ]
 
-Since Linux-Mandrake 7.1, we provide a rescue system through each of the
+Since Mandrake Linux 7.1, we provide a rescue system through each of the
 previously described methods. You don't need a special "rescue.img" file.
 Just hit "F1" at boot time, type in "rescue", and follow the first steps
 of the installation according to the method you chose (choose
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index e919f0cce..03f806da6 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -9265,7 +9265,7 @@
 	* standalone/drakgw: make only one call to urpmi in order
 	to install all the needed rpm's
 
-2000-10-10  DrakX <install@linux-mandrake.com>
+2000-10-10  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9273,7 +9273,7 @@
 
 	* install2.pm: increase $::VERSION
 
-2000-10-09  DrakX <install@linux-mandrake.com>
+2000-10-09  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9281,7 +9281,7 @@
 
 	* share/po/fr.po: update after Dam's new messages in netconnect
 
-2000-10-09  DrakX <install@linux-mandrake.com>
+2000-10-09  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9300,7 +9300,7 @@
 
 	* standalone/draknet: added wait message
 
-2000-10-09  DrakX <install@linux-mandrake.com>
+2000-10-09  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9319,7 +9319,7 @@
 	(adsl_conf): if during install, don't use chkconfig, make the
 	links directly for the adsl init script.
 
-2000-10-09  DrakX <install@linux-mandrake.com>
+2000-10-09  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9338,7 +9338,7 @@
 	* install_interactive.pm: take into account RAID partitions for
 	searching / partition.
 
-2000-10-09  DrakX <install@linux-mandrake.com>
+2000-10-09  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9360,7 +9360,7 @@
 	desktop meta_class)
 	(chooseGroups): compute the size of Miscellaneous
 
-2000-10-07  DrakX <install@linux-mandrake.com>
+2000-10-07  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9370,7 +9370,7 @@
 	(those files are usefull if RPM_INSTALL_LANG doesn't include that
 	lang)	
 
-2000-10-07  DrakX <install@linux-mandrake.com>
+2000-10-07  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9380,7 +9380,7 @@
 	able to track not installed packages that should have been
 	installed)	
 
-2000-10-06  DrakX <install@linux-mandrake.com>
+2000-10-06  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9390,7 +9390,7 @@
 	(intro): connection detection improved : now use "ifconfig | grep interface"
 	(pppConfig): corrected cnx_up/down
 
-2000-10-06  DrakX <install@linux-mandrake.com>
+2000-10-06  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9429,7 +9429,7 @@
 
 	* pci_probing/pcitable: fixed Cirrus Logic sound card.
 
-2000-10-06  DrakX <install@linux-mandrake.com>
+2000-10-06  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9440,7 +9440,7 @@
 	* share/Cards+: fixed wrong use of SiS card with 4.0.1, only keep
 	530, 620 and 6326 with XFree 4.0.1.
 
-2000-10-06  DrakX <install@linux-mandrake.com>
+2000-10-06  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9493,7 +9493,7 @@
 	* printerdrake.pm: install ghostscript-utils if a lexmark printer
 	is selected on cups.
 
-2000-10-05  DrakX <install@linux-mandrake.com>
+2000-10-05  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9535,7 +9535,7 @@
 	corrected, network is restarted, buttons connect/disconnect
 	debugged. 
 
-2000-10-04  DrakX <install@linux-mandrake.com>
+2000-10-04  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9565,7 +9565,7 @@
 	* c/stuff.xs.pm: added time interval of 200ms between update of
 	progression bar of install, make sure the last step is seen.
 
-2000-10-04  DrakX <install@linux-mandrake.com>
+2000-10-04  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9599,7 +9599,7 @@
 	* install_any.pm (loadO): use first floppy drive available (won't
 	help much though, as stage1 doesn't follow this...)
 
-2000-10-03  DrakX <install@linux-mandrake.com>
+2000-10-03  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9638,7 +9638,7 @@
 
 	* share/Cards+: fixed Savage2000 entry.
 
-2000-10-03  DrakX <install@linux-mandrake.com>
+2000-10-03  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9652,7 +9652,7 @@
 
 	* share/po/fr.po: fixed bug #518 and fixed other misc errors
 
-2000-10-03  DrakX <install@linux-mandrake.com>
+2000-10-03  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9704,7 +9704,7 @@
 	* pci_probing/pcitable: s|snd-card-via686a|via82cxxx_audio|; like
 	jeff request.
 
-2000-09-30  DrakX <install@linux-mandrake.com>
+2000-09-30  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9713,7 +9713,7 @@
 	* netconnect.pm: a LOT of bugs fixed. draknet is now completely
 	brok^H^H^H^Hfrozen.
 
-2000-09-29  DrakX <install@linux-mandrake.com>
+2000-09-29  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9750,7 +9750,7 @@
 	* install_steps_interactive.pm (selectLanguage($)): s/42/43/ in
 	  MandrakeSoft physical address 
 
-2000-09-29  DrakX <install@linux-mandrake.com>
+2000-09-29  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9770,7 +9770,7 @@
 
 	* share/compssList: add nasty DrakSync and DrakProfile with 50 0 50
 
-2000-09-28  DrakX <install@linux-mandrake.com>
+2000-09-28  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9808,7 +9808,7 @@
 	removed reference to package pnm2ppa and others.
 	* standalone/livedrake: initial release for drakxtools.
 
-2000-09-28  DrakX <install@linux-mandrake.com>
+2000-09-28  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9860,7 +9860,7 @@
 
 	* share/compssUsers: reordered, renamed
 
-2000-09-27  DrakX <install@linux-mandrake.com>
+2000-09-27  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9913,7 +9913,7 @@
 	* pkgs.pm: added function allowedToUpgrade to filter kernel
 	package.
 
-2000-09-27  DrakX <install@linux-mandrake.com>
+2000-09-27  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9945,7 +9945,7 @@
 	* pkgs.pm: fixed correction size code to make (really) a true
 	bijection between corrected and rpm size.
 
-2000-09-26  DrakX <install@linux-mandrake.com>
+2000-09-26  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -9981,7 +9981,7 @@
 	* network.pm (write_resolv_conf): write temp dns line to be used
 	with new initscripts package. Use to set dns live.
 
-2000-09-26  DrakX <install@linux-mandrake.com>
+2000-09-26  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10061,7 +10061,7 @@
 	* Xconfigurator.pm (main): in killall X for Xdrakres, also killall
 	kdm/xdm/gdm/autologin :)
 
-2000-09-25  DrakX <install@linux-mandrake.com>
+2000-09-25  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10079,7 +10079,7 @@
 
 	* standalone/drakgw (fatal_quit($)): add log of reason of fatal_quit
 
-2000-09-24  DrakX <install@linux-mandrake.com>
+2000-09-24  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10150,7 +10150,7 @@
 
 	* install2.pm (main): set variable $::isInstall
 
-2000-09-22  DrakX <install@linux-mandrake.com>
+2000-09-22  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10213,7 +10213,7 @@
 	* pci_probing/pcitable: added erwan VIA Rhine board.
 	* network.pm: added DHCP_HOSTNAME reference.
 
-2000-09-21  DrakX <install@linux-mandrake.com>
+2000-09-21  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10267,7 +10267,7 @@
 	* netconnect.pm (conf_network_card): added check when dhcp. Cable connection
 	should now work.
 
-2000-09-21  DrakX <install@linux-mandrake.com>
+2000-09-21  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10292,7 +10292,7 @@
 	(isdn_write_config): corrected file to be sh compliant.
 	(isdn_write_config): added default route settings for isdn.
 
-2000-09-20  DrakX <install@linux-mandrake.com>
+2000-09-20  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10330,7 +10330,7 @@
 
 	* netconnect.pm (read_isdn_providers): corrected typo ($_ -> $_[0])
 
-2000-09-20  DrakX <install@linux-mandrake.com>
+2000-09-20  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10356,7 +10356,7 @@
 	* Xconfigurator.pm (autologin): corrected @users definition and
 	passwd cat.
 
-2000-09-19  DrakX <install@linux-mandrake.com>
+2000-09-19  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10376,7 +10376,7 @@
 	* interactive*.pm: changed `suspend' and `resume' to behave as expected,
 	added `enter_console' and `leave_console'
 
-2000-09-19  DrakX <install@linux-mandrake.com>
+2000-09-19  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10397,7 +10397,7 @@
 
 	* install2.pm (selectMouse): changed clicked to !first_time
 
-2000-09-19  DrakX <install@linux-mandrake.com>
+2000-09-19  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10405,7 +10405,7 @@
 
 	* Xconfigurator.pm (testFinalConfig): remove the bloody prototype
 
-2000-09-19  DrakX <install@linux-mandrake.com>
+2000-09-19  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10431,7 +10431,7 @@
 	* interactive.pm (ask_from_entries_ref): add bounding of "val" in
 	case of type "range". die if min > max.
 
-2000-09-18  DrakX <install@linux-mandrake.com>
+2000-09-18  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10468,7 +10468,7 @@
 	* install_steps.pm (doPartitionDisksAfter): mark partition as
 	mounted	
 
-2000-09-17  DrakX <install@linux-mandrake.com>
+2000-09-17  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10498,7 +10498,7 @@
 	* install_steps.pm (ask_mntpoint_s): don't force partition type to
 	be ext2 (at least if it's a known fs) (for Warly)
 
-2000-09-15  DrakX <install@linux-mandrake.com>
+2000-09-15  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
@@ -10554,7 +10554,7 @@
 	* bootloader.pm (suggest): add entry linux-nonfb (called linux-up
 	for smp)
 
-2000-09-14  DrakX <install@linux-mandrake.com>
+2000-09-14  DrakX <install@mandrakesoft.com>
 
 	* snapshot uploaded
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 86a4f44f5..b01b8ce5d 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -883,7 +883,7 @@ sub install_loadlin {
 
     output "/initrd/loopfs/lnx4win/linux.bat", unix2dos(
 '@echo off
-echo Linux Mandrake
+echo Mandrake Linux
 smartdrv /C
 ' . "$cmd\n");
 
diff --git a/perl-install/install2 b/perl-install/install2
index 426b8ce21..ad6ee374f 100755
--- a/perl-install/install2
+++ b/perl-install/install2
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 #- Mandrake Graphic Install $Id$
-#- Copyright (C) 1999/2000 MandrakeSoft (pixel@linux-mandrake.com)
+#- Copyright (C) 1999/2000 MandrakeSoft (pixel@mandrakesoft.com)
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/perl-install/resize_fat/README b/perl-install/resize_fat/README
index 1c4798c82..12b64dea9 100644
--- a/perl-install/resize_fat/README
+++ b/perl-install/resize_fat/README
@@ -5,4 +5,4 @@ resize_fat::fat::update($fs) should be called before doing undoable things
 
 BUGS:
 no known bugs :)
-if you found one, please mail pixel@linux-mandrake.com !!
+if you found one, please mail pixel@mandrakesoft.com !!
diff --git a/perl-install/resize_fat/main.pm b/perl-install/resize_fat/main.pm
index dc1a65e65..897e2ed95 100644
--- a/perl-install/resize_fat/main.pm
+++ b/perl-install/resize_fat/main.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # DiskDrake
-# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
+# Copyright (C) 1999 MandrakeSoft (pixel@mandrakesoft.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 396f8b938..c7c5c7c7f 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # XFdrake
-# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
+# Copyright (C) 1999 MandrakeSoft (pixel@mandrakesoft.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 8183c976d..57a6045a0 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # DiskDrake
-# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
+# Copyright (C) 1999 MandrakeSoft (pixel@mandrakesoft.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 6bf0dd3fb..c6f9d90a6 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # printerdrake
-# Copyright (C) 1999 MandrakeSoft (fpons@linux-mandrake.com)
+# Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.com)
 # Original version for printer configuration from pad.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index b1692cb15..82433dac0 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -11,7 +11,7 @@
                       [2[1;37;4
                       
                       
-                      Linux-Mandrake Rescue Disk
+                      Mandrake Linux Rescue Disk
                       
                       
                       
diff --git a/tools/cvslog2changelog.pl b/tools/cvslog2changelog.pl
index ae6789b18..919cd3f69 100755
--- a/tools/cvslog2changelog.pl
+++ b/tools/cvslog2changelog.pl
@@ -61,7 +61,7 @@ BEGIN {
 	      'fpons'   => 'François Pons  <fpons@mandrakesoft.com>',
 	      'pablo'   => 'Pablo Saratxaga <pablo@mandrakesoft.com>',
 	      'damien'  => 'dam\'s  <damien@mandrakesoft.com>',
-	      'install' => 'DrakX <install@linux-mandrake.com>',
+	      'install' => 'DrakX <install@mandrakesoft.com>',
 	      'prigaux' => 'Pixel  <pixel@mandrakesoft.com>',
 	      'flepied' => 'Frederic Lepied  <flepied@mandrakesoft.com>',
 	      'chmouel' => 'Chmouel Boudjnah  <chmouel@mandrakesoft.com>',
diff --git a/tools/genmodparm b/tools/genmodparm
index d122193a2..e4aa5d4e9 100755
--- a/tools/genmodparm
+++ b/tools/genmodparm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Mandrake Graphic Install
-# Copyright (C) 1999 MandrakeSoft (fpons@linux-mandrake.com)
+# Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.com)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/mailchangelog.pl b/tools/mailchangelog.pl
index b15541db3..95015f041 100755
--- a/tools/mailchangelog.pl
+++ b/tools/mailchangelog.pl
@@ -7,7 +7,7 @@ chomp($ver = <STDIN>);
 print F 
 q(Subject: [DrakX] DrakX snapshot #), $ver, q( uploaded
 From: devel@mandrakesoft.com
-To: changelog@linux-mandrake.com, install@mandrakesoft.com
+To: changelog@mandrakesoft.com, install@mandrakesoft.com
 Reply-To: install@mandrakesoft.com
 
 );