- update README and COPYING (new help is not based on the Mandriva one)

2 files changed, 11 insertions, 62 deletions

diff --git a/COPYING b/COPYING
index 8e2ce14..972597b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,25 +1,6 @@
-This manual (except for the parts listed in the table below) is protected under Mandriva intellectual property rights. By reproducing, duplicating or distributing this manual in whole or in part, you explicitly agree to conform to the terms and conditions of this license agreement.
-
-This manual (except for the chapters listed in the table below) may be freely reproduced, duplicated and distributed either as such or as part of a bundled package in electronic and/or printed format, provided however that the following conditions are fulfilled:
-* That this copyright notice appears clearly and distinctively on all reproduced, duplicated and distributed copies.
-* That the front cover texts below, "about", and the section stating the names of authors and contributors are attached to the reproduced, duplicated or distributed version and remain unchanged.
-* That this manual, specifically for the printed format, is reproduced and/or distributed for noncommercial use only.
-* The express authorization of Mandriva SA must be obtained prior to any other use of any manual or part thereof.
-
-Mandrake, Mandrakesoft, DrakX and Linux-Mandrake are registered trademarks in the US and/or other countries. The related "Star logo" is also registered. All rights reserved. All other copyrights embodied in this document remain the property of their respective owners.
-
-Front-cover texts
-Mandrakesoft April 2005
-http://www.mandrakesoft.com/
-Copyright © 1999-2005 by Mandrakesoft S.A. and Mandrakesoft Inc.
-
-The chapters listed in the table below are protected by a different license. Consult the table and links for more details about these licenses.
-
-Chapter Name; Original Copyright License
-* "howto" "security" authors Kevin Fenzi and Dave Wreski - http://tldp.org The Linux Documentation Project (TLDP)
-* "howto" "network" authors Joshua D. Drake {POET} - https://secure.linuxports.com/ - The Linux Review http://www.gnu.org/copyleft/gpl.html GNU General Public License
-* "install-free" "install-free-software-chapter" Benjamin Drieu, http://www.april.org/ APRIL http://www.gnu.org/copyleft/gpl.html" GNU General Public License (GPL)
+The Mageia documentation is available under CC BY-SA 3.0
+http://creativecommons.org/licenses/by-sa/3.0/
 
 Icons warning.png, tip.png and note.png are taken from
-oxygen-icon-theme http://www.oxygen-icons.org/?page_id=4 and have the
-cc-by-sa licence: http://creativecommons.org/licenses/by-sa/3.0/
+oxygen-icon-theme http://www.oxygen-icons.org/?page_id=4 and also have the
+CC BY-SA 3.0 licence: http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/README b/README
index f2e1ab9..14c8b53 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ drakx-installer-help README
 
 ------------
 
-Imported into Mageia by Kamil Rytarowski, March 14 2012
+Packaged for Mageia by Kamil Rytarowski, March 14 2012
 
 
 --------------
@@ -16,51 +16,19 @@ This package contains the help texts for the help buttons in drakx-installer-sta
 
 --------------
 
-It is based on the Mandriva 2005 LE documentation
-and is being adapted for Mageia by
+The texts were made by:
 
+Barry Jackson
 Claire Revillet
 Claire Robinson
+John Bowden
 John Rye
 Simon Parsons
-Marja van Waes
-and many others.
+Marja Van Waes
 
 ------------
 
-Original contributors of the Mandriva 2005 LE documentation:
-
-NeoDoc Camille Bégnis camille@mandrakesoft.com
-Christian Roy croy@mandrakesoft.com
-Fabian Mandelbaum fabman@mandrakesoft.com
-Roberto Rosselli del Turco rosselli@ling.unipi.it
-Marco De Vitis mdv@spin.it
-Alice Lafox alice@lafox.net
-John Rye jrt746@clear.net.nz 
-Wolfgang Bornath wbo@mandrakesoft.com 
-Funda Wang fundawang@linux.net.cn
-Patricia Pichardo
-Bégnis Debora
-Rejnharc Mandelbaum
-Mickael Scherer mscherer@mandrakesoft.com 
-Jean-Michel Dault jmdault@mandrakesoft.com 
-Lunas Moon moon_lunas@yahoo.com.cn
-Céline Harrand maui@wanadoo.fr
-Fred Lepied flepied@mandrakesoft.com
-Pascal Rigaux pixel@mandrakesoft.com 
-Thierry Vignaud tvignaud@mandrakesoft.com 
-Giuseppe Ghibò ghibo@mandrakesoft.com 
-Stew Benedict sbenedict@mandrakesoft.com 
-Francine Suzon sitzver@yahoo.fr 
-Indrek Madedog Triipus madedog@hot.ee 
-Nicolas Berdugo nicolasberdugo@yahoo.com 
-Thorsten Kamp wbo@mandrakesoft.com 
-Fabrice Facorat f.faber-pro@ifrance.com 
-Xiao Ming huaming@gmail.com 
-Snature a.c.s@163.com 
-Guylhem Aznar metalab@externe.net 
-Pavel Maryanov acid_jack@lafox.net 
-Annie Tétrault annie.tetrault@globetrotter.net 
 
-------------
+
+