kill dead emails

77 files changed, 82 insertions, 82 deletions

diff --git a/docs/Partition-ends-after-end-of-disk.txt b/docs/Partition-ends-after-end-of-disk.txt
index 3da57d561..037fe9106 100644
--- a/docs/Partition-ends-after-end-of-disk.txt
+++ b/docs/Partition-ends-after-end-of-disk.txt
@@ -1,6 +1,6 @@
         Cylinder/Head/Size Hell Is Not Over 
 
-            pixel@mandrakesoft.com 
+            pixel 
          $Date$
 
 
diff --git a/docs/README.pxe b/docs/README.pxe
index 2ddd205fe..e60aa9ecf 100644
--- a/docs/README.pxe
+++ b/docs/README.pxe
@@ -13,7 +13,7 @@ You can install tftp-server and dhcp-server package from the Mandrake
 distribution for example.
 
 On the server machine at 192.168.2.1, you will find a "/etc/dhcpd.conf" sample
-file written by Florin Grad <florin@mandrakesoft.com>, where "mydomain.com" is
+file written by Florin Grad <florin>, where "mydomain.com" is
 assumed to be your domain name, and 192.168.1.1 a name server. All install are
 done on subnet 192.168.2.0.
 
diff --git a/docs/drakfont/drakfont.tex b/docs/drakfont/drakfont.tex
index bbc936e5b..035adf3a9 100644
--- a/docs/drakfont/drakfont.tex
+++ b/docs/drakfont/drakfont.tex
@@ -48,7 +48,7 @@
 
 %\end{center}
 %\end{figure}
-\author{Dupont Sebastien \\ sdupont@mandrakesoft.com}
+\author{Dupont Sebastien \\ sdupont}
 \date{05/10/2001}
 \pagestyle{myheadings}
 \markright{\scriptsize \trtitle}
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 8c60a9097..afc7a84a7 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -4,7 +4,7 @@
  #
  # $Id: Makefile 271082 2010-10-13 18:55:00Z tv $
  #
- # Pixel (pixel@mandriva.com) (mostly done by Guillaume Cottenceau)
+ # Pixel (pixel) (mostly done by Guillaume Cottenceau)
  #
  # Copyright 2000-2004 Mandriva
  #
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 1525e8d5d..aa040f667 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -1,7 +1,7 @@
  # -*- makefile -*-
  #******************************************************************************
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2000 Mandriva
  #
