diff options
133 files changed, 158 insertions, 143 deletions
diff --git a/globetrotter/hwprofile b/globetrotter/hwprofile index b22ff0c8b..d84073394 100644 --- a/globetrotter/hwprofile +++ b/globetrotter/hwprofile @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (c) 2004 MandrakeSoft +# Copyright (c) 2004 Mandrakesoft # # 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/globetrotter/move.pm b/globetrotter/move.pm index c61f3649b..770b9df14 100644 --- a/globetrotter/move.pm +++ b/globetrotter/move.pm @@ -1,6 +1,6 @@ package move; # $Id$ -#- Copyright (c) 2004 MandrakeSoft +#- Copyright (c) 2004 Mandrakesoft #- #- 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/globetrotter/runstage2 b/globetrotter/runstage2 index bf88e886a..af249976c 100755 --- a/globetrotter/runstage2 +++ b/globetrotter/runstage2 @@ -1,6 +1,6 @@ #!/usr/bin/perl -#- Copyright (c) 2004 MandrakeSoft +#- Copyright (c) 2004 Mandrakesoft #- #- 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/mdk-stage1/Makefile b/mdk-stage1/Makefile index a2552b3d3..70ad2281d 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -6,7 +6,7 @@ # # Pixel (pixel@mandrakesoft.com) (mostly done by Guillaume Cottenceau) # - # Copyright 2000-2004 MandrakeSoft + # Copyright 2000-2004 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 86e29aa02..ec7066a06 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -3,7 +3,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/Makefile.mkinitrd_helper b/mdk-stage1/Makefile.mkinitrd_helper index 72bef595f..a8db2fbe0 100644 --- a/mdk-stage1/Makefile.mkinitrd_helper +++ b/mdk-stage1/Makefile.mkinitrd_helper @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/adsl.c b/mdk-stage1/adsl.c index 82978ed34..848a0918a 100644 --- a/mdk-stage1/adsl.c +++ b/mdk-stage1/adsl.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/adsl.h b/mdk-stage1/adsl.h index 9d32cc631..fb0baf327 100644 --- a/mdk-stage1/adsl.h +++ b/mdk-stage1/adsl.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * View the homepage: http://us.mandrakesoft.com/~gc/html/stage1.html * diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c index 114d4d2cb..406e5f003 100644 --- a/mdk-stage1/automatic.c +++ b/mdk-stage1/automatic.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/automatic.h b/mdk-stage1/automatic.h index 4b58c0ea8..a5bfe212b 100644 --- a/mdk-stage1/automatic.h +++ b/mdk-stage1/automatic.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/bzlib/Makefile b/mdk-stage1/bzlib/Makefile index 8e4bba791..929164253 100644 --- a/mdk-stage1/bzlib/Makefile +++ b/mdk-stage1/bzlib/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 055200499..2c360d0e6 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/cdrom.h b/mdk-stage1/cdrom.h index 639487eed..c9ebc78aa 100644 --- a/mdk-stage1/cdrom.h +++ b/mdk-stage1/cdrom.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index c7eba3a8d..1b9dae230 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dhcp.c b/mdk-stage1/dhcp.c index d55bc04dd..6b23c1be7 100644 --- a/mdk-stage1/dhcp.c +++ b/mdk-stage1/dhcp.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dhcp.h b/mdk-stage1/dhcp.h index 71d062e9c..4faeab35b 100644 --- a/mdk-stage1/dhcp.h +++ b/mdk-stage1/dhcp.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * View the homepage: http://us.mandrakesoft.com/~gc/html/stage1.html * diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c index e322c8379..d827e368f 100644 --- a/mdk-stage1/directory.c +++ b/mdk-stage1/directory.c @@ -2,7 +2,7 @@ * Guillaume Cottenceau (gc@mandrakesoft.com) * Olivier Blin (oblin@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/directory.h b/mdk-stage1/directory.h index c101e20bd..eb744520b 100644 --- a/mdk-stage1/directory.h +++ b/mdk-stage1/directory.h @@ -2,7 +2,7 @@ * Guillaume Cottenceau (gc@mandrakesoft.com) * Olivier Blin (oblin@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index fd2ea3432..9ae6b74d8 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/disk.h b/mdk-stage1/disk.h index 303cbe138..3be7d63c1 100644 --- a/mdk-stage1/disk.h +++ b/mdk-stage1/disk.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dns.c b/mdk-stage1/dns.c index 0ed98ad44..e7e045b97 100644 --- a/mdk-stage1/dns.c +++ b/mdk-stage1/dns.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dns.h b/mdk-stage1/dns.h index 97af9c08a..21d0c63ac 100644 --- a/mdk-stage1/dns.h +++ b/mdk-stage1/dns.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/doc/README b/mdk-stage1/doc/README index 405ed0622..6a1d92bf9 100644 --- a/mdk-stage1/doc/README +++ b/mdk-stage1/doc/README @@ -10,7 +10,7 @@ [ Copyright ] - Copyright 2000, 2001, 2002 MandrakeSoft + Copyright 2000, 2001, 2002 Mandrakesoft Partially inspired by Redhat stuff (install from 5.x and 7.x) copyright Red Hat Software, and Debian stuff (boot-floppies) copyright by their diff --git a/mdk-stage1/doc/documented..frontend.h b/mdk-stage1/doc/documented..frontend.h index 10417ef3b..0e666d534 100644 --- a/mdk-stage1/doc/documented..frontend.h +++ b/mdk-stage1/doc/documented..frontend.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/frontend-common.c b/mdk-stage1/frontend-common.c index 601fa312f..a66db457a 100644 --- a/mdk-stage1/frontend-common.c +++ b/mdk-stage1/frontend-common.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/frontend.h b/mdk-stage1/frontend.h index 48f534653..1d78aaea5 100644 --- a/mdk-stage1/frontend.h +++ b/mdk-stage1/frontend.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/init-libc-headers.h b/mdk-stage1/init-libc-headers.h index 1e6807615..55d6f10b3 100644 --- a/mdk-stage1/init-libc-headers.h +++ b/mdk-stage1/init-libc-headers.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 58dc64bd8..893bb9697 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/insmod-busybox/insmod-frontend.c b/mdk-stage1/insmod-busybox/insmod-frontend.c index 3e5d6b3d7..963a96893 100644 --- a/mdk-stage1/insmod-busybox/insmod-frontend.c +++ b/mdk-stage1/insmod-busybox/insmod-frontend.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/insmod-modutils/insmod-frontend.c b/mdk-stage1/insmod-modutils/insmod-frontend.c index 2b3aa1acb..26fe73c47 100644 --- a/mdk-stage1/insmod-modutils/insmod-frontend.c +++ b/mdk-stage1/insmod-modutils/insmod-frontend.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/insmod.h b/mdk-stage1/insmod.h index d91f239cf..67a746858 100644 --- a/mdk-stage1/insmod.h +++ b/mdk-stage1/insmod.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/log.c b/mdk-stage1/log.c index bae9e849e..c108a8f50 100644 --- a/mdk-stage1/log.c +++ b/mdk-stage1/log.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/log.h b/mdk-stage1/log.h index ca4f54ebc..6a30fea8f 100644 --- a/mdk-stage1/log.h +++ b/mdk-stage1/log.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/lomount.c b/mdk-stage1/lomount.c index 37b1373d3..e1142e4dd 100644 --- a/mdk-stage1/lomount.c +++ b/mdk-stage1/lomount.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/lomount.h b/mdk-stage1/lomount.h index 633c5a82c..05ddd520b 100644 --- a/mdk-stage1/lomount.h +++ b/mdk-stage1/lomount.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mar/Makefile b/mdk-stage1/mar/Makefile index 93c706119..e8c6fd054 100644 --- a/mdk-stage1/mar/Makefile +++ b/mdk-stage1/mar/Makefile @@ -6,7 +6,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/mar/mar-extract-only.c b/mdk-stage1/mar/mar-extract-only.c index b69e3101d..dbc9c1bbc 100644 --- a/mdk-stage1/mar/mar-extract-only.c +++ b/mdk-stage1/mar/mar-extract-only.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mar/mar-extract-only.h b/mdk-stage1/mar/mar-extract-only.h index 6fa34efe4..715d75556 100644 --- a/mdk-stage1/mar/mar-extract-only.h +++ b/mdk-stage1/mar/mar-extract-only.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mar/mar-frontend.c b/mdk-stage1/mar/mar-frontend.c index f55ba6fe6..cfffc34ae 100644 --- a/mdk-stage1/mar/mar-frontend.c +++ b/mdk-stage1/mar/mar-frontend.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mar/mar.h b/mdk-stage1/mar/mar.h index 672d7ded8..61b50ca90 100644 --- a/mdk-stage1/mar/mar.h +++ b/mdk-stage1/mar/mar.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/minilibc.c b/mdk-stage1/minilibc.c index d80810fd1..7388c527c 100644 --- a/mdk-stage1/minilibc.c +++ b/mdk-stage1/minilibc.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/minilibc.h b/mdk-stage1/minilibc.h index cb38d0bd2..e1d3e5b1f 100644 --- a/mdk-stage1/minilibc.h +++ b/mdk-stage1/minilibc.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mkinitrd_helper/Makefile b/mdk-stage1/mkinitrd_helper/Makefile index 1fa6a345a..269fd3ddc 100644 --- a/mdk-stage1/mkinitrd_helper/Makefile +++ b/mdk-stage1/mkinitrd_helper/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/mkinitrd_helper/mkinitrd_helper.c b/mdk-stage1/mkinitrd_helper/mkinitrd_helper.c index 67be7c340..3e47bca2d 100644 --- a/mdk-stage1/mkinitrd_helper/mkinitrd_helper.c +++ b/mdk-stage1/mkinitrd_helper/mkinitrd_helper.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2001 MandrakeSoft + * Copyright 2001 Mandrakesoft * * This software is covered by the GPL license. * diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index 0f6d6de7f..27edb0349 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h index d91a415b1..3eb367d62 100644 --- a/mdk-stage1/modules.h +++ b/mdk-stage1/modules.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/modules_descr.h b/mdk-stage1/modules_descr.h index d38f437d8..8faf726af 100644 --- a/mdk-stage1/modules_descr.h +++ b/mdk-stage1/modules_descr.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2001 MandrakeSoft + * Copyright 2001 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c index 9d48f3665..40b94a8ec 100644 --- a/mdk-stage1/mount.c +++ b/mdk-stage1/mount.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mount.h b/mdk-stage1/mount.h index 3c24f8bbd..4a4317182 100644 --- a/mdk-stage1/mount.h +++ b/mdk-stage1/mount.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index e9c8a6805..2f245d97f 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/network.h b/mdk-stage1/network.h index 278950461..be7a73dfc 100644 --- a/mdk-stage1/network.h +++ b/mdk-stage1/network.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c index 750d3e0ac..44fda1b73 100644 --- a/mdk-stage1/newt-frontend.c +++ b/mdk-stage1/newt-frontend.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/newt/Makefile b/mdk-stage1/newt/Makefile index b5b3ea8b7..fb6cdd5ff 100644 --- a/mdk-stage1/newt/Makefile +++ b/mdk-stage1/newt/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c index 0ec115095..55a0b0b1e 100644 --- a/mdk-stage1/nfsmount.c +++ b/mdk-stage1/nfsmount.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2003 MandrakeSoft + * Copyright 2003 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/pci-resource/Makefile b/mdk-stage1/pci-resource/Makefile index 046ab29dd..955c92f5e 100644 --- a/mdk-stage1/pci-resource/Makefile +++ b/mdk-stage1/pci-resource/Makefile @@ -4,7 +4,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/pcmcia_/Makefile b/mdk-stage1/pcmcia_/Makefile index b247b1397..b7850a5f3 100644 --- a/mdk-stage1/pcmcia_/Makefile +++ b/mdk-stage1/pcmcia_/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2001 MandrakeSoft + # Copyright 2001 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c index c989f17f3..2891c93a4 100644 --- a/mdk-stage1/pcmcia_/cardmgr.c +++ b/mdk-stage1/pcmcia_/cardmgr.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/pcmcia_/pcmcia.h b/mdk-stage1/pcmcia_/pcmcia.h index 1967b3497..3559d5fd6 100644 --- a/mdk-stage1/pcmcia_/pcmcia.h +++ b/mdk-stage1/pcmcia_/pcmcia.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/pcmcia_/probe.c b/mdk-stage1/pcmcia_/probe.c index bd1707b4f..a5fb03afe 100644 --- a/mdk-stage1/pcmcia_/probe.c +++ b/mdk-stage1/pcmcia_/probe.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000-2001 MandrakeSoft + * Copyright 2000-2001 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/ppp/pppd/Makefile b/mdk-stage1/ppp/pppd/Makefile index 682ad08c1..0f566a8d8 100644 --- a/mdk-stage1/ppp/pppd/Makefile +++ b/mdk-stage1/ppp/pppd/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index c7a951b7c..4e629bbff 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/probing.h b/mdk-stage1/probing.h index ce107b752..5dbaf48db 100644 --- a/mdk-stage1/probing.h +++ b/mdk-stage1/probing.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c index f75ec76b2..e57fb9294 100644 --- a/mdk-stage1/rescue-gui.c +++ b/mdk-stage1/rescue-gui.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2001 MandrakeSoft + * Copyright 2001 Mandrakesoft * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/rp-pppoe/src/Makefile b/mdk-stage1/rp-pppoe/src/Makefile index 11d2684d6..d36ad6c60 100644 --- a/mdk-stage1/rp-pppoe/src/Makefile +++ b/mdk-stage1/rp-pppoe/src/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/slang/Makefile b/mdk-stage1/slang/Makefile index 01700651d..111062578 100644 --- a/mdk-stage1/slang/Makefile +++ b/mdk-stage1/slang/Makefile @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 59b9c52aa..64ec06334 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (was gc@mandrakesoft.com) * - * Copyright 2000-2004 MandrakeSoft + * Copyright 2000-2004 Mandrakesoft * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h index 9bbc779fb..2d1800914 100644 --- a/mdk-stage1/stage1.h +++ b/mdk-stage1/stage1.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c index a5a2fb576..fa6bb7358 100644 --- a/mdk-stage1/stdio-frontend.c +++ b/mdk-stage1/stdio-frontend.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 245d9cda5..6915cf15b 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h index f183e0a1d..ab98deb87 100644 --- a/mdk-stage1/tools.h +++ b/mdk-stage1/tools.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/url.c b/mdk-stage1/url.c index 45318fc54..c346564e1 100644 --- a/mdk-stage1/url.c +++ b/mdk-stage1/url.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/url.h b/mdk-stage1/url.h index 2397242a5..19c1a6874 100644 --- a/mdk-stage1/url.h +++ b/mdk-stage1/url.h @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc@mandrakesoft.com) * - * Copyright 2000 MandrakeSoft + * Copyright 2000 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/usb-resource/Makefile b/mdk-stage1/usb-resource/Makefile index eb80ce6da..a5bd19cff 100644 --- a/mdk-stage1/usb-resource/Makefile +++ b/mdk-stage1/usb-resource/Makefile @@ -4,7 +4,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # - # Copyright 2000 MandrakeSoft + # Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/move/Makefile b/move/Makefile index 866a8d67a..426342ced 100644 --- a/move/Makefile +++ b/move/Makefile @@ -123,7 +123,7 @@ only_iso: find $(DEST)/iso/isolinux -type f -printf '%p 100\n' > $(DEST)/iso.sort ; echo '$(DEST)/iso/live_tree_boot.clp 5' >> $(DEST)/iso.sort # download version: MOVE10DO # complete version: MOVE10IN - mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort $(DEST)/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) $(DEST)/iso + mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P Mandrakesoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort $(DEST)/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) $(DEST)/iso mv $(DEST)/iso/*.clp $(DEST) mkcd --addmd5 $(ISO) # cdrecord -v -eject dev=0,0,0 blank=fast gracetime=2 speed=99 $(ISO) diff --git a/move/doc/README b/move/doc/README index 298ec9983..28865cdba 100644 --- a/move/doc/README +++ b/move/doc/README @@ -1,4 +1,4 @@ -MandrakeMove is Copyright (c) 2003 MandrakeSoft +MandrakeMove is Copyright (c) 2003 Mandrakesoft MandrakeMove 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/move/move.pm b/move/move.pm index 4f62cf514..f59c22a60 100644 --- a/move/move.pm +++ b/move/move.pm @@ -1,6 +1,6 @@ package move; # $Id$ $ -#- Copyright (c) 2003-2004 MandrakeSoft +#- Copyright (c) 2003-2004 Mandrakesoft #- #- 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/move/runstage2 b/move/runstage2 index 9afe3d9f4..481b8579c 100755 --- a/move/runstage2 +++ b/move/runstage2 @@ -1,6 +1,6 @@ #!/usr/bin/perl -#- Copyright (c) 2003 MandrakeSoft +#- Copyright (c) 2003 Mandrakesoft #- #- 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/move/tree/sound.initscript b/move/tree/sound.initscript index 3820a0adc..919a9b875 100755 --- a/move/tree/sound.initscript +++ b/move/tree/sound.initscript @@ -1,5 +1,5 @@ #!/bin/sh -# (c) MandrakeSoft, Chmouel Boudjnah <chmouel@mandrakesoft.com> +# (c) Mandrakesoft, Chmouel Boudjnah <chmouel@mandrakesoft.com> # $Id$ # # sound: This shell script launch the sound on your system. diff --git a/perl-install/diskdrake/diskdrake.html b/perl-install/diskdrake/diskdrake.html index 7e85c3cde..cba732084 100644 --- a/perl-install/diskdrake/diskdrake.html +++ b/perl-install/diskdrake/diskdrake.html @@ -25,7 +25,7 @@ It's written entirely in Perl and Perl/Gtk. It uses resize_fat which is a perl rewrite of the work of Andrew Clausen (libresize). <P> - DiskDrake is a project from MandrakeSoft, the company behind the popular + DiskDrake is a project from Mandrakesoft, the company behind the popular <a href="http://www.linux-mandrake.com">Linux-Mandrake</a> operating-system. <P> diff --git a/perl-install/install2 b/perl-install/install2 index b26684f9f..ff857c579 100755 --- a/perl-install/install2 +++ b/perl-install/install2 @@ -2,7 +2,7 @@ #- PERL_INSTALL_DEBUG is used to launch stage2 in debug mode #- Mandrake Graphic Install $Id$ -#- Copyright (C) 1999/2000 MandrakeSoft (pixel@mandrakesoft.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/install_messages.pm b/perl-install/install_messages.pm index e668c0ff5..e8f527043 100644 --- a/perl-install/install_messages.pm +++ b/perl-install/install_messages.pm @@ -17,7 +17,7 @@ system and the different components of the Mandrakelinux distribution. 1. License Agreement Please read this document carefully. This document is a license agreement between you and -MandrakeSoft S.A. which applies to the Software Products. +Mandrakesoft S.A. which applies to the Software Products. By installing, duplicating or using the Software Products in any manner, you explicitly accept and fully agree to conform to the terms and conditions of this License. If you disagree with any portion of the License, you are not allowed to install, duplicate or use @@ -32,16 +32,16 @@ Software Products. The Software Products and attached documentation are provided \"as is\", with no warranty, to the extent permitted by law. -MandrakeSoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special, +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 -Products, even if MandrakeSoft S.A. has been advised of the possibility or occurence of such +Products, even if Mandrakesoft S.A. has been advised of the possibility or occurence of such damages. LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES -To the extent permitted by law, MandrakeSoft S.A. or its distributors will, in no circumstances, be +To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, 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 @@ -58,9 +58,9 @@ of these components are governed under the terms and conditions of the GNU Gener Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, duplicate, adapt or redistribute the components which they cover. Please read carefully the terms and conditions of the license agreement for each component before using any component. Any question -on a component license should be addressed to the component author and not to MandrakeSoft. -The programs developed by MandrakeSoft S.A. are governed by the GPL License. Documentation written -by MandrakeSoft S.A. is governed by a specific license. Please refer to the documentation for +on a component license should be addressed to the component author and not to Mandrakesoft. +The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written +by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for further details. @@ -68,9 +68,9 @@ further details. All rights to the components of the Software Products belong to their respective authors and are protected by intellectual property and copyright laws applicable to software programs. -MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in +Mandrakesoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in parts, by all means and for all purposes. -\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A. +\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A. 5. Governing Laws @@ -81,7 +81,7 @@ agreement. The terms and conditions of this License are governed by the Laws of France. All disputes on the terms of this license will preferably be settled out of court. As a last resort, the dispute will be referred to the appropriate Courts of Law of Paris - France. -For any question on this document, please contact MandrakeSoft S.A. +For any question on this document, please contact Mandrakesoft S.A. "); } diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 1cbdceb75..ec76d388c 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -576,7 +576,7 @@ C<mouse> is a perl module used by mousedrake to detect and configure the mouse. =head1 COPYRIGHT -Copyright (C) 2000-2002 MandrakeSoft <tvignaud@mandrakesoft.com> +Copyright (C) 2000-2002 Mandrakesoft <tvignaud@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/scanner.pm b/perl-install/scanner.pm index 819ae84e2..bfb745d77 100755 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -2,7 +2,7 @@ package scanner; # scanner.pm $Id$ # Yves Duret <yduret at mandrakesoft.com> # Till Kamppeter <till at mandrakesoft.com> -# Copyright (C) 2001-2004 MandrakeSoft +# Copyright (C) 2001-2004 Mandrakesoft # # 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/share/advertising/dis-01.pl b/perl-install/share/advertising/dis-01.pl index 522b9bf77..03b338983 100644 --- a/perl-install/share/advertising/dis-01.pl +++ b/perl-install/share/advertising/dis-01.pl @@ -14,6 +14,6 @@ $border = 10; #- for leftish text ' ', N("Welcome to the Open Source world!"), ' ', - N("Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."), + N("Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."), ' ', N("We would like to thank everyone who participated in the development of this latest release.")); diff --git a/perl-install/share/advertising/dis-09.pl b/perl-install/share/advertising/dis-09.pl index 3d258642b..30e4b19bb 100644 --- a/perl-install/share/advertising/dis-09.pl +++ b/perl-install/share/advertising/dis-09.pl @@ -12,6 +12,6 @@ $border = 10; #- for leftish text @text = ([ N("<b>MandrakeStore</b>"), center => 1 ], ' ', - N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), + N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), ' ', N("Stop by today at <b>www.mandrakestore.com</b>")); diff --git a/perl-install/share/advertising/dwd-01.pl b/perl-install/share/advertising/dwd-01.pl index 2ac84ba95..7533d98f1 100644 --- a/perl-install/share/advertising/dwd-01.pl +++ b/perl-install/share/advertising/dwd-01.pl @@ -14,6 +14,6 @@ $border = 10; #- for leftish text ' ', N("Welcome to the Open Source world!"), ' ', - N("Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors."), + N("Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between Mandrakesoft's team of developers and the worldwide community of Mandrakelinux contributors."), ' ', N("We would like to thank everyone who participated in the development of this latest release.")); diff --git a/perl-install/share/advertising/dwd-06.pl b/perl-install/share/advertising/dwd-06.pl index 2b9dbcdf2..14e1ca4e8 100644 --- a/perl-install/share/advertising/dwd-06.pl +++ b/perl-install/share/advertising/dwd-06.pl @@ -12,7 +12,7 @@ $border = 10; #- for leftish text @text = ([ N("<b>MandrakeStore</b>"), center => 1 ], ' ', - N("Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-commerce platform."), + N("Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full service e-commerce platform."), ' ', N("Find out also support incidents if you have any problems, from standard to professional support, from 1 to 50 incidents, take the one which meets perfectly your needs!"), ' ', diff --git a/perl-install/share/advertising/ppp-01.pl b/perl-install/share/advertising/ppp-01.pl index d7f4cef1f..dbccc8084 100644 --- a/perl-install/share/advertising/ppp-01.pl +++ b/perl-install/share/advertising/ppp-01.pl @@ -14,6 +14,6 @@ $border = 10; #- for leftish text ' ', N("Welcome to the Open Source world!"), ' ', - N("Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."), + N("Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."), ' ', N("We would like to thank everyone who participated in the development of this latest release.")); diff --git a/perl-install/share/advertising/ppp-09.pl b/perl-install/share/advertising/ppp-09.pl index a509d1792..20a9002ef 100644 --- a/perl-install/share/advertising/ppp-09.pl +++ b/perl-install/share/advertising/ppp-09.pl @@ -12,6 +12,6 @@ $border = 10; #- for leftish text @text = ([ N("<b>MandrakeStore</b>"), center => 1 ], ' ', - N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), + N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), ' ', N("Stop by today at <b>www.mandrakestore.com</b>")); diff --git a/perl-install/share/advertising/pwp-01.pl b/perl-install/share/advertising/pwp-01.pl index 1b00b2f38..935689b05 100644 --- a/perl-install/share/advertising/pwp-01.pl +++ b/perl-install/share/advertising/pwp-01.pl @@ -14,6 +14,6 @@ $border = 10; #- for leftish text ' ', N("Welcome to the Open Source world!"), ' ', - N("Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."), + N("Your new Mandrakelinux distribution is the result of collaborative efforts between Mandrakesoft developers and Mandrakelinux contributors throughout the world."), ' ', N("We would like to thank everyone who participated in the development of our latest release.")); diff --git a/perl-install/share/advertising/pwp-02.pl b/perl-install/share/advertising/pwp-02.pl index 55a21b907..66fcbef19 100644 --- a/perl-install/share/advertising/pwp-02.pl +++ b/perl-install/share/advertising/pwp-02.pl @@ -12,4 +12,4 @@ $border = 10; #- for leftish text @text = ([ N("<b>PowerPack</b>"), center => 1 ], ' ', - N("PowerPack is MandrakeSoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical.")); + N("PowerPack is Mandrakesoft's premier Linux desktop product. In addition to being the easiest and the most user-friendly Linux distribution, PowerPack includes thousands of applications - everything from the most popular to the most technical.")); diff --git a/perl-install/share/advertising/pwp-08.pl b/perl-install/share/advertising/pwp-08.pl index 02043e533..abbc1c053 100644 --- a/perl-install/share/advertising/pwp-08.pl +++ b/perl-install/share/advertising/pwp-08.pl @@ -12,6 +12,6 @@ $border = 10; #- for leftish text @text = ([ N("<b>MandrakeStore</b>"), center => 1 ], ' ', - N("Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), + N("Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- our full service e-commerce platform."), ' ', N("Stop by today at <b>www.mandrakestore.com</b>")); diff --git a/perl-install/share/compssUsers.server b/perl-install/share/compssUsers.server index c60f84080..4dfce0153 100644 --- a/perl-install/share/compssUsers.server +++ b/perl-install/share/compssUsers.server @@ -89,5 +89,5 @@ Network Utilities/Monitoring [icon=archiving] [path=Utilities] [selected=server] MONITORING NETWORKING_FILE -MandrakeSoft Wizards [icon=archiving] [path=Utilities] [selected=server] [descr=Wizards to configure servers] +Mandrakesoft Wizards [icon=archiving] [path=Utilities] [selected=server] [descr=Wizards to configure servers] WIZARDS diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index f1b76061a..0681d2f2d 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -154,7 +154,7 @@ foreach (@ARGV) { sub version { print 'Drakxtools version 10 -Copyright (C) 1999-2004 MandrakeSoft by <install@mandrakesoft.com> +Copyright (C) 1999-2004 Mandrakesoft by <install@mandrakesoft.com> ', $::license, "\n"; } diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index cbe4bc569..334f18972 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # XFdrake -# Copyright (C) 1999-2004 MandrakeSoft (pixel@mandrakesoft.com) +# Copyright (C) 1999-2004 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 a9966f804..f8fbda251 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # DiskDrake -# Copyright (C) 1999-2004 MandrakeSoft (pixel@mandrakesoft.com) +# Copyright (C) 1999-2004 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/drakTermServ b/perl-install/standalone/drakTermServ index 4a52cefc0..c97193c03 100755 --- a/perl-install/standalone/drakTermServ +++ b/perl-install/standalone/drakTermServ @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2002-2004 by MandrakeSoft (sbenedict@mandrakesoft.com) +# Copyright (C) 2002-2004 by Mandrakesoft (sbenedict@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/drakautoinst b/perl-install/standalone/drakautoinst index 4512571ca..f54b47323 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -3,7 +3,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2001-2004 MandrakeSoft +# Copyright 2001-2004 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 6b6d458dc..67140d644 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2001-2004 MandrakeSoft by Sebastien DUPONT <dupont_s@epita.fr> +# Copyright (C) 2001-2004 Mandrakesoft by Sebastien DUPONT <dupont_s@epita.fr> # Updated 2002-2004 by Stew Benedict <sbenedict@mandrakesoft.com> # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 75793f5d8..c9e5386f5 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -2,7 +2,7 @@ # DrakBoot # $Id$ -# Copyright (C) 2001-2004 MandrakeSoft +# Copyright (C) 2001-2004 Mandrakesoft # Yves Duret, Thierry Vignaud # # This program is free software; you can redistribute it and/or modify diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index 7cce5ec9e..9db66a04f 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -1,7 +1,7 @@ #!/usr/bin/perl # Drak Bug Report -# Copyright (C) 2002-2004 MandrakeSoft (daouda@mandrakesoft.com) +# Copyright (C) 2002-2004 Mandrakesoft (daouda@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/drakconnect b/perl-install/standalone/drakconnect index 40004552f..5922ca50e 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -2,7 +2,7 @@ # DrakConnect $Id$ -# Copyright (C) 1999-2004 MandrakeSoft +# Copyright (C) 1999-2004 Mandrakesoft # Damien "Dam's" Krotkine # Damien "poulpy" Chaumette # Thierry Vignaud <tvignaud@mandrakesoft.com> diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 584ef4458..a4f44417b 100644 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxDM -- Display Manager chooser -# Copyright (C) 2003-2004 MandrakeSoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2003-2004 Mandrakesoft (tvignaud@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/drakfirewall b/perl-install/standalone/drakfirewall index c93a02f73..8f0f0b3da 100755 --- a/perl-install/standalone/drakfirewall +++ b/perl-install/standalone/drakfirewall @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 1999-2004 MandrakeSoft (pixel@mandrakesoft.com) +# Copyright (C) 1999-2004 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/drakfloppy b/perl-install/standalone/drakfloppy index b0962181d..d8f2e11b6 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -3,7 +3,7 @@ # DrakFloppy # $Id$ # -# Copyright (C) 2001-2004 MandrakeSoft +# Copyright (C) 2001-2004 Mandrakesoft # Yves Duret # Thierry Vignaud # diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 3b232919b..89c3c3bb5 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2001-2004 by MandrakeSoft +# Copyright (C) 2001-2004 by Mandrakesoft # DUPONT Sebastien # Damien Chaumette <dchaumette@mandrakesoft.com> # @@ -509,7 +509,7 @@ sub interactive_mode() { $list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend_mod() : interactive_mode(); sub help() { - ugtk2::create_dialog(N("Help"), formatAlaTeX(N("Copyright (C) 2001-2002 by MandrakeSoft + ugtk2::create_dialog(N("Help"), formatAlaTeX(N("Copyright (C) 2001-2002 by Mandrakesoft DUPONT Sebastien (original version) diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index 731e06811..cd0fdc7e3 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -4,7 +4,7 @@ # author Guillaume Cottenceau (gc@mandrakesoft.com) # modified by Florin Grad (florin@mandrakesoft.com) # -# Copyright 2000-2004 MandrakeSoft +# Copyright 2000-2004 Mandrakesoft # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 7ff26e0a6..b6040a291 100644 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -15,7 +15,7 @@ use log; sub usage { print STDERR N(" drakhelp 0.1 -Copyright (C) 2003-2004 MandrakeSoft. +Copyright (C) 2003-2004 Mandrakesoft. This is free software and may be redistributed under the terms of the GNU GPL. Usage: diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 79d76386f..aa48ae272 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -2,7 +2,7 @@ # DrakProxy -# Copyright (C) 1999-2004 MandrakeSoft (damien@mandrakesoft.com) +# Copyright (C) 1999-2004 Mandrakesoft (damien@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/drakpxe b/perl-install/standalone/drakpxe index c564995cb..97b5a3e07 100755 --- a/perl-install/standalone/drakpxe +++ b/perl-install/standalone/drakpxe @@ -2,7 +2,7 @@ # # François Pons <fpons@mandrakesoft.com> # -# Copyright 2003-2004 MandrakeSoft +# Copyright 2003-2004 Mandrakesoft # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index 3d5ff85e0..4a33c094c 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxSound -# Copyright (C) 2002-2004 MandrakeSoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2002-2004 Mandrakesoft (tvignaud@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/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index b645b7d56..77c07ef89 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -1,7 +1,7 @@ #!/usr/bin/perl # drakupdate_fstab -# Copyright (C) 2002-2004 MandrakeSoft (pixel@mandrakesoft.com) +# Copyright (C) 2002-2004 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/drakvpn b/perl-install/standalone/drakvpn index 645869b6a..fd6fb5c3f 100644 --- a/perl-install/standalone/drakvpn +++ b/perl-install/standalone/drakvpn @@ -3,7 +3,7 @@ # # author Florin Grad (florin@mandrakesoft.com) # -# Copyright 2004 MandrakeSoft +# Copyright 2004 Mandrakesoft # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 888815632..6646a3f37 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -2,7 +2,7 @@ # DrakxTV # $Id$ -# Copyright (C) 2002-2004 MandrakeSoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2002-2004 Mandrakesoft (tvignaud@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/fileshareset b/perl-install/standalone/fileshareset index 3b5523f26..0e3496506 100755 --- a/perl-install/standalone/fileshareset +++ b/perl-install/standalone/fileshareset @@ -12,7 +12,7 @@ my $authorisation_group = 'fileshare'; ######################################## # fileshare utility $Id$ -# Copyright (C) 2001-2004 MandrakeSoft (pixel@mandrakesoft.com) +# Copyright (C) 2001-2004 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/logdrake b/perl-install/standalone/logdrake index edc84a591..fa6475bbc 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -1,7 +1,7 @@ #! /usr/bin/perl # $Id$ -# Copyright (C) 2001-2004 MandrakeSoft +# Copyright (C) 2001-2004 Mandrakesoft # Yves Duret <yduret at mandrakesoft.com> # some code is Copyright: (C) 1999, Michael T. Babcock <mikebabcock@pobox.com> # diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 1f59d0024..16ec29988 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -2,7 +2,7 @@ # NetMonitor -# Copyright (C) 1999-2004 MandrakeSoft +# Copyright (C) 1999-2004 Mandrakesoft # Damien "Dam's" Krotkine # Thierry Vignaud <tvignaud@mandrakesoft.com> # diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index aceb4940a..e9dde3564 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2003-2004 MandrakeSoft +# Copyright (C) 2003-2004 Mandrakesoft # # Till Kamppeter <till@mandrakesoft.com> # Daouda Lo <daouda@mandrakesoft.com> diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index 0bb42a5b4..78dac5207 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -3,7 +3,7 @@ # scannerdrake $Id$ # Yves Duret <yduret at mandrakesoft.com> # Till Kamppeter <till at mandrakesoft.com> -# Copyright (C) 2001-2004 MandrakeSoft +# Copyright (C) 2001-2004 Mandrakesoft # # 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/rescue/drvinst b/rescue/drvinst index 9f533918e..e35038815 100755 --- a/rescue/drvinst +++ b/rescue/drvinst @@ -3,7 +3,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2000 MandrakeSoft +# Copyright 2000 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. @@ -64,6 +64,9 @@ foreach $card (pci_probe()) { #------------------------------------------------- #- $Log$ +#- Revision 1.7 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- #- Revision 1.6 2002/09/10 10:07:23 gc #- drvinst <param> is broken when we don't -v #- diff --git a/rescue/guessmounts b/rescue/guessmounts index b879ca13f..cce1d5d35 100755 --- a/rescue/guessmounts +++ b/rescue/guessmounts @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2001 MandrakeSoft +# Copyright 2001 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. @@ -82,6 +82,9 @@ if ($root) { #------------------------------------------------- #- $Log$ +#- Revision 1.7 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- #- Revision 1.6 2003/08/03 21:50:06 prigaux #- - copy /etc/mtab to /mnt/etc/mtab to have a nice chrooted "mount" or "df" #- - some perl_checker compliance diff --git a/rescue/install_bootloader b/rescue/install_bootloader index 8bbd6886c..b83334bcf 100755 --- a/rescue/install_bootloader +++ b/rescue/install_bootloader @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2001 MandrakeSoft +# Copyright 2001 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. @@ -37,6 +37,9 @@ die "error: couldn't exec /mnt/sbin/lilo.\n"; #------------------------------------------------- #- $Log$ +#- Revision 1.2 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- #- Revision 1.1 2001/10/24 22:34:01 gc #- - add a GUI to the rescue #- - provide guessmounts with better efficiency and output, go to console, and reboot diff --git a/rescue/lsparts b/rescue/lsparts index ff964c0d8..7dcc936eb 100755 --- a/rescue/lsparts +++ b/rescue/lsparts @@ -3,7 +3,7 @@ # Main author Pascal Rigaux (pixel@mandrakesoft.com) # Put together by Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 1999,2000,2001 MandrakeSoft +# Copyright 1999,2000,2001 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. @@ -115,6 +115,9 @@ P: foreach (@parts) { #------------------------------------------------- #- $Log$ +#- Revision 1.4 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- #- Revision 1.3 2004/07/19 04:09:06 prigaux #- replace "Mandrake Linux" with "Mandrakelinux" #- diff --git a/rescue/restore_ms_boot b/rescue/restore_ms_boot index 0d674af99..69088a9d9 100755 --- a/rescue/restore_ms_boot +++ b/rescue/restore_ms_boot @@ -2,7 +2,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2002 MandrakeSoft +# Copyright 2002 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. @@ -102,6 +102,9 @@ Ok? <press Enter to continue, 'n' and Enter to cancel> "; #------------------------------------------------- #- $Log$ +#- Revision 1.2 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- #- Revision 1.1 2002/02/27 13:31:30 gc #- add "restore Windows Boot Loader" to rescue #- diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile index cc91e4dab..3b5ac21cc 100644 --- a/rescue/tree/etc/profile +++ b/rescue/tree/etc/profile @@ -1,5 +1,5 @@ # /etc/profile -# (c) MandrakeSoft, Chmouel Boudjnah <chmouel@mandrakesoft.com> +# (c) Mandrakesoft, Chmouel Boudjnah <chmouel@mandrakesoft.com> # System wide environment and startup programs # Functions and aliases go in /etc/bashrc diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown index c6d9b8440..3511020ff 100755 --- a/rescue/tree/sbin/fakeshutdown +++ b/rescue/tree/sbin/fakeshutdown @@ -3,7 +3,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2001 MandrakeSoft +# Copyright 2001 Mandrakesoft # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/tools/gencryptofiles b/tools/gencryptofiles index f86b1ec3a..d905c193c 100755 --- a/tools/gencryptofiles +++ b/tools/gencryptofiles @@ -1,7 +1,7 @@ #!/usr/bin/perl #- Mandrake cryptographic package hdlist and depslist generation tools. -#- Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.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/genmodparm b/tools/genmodparm index e4aa5d4e9..1b5453cc0 100755 --- a/tools/genmodparm +++ b/tools/genmodparm @@ -1,7 +1,7 @@ #!/usr/bin/perl # Mandrake Graphic Install -# Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.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/make_lang_png_transparent.c b/tools/make_lang_png_transparent.c index 30c2557ba..b5e9a1683 100644 --- a/tools/make_lang_png_transparent.c +++ b/tools/make_lang_png_transparent.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc at mandrakesoft.com) * - * Copyright 2002 MandrakeSoft + * Copyright 2002 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/tools/ppc/mkINSTALLCD b/tools/ppc/mkINSTALLCD index 96741c605..2f81fa5e9 100755 --- a/tools/ppc/mkINSTALLCD +++ b/tools/ppc/mkINSTALLCD @@ -36,7 +36,7 @@ fi #Change these when you build the CD.. ApplicationID="Linux-Mandrake" -PublisherID="MandrakeSoft" +PublisherID="Mandrakesoft" PreparerID="sbenedict@mandrakesoft.com" SystemID=PPC volid=ppc diff --git a/tools/serial_probe/serial_probe.c b/tools/serial_probe/serial_probe.c index 9fcf063be..a9aae52e5 100644 --- a/tools/serial_probe/serial_probe.c +++ b/tools/serial_probe/serial_probe.c @@ -1,4 +1,4 @@ -/* Copyright 1999 MandrakeSoft <fpons@mandrakesoft.com> +/* Copyright 1999 Mandrakesoft <fpons@mandrakesoft.com> * * The following file used by this one are copyrighted by RedHat and * are taken from kudzu : diff --git a/tools/shift_img.c b/tools/shift_img.c index d421263f3..bd347b79f 100644 --- a/tools/shift_img.c +++ b/tools/shift_img.c @@ -1,7 +1,7 @@ /* * Guillaume Cottenceau (gc at mandrakesoft.com) * - * Copyright 2002 MandrakeSoft + * Copyright 2002 Mandrakesoft * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/tools/syncrpms b/tools/syncrpms index 9537d72d0..a2668bb93 100755 --- a/tools/syncrpms +++ b/tools/syncrpms @@ -1,7 +1,7 @@ #!/usr/bin/perl #- Synchronize mulitple RPMS/SRPMS directories. -#- Copyright (C) 1999 MandrakeSoft (fpons@mandrakesoft.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 |