aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Rytarowski <kamil@mageia.org>2012-03-14 22:10:43 +0000
committerKamil Rytarowski <kamil@mageia.org>2012-03-14 22:10:43 +0000
commit6b87d3a4a1b1a23f8396699c7a2a7b13098329ad (patch)
treefdfec0c7c8884fe8bc0f6c960cb191ca5a7a7b07
parenta5d40bb2a0cb33fda2c5c2d88784ecfd42216b56 (diff)
downloaddrakx-installer-help-6b87d3a4a1b1a23f8396699c7a2a7b13098329ad.tar
drakx-installer-help-6b87d3a4a1b1a23f8396699c7a2a7b13098329ad.tar.gz
drakx-installer-help-6b87d3a4a1b1a23f8396699c7a2a7b13098329ad.tar.bz2
drakx-installer-help-6b87d3a4a1b1a23f8396699c7a2a7b13098329ad.tar.xz
drakx-installer-help-6b87d3a4a1b1a23f8396699c7a2a7b13098329ad.zip
- include NEWS, README, COPYING
- fix missing icons
-rw-r--r--COPYING23
-rw-r--r--NEWS6
-rw-r--r--README67
-rw-r--r--acceptLicense.html2
-rw-r--r--addUser.html2
-rw-r--r--ask_mntpoint_s.html2
-rw-r--r--choosePackages.html4
-rw-r--r--diskdrake.html4
-rw-r--r--doPartitionDisks.html4
-rw-r--r--formatPartitions.html2
-rw-r--r--images/dx-help.pngbin10986 -> 11451 bytes
-rw-r--r--images/dx-welcome.pngbin85136 -> 232710 bytes
-rw-r--r--intro.html6
-rw-r--r--misc-params.html4
-rw-r--r--selectKeyboard.html2
-rw-r--r--selectLanguage.html6
-rw-r--r--setRootPassword.html2
-rw-r--r--setupX.html2
-rw-r--r--uninstall-linux.html2
19 files changed, 118 insertions, 22 deletions
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..5187947
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,23 @@
+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)
+
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..deb24da
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,6 @@
+* Tue Mar 14 2012 Kamil Rytarowski <kamil> 2-2.mga2
+- add README, COPYING, NEWS
+- fix missing icons
+
+* Tue Mar 13 2012 Kamil Rytarowski <kamil> 2-1.mga2
+- import reworked documentation into the Mageia SVN
diff --git a/README b/README
new file mode 100644
index 0000000..bb027e3
--- /dev/null
+++ b/README
@@ -0,0 +1,67 @@
+drakx-installer-help README
+
+
+------------
+
+Imported into Mageia by Kamil Rytarowski, March 14 2012
+
+
+--------------
+
+Produced with the help of the Calenco CMS (http://www.calenco.com) developped by NeoDoc (http://www.neodoc.biz).
+
+------------------
+
+This package contains the help texts for the help buttons in drakx-installer-stage2 and
+an installer help manual that will be available after install.
+
+--------------
+
+It is based on the Mandriva 2005 LE documentation
+and is being adapted for Mageia by
+
+Claire Revillet
+Claire Robinson
+John Rye
+Simon Parsons
+Marja van Waes
+and many others.
+
+------------
+
+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
+
+------------
+
diff --git a/acceptLicense.html b/acceptLicense.html
index a0f7d9b..8109674 100644
--- a/acceptLicense.html
+++ b/acceptLicense.html
@@ -54,7 +54,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
diff --git a/addUser.html b/addUser.html
index 24602c0..465185c 100644
--- a/addUser.html
+++ b/addUser.html
@@ -93,7 +93,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
diff --git a/ask_mntpoint_s.html b/ask_mntpoint_s.html
index beb3318..f4ccb7b 100644
--- a/ask_mntpoint_s.html
+++ b/ask_mntpoint_s.html
@@ -63,7 +63,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/choosePackages.html b/choosePackages.html
index f9d9cf0..7ef1064 100644
--- a/choosePackages.html
+++ b/choosePackages.html
@@ -117,7 +117,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
@@ -232,7 +232,7 @@
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../common/images/warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
<th align="left">Warning</th>
</tr>
<tr>
diff --git a/diskdrake.html b/diskdrake.html
index d6368b0..903d42e 100644
--- a/diskdrake.html
+++ b/diskdrake.html
@@ -169,7 +169,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
@@ -227,7 +227,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/doPartitionDisks.html b/doPartitionDisks.html
index 89a9c49..04c638f 100644
--- a/doPartitionDisks.html
+++ b/doPartitionDisks.html
@@ -133,7 +133,7 @@
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../common/images/warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="./warning.png"></td>
<th align="left">Warning</th>
</tr>
<tr>
@@ -161,7 +161,7 @@
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../common/images/warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
<th align="left">Warning</th>
</tr>
<tr>
diff --git a/formatPartitions.html b/formatPartitions.html
index 894bb8a..7a607de 100644
--- a/formatPartitions.html
+++ b/formatPartitions.html
@@ -42,7 +42,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/images/dx-help.png b/images/dx-help.png
index 798d4c7..3282434 100644
--- a/images/dx-help.png
+++ b/images/dx-help.png
Binary files differ
diff --git a/images/dx-welcome.png b/images/dx-welcome.png
index 91d6da3..a23e15b 100644
--- a/images/dx-welcome.png
+++ b/images/dx-welcome.png
Binary files differ
diff --git a/intro.html b/intro.html
index dbe2f67..b398257 100644
--- a/intro.html
+++ b/intro.html
@@ -52,7 +52,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
@@ -77,7 +77,7 @@
<div class="figure-contents">
- <div class="mediaobject" align="center"><img src="images/dx-welcome.png" align="middle" alt="Very First Installation Welcome Screen"></div>
+ <div class="mediaobject" align="center"><img src="images/dx-welcome.png" align="middle" alt="Very First Installation Welcome Screen"></div>
</div>
</div><br class="figure-break">
@@ -127,7 +127,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
diff --git a/misc-params.html b/misc-params.html
index fbaae8e..6dae0dc 100644
--- a/misc-params.html
+++ b/misc-params.html
@@ -274,7 +274,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
@@ -295,7 +295,7 @@
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../common/images/warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
<th align="left">Warning</th>
</tr>
<tr>
diff --git a/selectKeyboard.html b/selectKeyboard.html
index 7a155d9..b002a10 100644
--- a/selectKeyboard.html
+++ b/selectKeyboard.html
@@ -40,7 +40,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/selectLanguage.html b/selectLanguage.html
index 63b08fc..4947fda 100644
--- a/selectLanguage.html
+++ b/selectLanguage.html
@@ -71,7 +71,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
@@ -90,7 +90,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
@@ -144,7 +144,7 @@
<div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Tip">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../common/images/tip.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="./tip.png"></td>
<th align="left">Tip</th>
</tr>
<tr>
diff --git a/setRootPassword.html b/setRootPassword.html
index 9fd0529..0e9cd55 100644
--- a/setRootPassword.html
+++ b/setRootPassword.html
@@ -165,7 +165,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/setupX.html b/setupX.html
index a4a7965..8e9f1cf 100644
--- a/setupX.html
+++ b/setupX.html
@@ -100,7 +100,7 @@
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../common/images/note.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="note.png"></td>
<th align="left">Note</th>
</tr>
<tr>
diff --git a/uninstall-linux.html b/uninstall-linux.html
index 5e21900..64d07c1 100644
--- a/uninstall-linux.html
+++ b/uninstall-linux.html
@@ -47,7 +47,7 @@
<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../common/images/warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
<th align="left">Warning</th>
</tr>
<tr>