diff --git a/mdk-stage1/adsl.c b/mdk-stage1/adsl.c
index 831d83993..ace741c18 100644
--- a/mdk-stage1/adsl.c
+++ b/mdk-stage1/adsl.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/adsl.h b/mdk-stage1/adsl.h
index be84ee568..aa4461108 100644
--- a/mdk-stage1/adsl.h
+++ b/mdk-stage1/adsl.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c
index 804c301cc..fd9eb3679 100644
--- a/mdk-stage1/automatic.c
+++ b/mdk-stage1/automatic.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/automatic.h b/mdk-stage1/automatic.h
index 8eeb586cc..5fb890d61 100644
--- a/mdk-stage1/automatic.h
+++ b/mdk-stage1/automatic.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/bootsplash.c b/mdk-stage1/bootsplash.c
index 194df1cec..9d0d53327 100644
--- a/mdk-stage1/bootsplash.c
+++ b/mdk-stage1/bootsplash.c
@@ -1,5 +1,5 @@
 /*
- * Pixel (pixel@mandriva.com)
+ * Pixel (pixel)
  *
  * Copyright 2004 Mandriva
  *
diff --git a/mdk-stage1/bootsplash.h b/mdk-stage1/bootsplash.h
index 4696ce09a..04c19c9f0 100644
--- a/mdk-stage1/bootsplash.h
+++ b/mdk-stage1/bootsplash.h
@@ -1,5 +1,5 @@
 /*
- * Pixel (pixel@mandriva.com)
+ * Pixel (pixel)
  *
  * Copyright 2004 Mandriva
  *
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index 3dac3ecf7..e75e0fde4 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/cdrom.h b/mdk-stage1/cdrom.h
index cbfe92bea..7d182b257 100644
--- a/mdk-stage1/cdrom.h
+++ b/mdk-stage1/cdrom.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index faa285ef1..4d27a58c9 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/dhcp.c b/mdk-stage1/dhcp.c
index 7daedcea5..a4cc07446 100644
--- a/mdk-stage1/dhcp.c
+++ b/mdk-stage1/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/dhcp.h b/mdk-stage1/dhcp.h
index 62d8c109c..e17094adc 100644
--- a/mdk-stage1/dhcp.h
+++ b/mdk-stage1/dhcp.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c
index d98360b61..0538b55b6 100644
--- a/mdk-stage1/directory.c
+++ b/mdk-stage1/directory.c
@@ -1,6 +1,6 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
- * Olivier Blin (oblin@mandriva.com)
+ * Guillaume Cottenceau (gc)
+ * Olivier Blin (oblin)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/directory.h b/mdk-stage1/directory.h
index 47becc111..2fdc81edb 100644
--- a/mdk-stage1/directory.h
+++ b/mdk-stage1/directory.h
@@ -1,6 +1,6 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
- * Olivier Blin (oblin@mandriva.com)
+ * Guillaume Cottenceau (gc)
+ * Olivier Blin (oblin)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index b1de270d4..c2b71dbfc 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/disk.h b/mdk-stage1/disk.h
index 6e856c4c5..8a6d1021f 100644
--- a/mdk-stage1/disk.h
+++ b/mdk-stage1/disk.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/dns.c b/mdk-stage1/dns.c
index 32de36a25..63d801c62 100644
--- a/mdk-stage1/dns.c
+++ b/mdk-stage1/dns.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/dns.h b/mdk-stage1/dns.h
index d1d551b5e..107ad1bce 100644
--- a/mdk-stage1/dns.h
+++ b/mdk-stage1/dns.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/doc/documented..frontend.h b/mdk-stage1/doc/documented..frontend.h
index a1cf88a77..96e4dc8d8 100644
--- a/mdk-stage1/doc/documented..frontend.h
+++ b/mdk-stage1/doc/documented..frontend.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/frontend-common.c b/mdk-stage1/frontend-common.c
index 63ca082bf..cdc972740 100644
--- a/mdk-stage1/frontend-common.c
+++ b/mdk-stage1/frontend-common.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/frontend.h b/mdk-stage1/frontend.h
index 2d0869720..367d46735 100644
--- a/mdk-stage1/frontend.h
+++ b/mdk-stage1/frontend.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index c4dacd944..d9af9aac2 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/log.c b/mdk-stage1/log.c
index 8e4ae76f8..cb3f741dc 100644
--- a/mdk-stage1/log.c
+++ b/mdk-stage1/log.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/log.h b/mdk-stage1/log.h
index 1ecb519ac..d726a6b21 100644
--- a/mdk-stage1/log.h
+++ b/mdk-stage1/log.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/lomount.c b/mdk-stage1/lomount.c
index c70730379..efa6f5de5 100644
--- a/mdk-stage1/lomount.c
+++ b/mdk-stage1/lomount.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/lomount.h b/mdk-stage1/lomount.h
index 84287108f..7f3af2460 100644
--- a/mdk-stage1/lomount.h
+++ b/mdk-stage1/lomount.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index b2799dec1..745070052 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h
index 4bddb2452..96ba48fc2 100644
--- a/mdk-stage1/modules.h
+++ b/mdk-stage1/modules.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 8fd91ee2f..e73a2135a 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/mount.h b/mdk-stage1/mount.h
index 5b41949bb..e0d924901 100644
--- a/mdk-stage1/mount.h
+++ b/mdk-stage1/mount.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index a156e153f..d82ca28d5 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/network.h b/mdk-stage1/network.h
index ad42f33d0..914bc2ca5 100644
--- a/mdk-stage1/network.h
+++ b/mdk-stage1/network.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c
index 3fbf7fe09..e8a6ef6d3 100644
--- a/mdk-stage1/newt-frontend.c
+++ b/mdk-stage1/newt-frontend.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/newt/Makefile b/mdk-stage1/newt/Makefile
index 6750b70ec..9f6bd845a 100644
--- a/mdk-stage1/newt/Makefile
+++ b/mdk-stage1/newt/Makefile
@@ -1,6 +1,6 @@
  #******************************************************************************
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2000 Mandriva
  #
diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c
index 02d7ddba8..0345098f9 100644
--- a/mdk-stage1/nfsmount.c
+++ b/mdk-stage1/nfsmount.c
@@ -1,5 +1,5 @@
  /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2003 Mandriva
  *
diff --git a/mdk-stage1/params.c b/mdk-stage1/params.c
index aeac024c8..692c3e511 100644
--- a/mdk-stage1/params.c
+++ b/mdk-stage1/params.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/params.h b/mdk-stage1/params.h
index eb4fd49cd..06b64bd52 100644
--- a/mdk-stage1/params.h
+++ b/mdk-stage1/params.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/partition.c b/mdk-stage1/partition.c
index 8d6655dad..83bfc5ce6 100644
--- a/mdk-stage1/partition.c
+++ b/mdk-stage1/partition.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/partition.h b/mdk-stage1/partition.h
index 3accd7600..47639a3d0 100644
--- a/mdk-stage1/partition.h
+++ b/mdk-stage1/partition.h
@@ -1,5 +1,5 @@
 /*
- * Olivier Blin (oblin@mandriva.com)
+ * Olivier Blin (oblin)
  *
  * Copyright 2005 Mandriva
  *
diff --git a/mdk-stage1/pci-resource/Makefile b/mdk-stage1/pci-resource/Makefile
index b29c30203..c8214ddc1 100644
--- a/mdk-stage1/pci-resource/Makefile
+++ b/mdk-stage1/pci-resource/Makefile
@@ -2,7 +2,7 @@
  #
  # $Id: Makefile 253685 2009-03-06 14:27:29Z tv $
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2000 Mandriva
  #
diff --git a/mdk-stage1/pcmcia-resource/Makefile b/mdk-stage1/pcmcia-resource/Makefile
index 46dda9be1..b27eb2f0b 100644
--- a/mdk-stage1/pcmcia-resource/Makefile
+++ b/mdk-stage1/pcmcia-resource/Makefile
@@ -1,6 +1,6 @@
  #******************************************************************************
  #
- # Olivier Blin (blino@mandriva.com)
+ # Olivier Blin (blino)
  #
  # Copyright 2006 Mandriva
  #
diff --git a/mdk-stage1/pcmcia/Makefile b/mdk-stage1/pcmcia/Makefile
index a9529260a..5d077aac8 100644
--- a/mdk-stage1/pcmcia/Makefile
+++ b/mdk-stage1/pcmcia/Makefile
@@ -1,6 +1,6 @@
  #******************************************************************************
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2001 Mandriva
  #
diff --git a/mdk-stage1/pcmcia/pcmcia.h b/mdk-stage1/pcmcia/pcmcia.h
index 0b06792d7..ae7db247b 100644
--- a/mdk-stage1/pcmcia/pcmcia.h
+++ b/mdk-stage1/pcmcia/pcmcia.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c
index 622d898f5..329b97890 100644
--- a/mdk-stage1/pcmcia/probe.c
+++ b/mdk-stage1/pcmcia/probe.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000-2001 Mandriva
  *
diff --git a/mdk-stage1/probe-modules.c b/mdk-stage1/probe-modules.c
index 6f162aed4..ad4f9e4cd 100644
--- a/mdk-stage1/probe-modules.c
+++ b/mdk-stage1/probe-modules.c
@@ -1,5 +1,5 @@
 /*
- * Olivier Blin (blino@mandriva.com)
+ * Olivier Blin (blino)
  *
  * Copyright 2007-2004 Mandriva
  *
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index ff5b02994..50fd9d917 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/probing.h b/mdk-stage1/probing.h
index b4eda9c34..63c44a4cb 100644
--- a/mdk-stage1/probing.h
+++ b/mdk-stage1/probing.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c
index e9cd2495e..5a7e10de2 100644
--- a/mdk-stage1/rescue-gui.c
+++ b/mdk-stage1/rescue-gui.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2001 Mandriva
  *
diff --git a/mdk-stage1/slang/Makefile b/mdk-stage1/slang/Makefile
index fbbf542b3..85246f27e 100644
--- a/mdk-stage1/slang/Makefile
+++ b/mdk-stage1/slang/Makefile
@@ -1,6 +1,6 @@
  #******************************************************************************
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2000 Mandriva
  #
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 14d28e111..4493f35ea 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (was gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000-2004 Mandriva
  *
diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h
index 96215e9a7..575241323 100644
--- a/mdk-stage1/stage1.h
+++ b/mdk-stage1/stage1.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c
index ec85550ac..d82f4852d 100644
--- a/mdk-stage1/stdio-frontend.c
+++ b/mdk-stage1/stdio-frontend.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/sysfs/Makefile b/mdk-stage1/sysfs/Makefile
index 56bd278dc..e3f965c43 100644
--- a/mdk-stage1/sysfs/Makefile
+++ b/mdk-stage1/sysfs/Makefile
@@ -1,7 +1,7 @@
  #******************************************************************************
  #
- # Guillaume Cottenceau (gc@mandriva.com)
- # Olivier Blin (blino@mandriva.com)
+ # Guillaume Cottenceau (gc)
+ # Olivier Blin (blino)
  #
  # Copyright 2006 Mandriva
  #
diff --git a/mdk-stage1/thirdparty.c b/mdk-stage1/thirdparty.c
index 1aba562fd..57f38a2a4 100644
--- a/mdk-stage1/thirdparty.c
+++ b/mdk-stage1/thirdparty.c
@@ -1,6 +1,6 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
- * Olivier Blin (oblin@mandriva.com)
+ * Guillaume Cottenceau (gc)
+ * Olivier Blin (oblin)
  *
  * Copyright 2005 Mandriva
  *
diff --git a/mdk-stage1/thirdparty.h b/mdk-stage1/thirdparty.h
index 3995954e3..1c2ac2a05 100644
--- a/mdk-stage1/thirdparty.h
+++ b/mdk-stage1/thirdparty.h
@@ -1,6 +1,6 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
- * Olivier Blin (oblin@mandriva.com)
+ * Guillaume Cottenceau (gc)
+ * Olivier Blin (oblin)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index 433019fca..08fab5559 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h
index 9c87528cf..9954c5e20 100644
--- a/mdk-stage1/tools.h
+++ b/mdk-stage1/tools.h
@@ -1,6 +1,6 @@
 
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/url.c b/mdk-stage1/url.c
index 788b44081..3d2846649 100644
--- a/mdk-stage1/url.c
+++ b/mdk-stage1/url.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/url.h b/mdk-stage1/url.h
index 3f5071ebb..2c80e4432 100644
--- a/mdk-stage1/url.h
+++ b/mdk-stage1/url.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/usb-resource/Makefile b/mdk-stage1/usb-resource/Makefile
index 24dc14e40..e21832a3f 100644
--- a/mdk-stage1/usb-resource/Makefile
+++ b/mdk-stage1/usb-resource/Makefile
@@ -2,7 +2,7 @@
  #
  # $Id: Makefile 253685 2009-03-06 14:27:29Z tv $
  #
- # Guillaume Cottenceau (gc@mandriva.com)
+ # Guillaume Cottenceau (gc)
  #
  # Copyright 2000 Mandriva
  #
diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c
index 7567a3862..492061887 100644
--- a/mdk-stage1/utils.c
+++ b/mdk-stage1/utils.c
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/utils.h b/mdk-stage1/utils.h
index b6e6d2b68..d0d7ae617 100644
--- a/mdk-stage1/utils.h
+++ b/mdk-stage1/utils.h
@@ -1,5 +1,5 @@
 /*
- * Guillaume Cottenceau (gc@mandriva.com)
+ * Guillaume Cottenceau (gc)
  *
  * Copyright 2000 Mandriva
  *
diff --git a/mdk-stage1/wireless.c b/mdk-stage1/wireless.c
index ca0387fce..c9e363048 100644
--- a/mdk-stage1/wireless.c
+++ b/mdk-stage1/wireless.c
@@ -1,5 +1,5 @@
 /*
- * Olivier Blin (oblin@mandriva.com)
+ * Olivier Blin (oblin)
  *
  * Copyright 2005 Mandriva
  *
diff --git a/mdk-stage1/wireless.h b/mdk-stage1/wireless.h
index 3e5bb7790..7443f5c99 100644
--- a/mdk-stage1/wireless.h
+++ b/mdk-stage1/wireless.h
@@ -1,5 +1,5 @@
 /*
- * Olivier Blin (oblin@mandriva.com)
+ * Olivier Blin (oblin)
  *
  * Copyright 2005 Mandriva
  *
diff --git a/perl-install/install/install2 b/perl-install/install/install2
index 5b205af0c..e211d656a 100755
--- a/perl-install/install/install2
+++ b/perl-install/install/install2
@@ -2,7 +2,7 @@
 #- PERL_INSTALL_TEST is used to launch stage2 in debug mode
 
 #- Mandrake Graphic Install $Id: install2 258993 2009-08-07 18:01:22Z pterjan $
-#- Copyright (C) 1999/2000 Mandrakesoft (pixel@mandrakesoft.com)
+#- Copyright (C) 1999/2000 Mandrakesoft (pixel)
 #-
 #- 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 12b64dea9..ad5656f0b 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@mandrakesoft.com !!
+if you found one, please mail pixel !!
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 3021d36cf..e3b304c4a 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # DiskDrake
-# Copyright (C) 1999-2008 Mandriva (pixel@mandriva.com)
+# Copyright (C) 1999-2008 Mandriva (pixel)
 #
 # 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/drakdvb b/perl-install/standalone/drakdvb
index bd1b8dcaa..d9bbecd69 100755
--- a/perl-install/standalone/drakdvb
+++ b/perl-install/standalone/drakdvb
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Copyright (C) 2009 Mandriva
-#                    Pascal Terjan <pterjan@mandriva.com>
+#                    Pascal Terjan <pterjan>
 #
 # 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 54b924001..edb3a5663 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-2008 Mandriva (pixel@mandriva.com)
+# Copyright (C) 2002-2008 Mandriva (pixel)
 #
 # 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 f53ebd849..77e0139c9 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -12,7 +12,7 @@ my $authorisation_group = 'fileshare';
 
 ########################################
 # fileshare utility $Id: fileshareset 233183 2008-01-23 12:17:07Z tv $
-# Copyright (C) 2001-2008 Mandriva (pixel@mandriva.com)
+# Copyright (C) 2001-2008 Mandriva (pixel)
 #
 # 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/lsparts b/rescue/lsparts
index e1e866db4..8d36a02f4 100755
--- a/rescue/lsparts
+++ b/rescue/lsparts
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Main author Pascal Rigaux (pixel@mandriva.com)
+# Main author Pascal Rigaux (pixel)
 # Put together by Guillaume Cottenceau
 #
 # Copyright 1999-2005 Mandriva
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
index 3b5ac21cc..3478e2971 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>
 
 # 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 3511020ff..fa4d2acc9 100755
--- a/rescue/tree/sbin/fakeshutdown
+++ b/rescue/tree/sbin/fakeshutdown
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 #
-# Guillaume Cottenceau (gc@mandrakesoft.com)
+# Guillaume Cottenceau (gc)
 #
 # Copyright 2001 Mandrakesoft
 #