replace "Mandrake Linux" with "Mandrakelinux"

9 files changed, 29 insertions, 26 deletions

diff --git a/docs/HACKING b/docs/HACKING
index e427d173a..1b0fd444e 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 Mandrake Linux distribution.
+example from DrakX-*.src.rpm on your Mandrakelinux distribution.
 
 Fix a few things:
 % find gi -name "*/CVS/root/*" | xargs perl -pi -e 's/prigaux/anoncvs/'
@@ -33,9 +33,9 @@ Preparing the compilation process:
 
 Create a top level directory called /export and give write permissions to 
 the user/group that will be compiling DrakX.  It is also suggested that you 
-copy a recent Mandrake Linux CD in there. (You don't have to put have all 
+copy a recent Mandrakelinux CD in there. (You don't have to put have all 
 the RPMS...) ; you'll need roughly 1.5 Gbytes for a full install. (It is 
-possible to not have a copy of Mandrake Linux there, if all you desire is to 
+possible to not have a copy of Mandrakelinux there, if all you desire is to 
 compile gi)
 
 
diff --git a/docs/README b/docs/README
index b298f3603..4a023ae95 100644
--- a/docs/README
+++ b/docs/README
@@ -320,7 +320,7 @@ have a look at gi/docs/object_class.fig
 * OEM **************************************************************************
 ********************************************************************************
 > I am a system OEM in Bangalore,India selling systems bundled with
-> Mandrake Linux. The problem is that with every system I sell, I need to
+> Mandrakelinux. The problem is that with every system I sell, I need to
 > install & configure the system which takes HOURS!. Can I do a diskcopy
 > instead?
 > 
@@ -347,7 +347,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 Mandrake Linux.
+      as long as it provides an installation tree of Mandrakelinux.
       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/help.msg.xml b/help.msg.xml
index c20ea01c8..8c615bdcb 100644
--- a/help.msg.xml
+++ b/help.msg.xml
@@ -1,5 +1,5 @@
 <document>
-                  <green>Welcome to <blue>Mandrake Linux</blue> install help</green>
+                  <green>Welcome to <blue>Mandrakelinux</blue> install help</green>
 
 In most cases, the best way to get started is to simply press the <yellow>&lt;Enter&gt;</yellow> key.
 If you experience problems with standard install, try one of the following 
diff --git a/make_boot_img b/make_boot_img
index f9a78f175..108cd37f7 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -435,9 +435,9 @@ To Build a Bootable CD-ROM, try:
 	-f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($tmp_mnt_initrd, $type, $I, "$dir/$type.rdz");
 
 	output("$dir/boot.msg", "
-Welcome to Mandrake Linux 7.1
+Welcome to Mandrakelinux 7.1
 
-Press <Enter> to install or upgrade a system 7mMandrake Linux7m
+Press <Enter> to install or upgrade a system 7mMandrakelinux7m
 ");
 
 	output("$dir/silo.conf", qq(
@@ -485,7 +485,7 @@ sub boot_img_ppc() {
 MacRISC
 </COMPATIBLE>
 <DESCRIPTION>
-Mandrake Linux PPC bootloader
+Mandrakelinux PPC bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
 " screen" output
@@ -496,7 +496,7 @@ device-end
 3 to foreground-color
 0 to background-color
 " "(0C)" fb8-write drop
-" Booting Mandrake Linux PPC..." fb8-write drop 100 ms
+" Booting Mandrakelinux PPC..." fb8-write drop 100 ms
 boot cd:2,\\\\yaboot
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
@@ -554,7 +554,7 @@ boot cd:2,\\\\yaboot
 ');
 
 	output("$dir/$boot/yaboot.conf", '
-init-message = "\nWelcome to Mandrake Linux PPC!\nHit <TAB> for boot options.\n\n"
+init-message = "\nWelcome to Mandrakelinux PPC!\nHit <TAB> for boot options.\n\n"
 timeout = 150
 default = install-gui
 message=cd:,\\\\yaboot.msg
@@ -643,7 +643,7 @@ image = enet:0,vmlinux
 ');
 
 	output("$dir/$boot/yaboot.msg", '
-Thanks for choosing Mandrake Linux PPC.  The following is a short
+Thanks for choosing Mandrakelinux PPC.  The following is a short
 explanation of the various options for booting the install CD.
 
 All options ending with "2.2" will use the 2.2.20-9mdkBOOT kernel.
@@ -760,13 +760,13 @@ pause To display the help, press <space> until you reach "HELP END"
 pause .
 pause Please see http://qa.mandrakesoft.com/hd_grub.cgi for a friendlier solution
 pause .
-pause To specify the location where Mandrake Linux is copied,
+pause To specify the location where Mandrakelinux is copied,
 pause choose "Mandrake Install", and press "e".
 pause Then change "root (hd0,0)". FYI:
 pause - (hd0,0) is the first partition on first bios hard drive (usually hda1)
 pause - (hd0,4) is the first extended partition (usually hda5)
 pause - (hd1,0) is the first partition on second bios hard drive
-pause Replace /cooker to suits the directory containing Mandrake Linux
+pause Replace /cooker to suits the directory containing Mandrakelinux
 pause .
 pause HELP END
 EOF
diff --git a/mdk-stage1/doc/README b/mdk-stage1/doc/README
index e6c0cb420..405ed0622 100644
--- a/mdk-stage1/doc/README
+++ b/mdk-stage1/doc/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------
-*  Stage1 of the Mandrake Linux installation program  *
+*  Stage1 of the Mandrakelinux installation program  *
 -------------------------------------------------------
 
 
@@ -60,9 +60,9 @@
                 -=-=-- Okay, now, more details --=-=-
 
 
-	[ Installing Mandrake Linux ]
+	[ Installing Mandrakelinux ]
 
-Per default, just insert your Mandrake Linux Installation CD into your
+Per default, just insert your Mandrakelinux 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 Mandrake Linux
+initrd) and of course it's not in, in image files of Mandrakelinux
 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 Mandrake Linux 7.1, we provide a rescue system through each of the
+Since Mandrakelinux 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/rescue/lsparts b/rescue/lsparts
index 2346ee134..ff964c0d8 100755
--- a/rescue/lsparts
+++ b/rescue/lsparts
@@ -13,7 +13,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 #
-# This code is extracted from DrakX, the Mandrake Linux graphical installer.
+# This code is extracted from DrakX, the Mandrakelinux graphical installer.
 #   http://www.mandrakelinux.com/drakx/
 # Open development rulz, find CVS here:
 #   http://www.mandrakelinux.com/cgi-bin/cvsweb.cgi/gi/
@@ -115,6 +115,9 @@ P: foreach (@parts) {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.3  2004/07/19 04:09:06  prigaux
+#- replace "Mandrake Linux" with "Mandrakelinux"
+#-
 #- Revision 1.2  2002/01/10 21:28:15  gc
 #- better looking output of type of partition (%x => %0x)
 #-
diff --git a/rescue/rescue-doc b/rescue/rescue-doc
index 1791966cb..9b972b545 100755
--- a/rescue/rescue-doc
+++ b/rescue/rescue-doc
@@ -20,7 +20,7 @@ The vast majority of problems that can affect a Linux system are
 much easier to repair on a running system than by booting into
 "rescue mode". In fact, there are very few problems which aren't
 easier to resolve in the comfortable environment of a fully
-installed Mandrake Linux system than in this spartan "rescue
+installed Mandrakelinux system than in this spartan "rescue
 system" shell. Some of the most common problems include:
 
 - bad or missing X (video display) configuration
@@ -49,7 +49,7 @@ In case you have found a new problem which should be handled by
 "rescue mode" but currently isn't, please report it to
 <gc@mandrakesoft.com>.
 
-For more information on troubleshooting a Mandrake Linux system,
+For more information on troubleshooting a Mandrakelinux system,
 please consult the official manuals, the documentation on
 MandrakeLinux.com, MandrakeUser.org, troubleshooting articles on
 MandrakeForum.com, or the MandrakeExpert.com support forum.
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index 345b8f631..af500e52e 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -11,14 +11,14 @@
                       [2[1;37;4
                       
                       
-                      Mandrake Linux Rescue Disk
+                      Mandrakelinux Rescue Disk
                       
                       
                       
                       
 
 
-Mandrake Linux release 10.0
+Mandrakelinux release 10.0
 
 Use loadkeys to change your keyboard layout (eg: loadkeys fr)
 Use modprobe to load modules (eg: modprobe snd-card-fm801)
diff --git a/tools/hd_grub.cgi b/tools/hd_grub.cgi
index e9b91c484..3449e5c48 100755
--- a/tools/hd_grub.cgi
+++ b/tools/hd_grub.cgi
@@ -60,7 +60,7 @@ sub print_form {
     print
       p(),
       start_form(-name => 'form', -action => $cgi_name, -method => 'get'),
-      ul("Please choose the partition where Mandrake Linux is copied.",
+      ul("Please choose the partition where Mandrakelinux is copied.",
 	 li(popup_menu(-name => "hd", -default => 'hd0', 
 		       -values => [ 'hd0' .. 'hd3' ],
 		       -labels => { hd0 => '1st BIOS hard drive (usually hda or sda)',
@@ -94,7 +94,7 @@ sub print_form {
 				  })),
        ),
       p(),
-      ul("Please enter the directory containing the Mandrake Linux Distribution.",
+      ul("Please enter the directory containing the Mandrakelinux Distribution.",
 	 li(textfield(-name => 'directory', -default => '/cooker/i586', size => 40)),
 	 ),
       p(submit(-name => 'Go')),