update help files (docteam)

author: Anne Nicolas <ennael@mageia.org> 2012-04-05 12:01:37 +0000
committer: Anne Nicolas <ennael@mageia.org> 2012-04-05 12:01:37 +0000
commit: 3134e07e03891115644be39cdde82a03761ad934 (patch)
tree: 987244fbb58c4a551665bb3d30affa7a4719588b
parent: afa67b4b64d58d5c37fb360deafb13adb258e4ba (diff)
download: drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar
drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.gz
drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.bz2
drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.xz
drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.zip
20 files changed, 906 insertions, 1673 deletions
diff --git a/acceptLicense.html b/acceptLicense.html
index 7031830..9e3da39 100644
--- a/acceptLicense.html
+++ b/acceptLicense.html
@@ -2,60 +2,78 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>License Terms of the Distribution</title>
+      <title>License and Release Notes</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="selectLanguage.html" title="Choosing your Language">
-      <link rel="next" href="selectInstallClass.html" title="Installation Class"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="selectLanguage.html" title="Please choose a language to use">
+      <link rel="next" href="setupSCSI.html" title="Setup SCSI"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="License Terms of the Distribution">
+      <div lang="" class="section" title="License and Release Notes">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-acceptLicense"></a>License Terms of the
-                       Distribution
+                  <h2 class="title"><a name="acceptLicense"></a>License and Release Notes
                   </h2>
                </div>
             </div>
          </div>
-           
          
            
          
+          
+         <div class="section" title="License Agreement">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="license"></a>License Agreement
+                     </h3>
+                  </div>
+               </div>
+            </div>  
+            
+              
+            <p><a name="acceptLicense-pa1"></a>Before installing <span class="application">Mageia</span>,please read the license terms and conditions carefully.
+            </p>
+            
+              
+            <p><a name="acceptLicense-pa2"></a>These terms and conditions apply to the entire <span class="application">Mageia</span> distribution and must be accepted before you can continue.
+            </p>
+              
+              
+            <p><a name="acceptLicense-pa3"></a>To accept, simply select <span class="guilabel">Accept</span> and then click on <span class="guibutton">Next</span>. 
+            </p>
+              
+              
+            <p><a name="acceptLicense-pa4"></a>If you decide not to accept these conditions, then we thank you for looking. Clicking  <span class="guibutton">Quit</span> will reboot your computer.
+            </p>
+            
+             
+         </div>
            
-         <p><a name="BId-drakxid-acceptLicense-pa1"></a><a class="indexterm" name="BId-drakxid-acceptLicense-it1"></a>Before continuing, you should carefully read the terms of the
-              license. It covers the entire <span class="application">Mageia</span> distribution. If you
-              agree with all the terms it contains, select <span class="guilabel">Accept</span> and
-              click on <span class="guibutton">Next</span>. If not, clicking on
-              <span class="guibutton">Quit</span> will reboot your computer.
-         </p>
          
-           
-         <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="tip.png"></td>
-                  <th align="left">Tip</th>
-               </tr>
-               <tr>
-                  <td align="left" valign="top">
-                         
-                     <p><a name="BIdNEW-drakxid-acceptLicense-pa2"></a>If you are curious about any
-                            technical changes which have occurred in the distribution since the last
-                            release, you can click on the <span class="guibutton">Release Notes</span> button
-                            to display them.
-                     </p>
-                       
-                  </td>
-               </tr>
-            </table>
+         <div class="section" title="Release Notes">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="acceptLicense"></a>Release Notes
+                     </h3>
+                  </div>
+               </div>
+            </div>
+            
+            
+              
+            <p><a name="acceptLicense-pa6"></a>To see what's new in this latest release of <span class="application">Mageia</span>, click on the  <span class="guibutton">Release Notes</span> button.
+            </p>
+              
+              
          </div>
-         
+           
       </div>
    </body>
 </html>
diff --git a/addUser.html b/addUser.html
index 4835795..ae1c3ed 100644
--- a/addUser.html
+++ b/addUser.html
@@ -2,105 +2,104 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Adding a User</title>
+      <title>User and Superuser Management</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="setRootPassword.html" title="Root Password">
-      <link rel="next" href="setupX.html" title="Configuring X, the Graphical Server"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="choosePackages.html" title="Choosing packages to be installed">
+      <link rel="next" href="setupX.html" title="Set up X, graphic card and monitor configuration"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Adding a User">
+      <div lang="" class="section" title="User and Superuser Management">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-addUser"></a>Adding a User
+                  <h2 class="title"><a name="addUser"></a>User and Superuser Management
                   </h2>
                </div>
             </div>
          </div>
-           
-           
-           
          
-          
          
-         
-           
-         <p><a name="BId-drakxid-addUser-pa1"></a><span class="application">GNU/Linux</span> is a
-            multi-user system which means each user can have his or her own
-                preferences, own files and so on. But unlike <code class="literal">root</code>, who is the system
-                administrator, the <a class="indexterm" name="BId-drakxid-addUser-it1"></a>users you add at this point won't be authorized to
-                change anything except their own files and their own
-                configurations, protecting the system from unintentional or
-                malicious changes which could have a serious impact on it.
-         </p>
-         
-         
-         
-          
-         <p><a name="BIdNEW-drakxid-addUser-pa5"></a>You will have to create at
-              least one regular user for yourself&nbsp;&#8212; this is the account
-              which you should use for routine, day-to-day usage. Although it's
-              very easy to log in as <code class="literal">root</code> to do anything and
-              everything, it may also be very dangerous! A very simple mistake
-              could mean that your system won't work any more. If you make a
-              serious mistake as a regular user, the worst that can happen is that
-              you'll lose some information, but you won't affect the entire
-              system.
-         </p>
-         
-          
-         <p><a name="BId-drakxid-addUser-pa2"></a>The first field asks
-              you for a real name. <span class="application">DrakX</span> will use the first word you type
-              in this field and copy it, all in lowercase, to the <span class="guimenu">Login
-                 name</span> field, which is the name this user will enter to log
-              on to the system. You can override it and change the <span class="guimenu">Login
-                 Name</span>. The next step is to enter a password. From a
-              security point of view, a non-privileged (regular) user's password
-              is not as crucial as the <code class="literal">root</code> password, but
-              that's no reason to neglect it by making it blank or too simple:
-              after all, <span class="emphasis"><em>your</em></span> files could be the ones at
-              risk.
-         </p>
-         
-          
-         <p><a name="BId-drakxid-addUser-pa3"></a>Once you click on
-              <span class="guimenu">Accept user</span> you can add other users. Add a user
-              for each one of your friends, your father, your sister, etc. Click
-              <span class="guimenu">Next</span> when you're finished adding users.
-         </p>
-         
-         
-         
-          
-         <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="tip.png"></td>
-                  <th align="left">Tip</th>
-               </tr>
-               <tr>
-                  <td align="left" valign="top">
-                       
-                     <p><a name="BId-drakxid-addUser-pa4"></a>Clicking the
-                           <span class="guibutton">Advanced</span> button allows you to change the
-                           default <code class="literal">shell</code> for that user
-                           (<span class="application">bash</span> by default).
-                     </p>
-                      
-                  </td>
-               </tr>
-            </table>
+         <div class="section" title="Set Administrator (root) Password:">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="root-password"></a>Set Administrator (root) Password:
+                     </h3>
+                  </div>
+               </div>
+            </div>  
+            
+            <p><a name="root-password-pa1"></a>It is advisable for all Mageia installations to set a superuser or administrator's password, usually called the <span class="emphasis"><em>root password</em></span> in Linux. As you type a password into the top box the shield in its colour will change from red to yellow to green depending
+               on the strength of the password. A green shield shows you are using a strong password. You need to repeat the same password
+               in the box just below the first password box, this checks that you have not mistyped the first password by comparing them.
+               
+            </p>
+               
+               
+            <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="note.png"></td>
+                     <th align="left">Note</th>
+                  </tr>
+                  <tr>
+                     <td align="left" valign="top">
+                        <p><a name="root-password-pa2"></a>All passwords are case sensitive, it is best to use a mixture of letters (upper and lower case), numbers and other characters
+                           in a password.  
+                        </p>
+                     </td>
+                  </tr>
+               </table>
+            </div>
+               
+               
          </div>
          
          
          
-           
-         
+            
+            
+            
+         <div class="section" title="Enter a user">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="enterUser"></a>Enter a user
+                     </h3>
+                  </div>
+               </div>
+            </div>  
+               
+            <p><a name="enterUser-pa1"></a>Use Led43's text to write this part
+            </p>
+               
+               
+         </div>
+            
+            
+         <div class="section" title="Advanced User Management">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="addUserAdvanced"></a>Advanced User Management
+                     </h3>
+                  </div>
+               </div>
+            </div>  
+               
+               
+            <p><a name="addUserAdvanced-pa1"></a>Use Led43's text to write this part
+            </p>
+               
+                
+         </div>
+             
+             
       </div>
    </body>
 </html>
diff --git a/ask_mntpoint_s.html b/ask_mntpoint_s.html
index 01dd0e8..e369a60 100644
--- a/ask_mntpoint_s.html
+++ b/ask_mntpoint_s.html
@@ -2,59 +2,122 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choosing Mount Points</title>
+      <title>Choose the mount points</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="takeOverHdConfirm.html" title="Confirm data deletion">
-      <link rel="next" href="formatPartitions.html" title="Choose Partitions to Be Formatted"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="takeOverHdConfirm.html" title="Confirm hard disk to be formatted">
+      <link rel="next" href="formatPartitions.html" title="Formatting"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choosing Mount Points">
+      <div lang="" class="section" title="Choose the mount points">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-ask_mntpoint_s"></a>Choosing Mount Points
+                  <h2 class="title"><a name="ask_mntpoint_s"></a>Choose the mount points
                   </h2>
                </div>
             </div>
          </div>
-             
          
-             
+          
          
-             
-         
-             
-         <p><a name="BId-drakxid-ask_mntpoint_s-pa1"></a>Listed here are the existing Linux
-            partitions detected on your hard drive. You can keep the choices
-            made by the wizard, since they are good for most common
-            installations. If you make any changes, you must at least define a
-               <a class="indexterm" name="BId-drakxid-ask_mntpoint_s-it1"></a><a class="indexterm" name="BId-drakxid-ask_mntpoint_s-it2"></a>root partition (<code class="literal">/</code>). Do not choose too small a partition or you will not be able to install enough software. In most cases it is best to also
-            create a <code class="literal">/home</code> partition, to store your data on (only possible if you
-               have more than one Linux partition available).
+           
+         <p><a name="ask_mntpoint_s-pa1"></a>Here you see the Linux partitions that have been found on your computer. If you don't agree with the suggestions of <span class="application">DrakX</span>, you can change the mount points. 
          </p>
+           
+           
+         <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="./note.png"></td>
+                  <th align="left">Note</th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p><a name="ask_mntpoint_s-pa1"></a>If you change anything, make sure you still have at least ONE <code class="literal">/</code> partition 
+                     </p>
+                  </td>
+               </tr>
+            </table>
+         </div>
+           
+           
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                    
+                    
+                  <p><a name="ask_mntpoint_s-pa3"></a>Every partition is shown
+                        as follows: "Device" ("Capacity", "Mount point", "Type").
+                  </p>
+                    
+                    
+               </li>
+               <li class="listitem">  
+                    
+                    
+                  <p><a name="ask_mntpoint_s-pa4"></a>"Device", is made up of: "hard drive", "hard drive number", "partition number" (for example, "sda5"). 
+                  </p>
+                    
+                    
+               </li>
+               <li class="listitem">
+                    
+                    
+                  <p><a name="ask_mntpoint_s-pa5"></a>Each partition is listed
+                        as follows: "Device", "Capacity", "Mount point", "Type".
+                  </p>
+                    
+                    
+               </li>
+               <li class="listitem">
+                    
+                    
+                  <p><a name="ask_mntpoint_s-pa6"></a>If you have many partitions, you can choose many different mount points from the drop down menu, such as <code class="literal">/</code>, <code class="literal">/home</code> and <code class="literal">/var</code>. You can even make your own mount points, for instance <code class="literal">/video</code> for a partition where you want to store your films, or <code class="literal">/cauldron-home</code> for the <code class="literal">/home</code> partition of a cauldron install.
+                  </p>
+                    
+                     
+                     
+               </li>
+               <li class="listitem">
+                    
+                    
+                  <p><a name="ask_mntpoint_s-pa7"></a>For partitions you don't need to have access to, you can leave the mount point field blank.
+                  </p>
+                    
+                    
+               </li>
+            </ul>
+         </div>
          
-             
-         <p><a name="BId-drakxid-ask_mntpoint_s-pa2"></a>Each partition is listed
-               as follows: "Device", "Capacity", "Mount point","Type".
-         </p>
+          
+         <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="warning.png"></td>
+                  <th align="left">Warning</th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                        
+                     <p><a name="ask_mntpoint_s-pa9"></a>Choose <span class="guibutton">Previous</span> if you are not sure what to choose, and then tick <span class="guilabel">Custom disk partitioning</span>. In the screen that follows, you can click on a partition to see it's type and size.
+                     </p>
+                  </td>
+               </tr>
+            </table>
+         </div>
          
-             
-         <p><a name="BId-drakxid-ask_mntpoint_s-pa3"></a>"Device", is structured: "hard drive type", "hard drive number", "partition number" (for example, "sda5"). 
-         </p>
          
-             
-             
-         	  
-             
-         <p><a name="BId-drakxid-ask_mntpoint_s-pa7"></a>When the mount points are correct, or corrected, click <span class="guibutton">Next</span>. You'll then be given the choice to format one or more of the partitions you just chose to install Mageia on. Usually, formatting
-            <code class="literal">/</code> and saving <code class="literal">/home</code> (if the same partition was your <code class="literal">/home</code> before), is a good choice.
+         <p><a name="ask_mntpoint_s-pa9"></a>You are sure the mount points are correct? Now click on <span class="guibutton">Next</span>, and choose whether you only want to format the partition(s) DrakX suggests, or more.
          </p>
          
+         
            
       </div>
    </body>
diff --git a/choosePackages.html b/choosePackages.html
index 9438fed..71327d9 100644
--- a/choosePackages.html
+++ b/choosePackages.html
@@ -2,290 +2,151 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choose Packages to Install</title>
+      <title>Choosing packages to be installed</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="partition_with_diskdrake.html" title="Format Disks with DiskDrake">
-      <link rel="next" href="setRootPassword.html" title="Root Password"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="diskdrake.html" title="Custom disk partitioning with DiskDrake">
+      <link rel="next" href="addUser.html" title="User and Superuser Management"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choose Packages to Install">
+      <div lang="" class="section" title="Choosing packages to be installed">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakx-choosePackages"></a>Choose Packages to Install
+                  <h2 class="title"><a name="choosePackages"></a>Choosing packages to be installed
                   </h2>
                </div>
             </div>
          </div>
-           
          
          
+         <p><a name="choosePackages-pa1"></a>Depending on your choice, you may get one or more screens about choosing packages
+         </p>
          
-          
-           
-         <div class="section" title="Graphical Environment">
-            <div class="titlepage">
-               <div>
-                  <div>
-                     <h3 class="title"><a name="drakxid-choose-graphical-env"></a>Graphical Environment
-                     </h3>
-                  </div>
-               </div>
-            </div>  
-               
-                
-            <p><a name="BId-drakx-choose-graphical-env-pa1"></a><a class="indexterm" name="BId-drakx-choose-graphical-env-it5"></a>
-                     <span class="guilabel">Graphical Environment</span>: this is where you
-               will choose your preferred graphical environment. At least one
-                     must be selected if you want to have a graphical interface
-                     available.
-            </p>
-                
-         </div>
          
-          
-         <div class="section" title="Choose Package Groups to Install">
+         <div class="section" title="Desktop Selection">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="drakxid-choosePackages"></a>Choose Package
-                           Groups to Install
+                     <h3 class="title"><a name="choose-graphical-env"></a>Desktop Selection
                      </h3>
                   </div>
                </div>
-            </div>
-              
-            
-              
-            
-              
-            <p><a name="BId-drakx-choosePackages-pa1"></a><a class="indexterm" name="BId-drakx-choosePackages-it1"></a>It's now time to
-                   specify which programs you wish to install on your system. There
-                   are thousands of packages available for <span class="application">Mageia</span>, and to
-                   make it simpler to manage, they have been placed into groups of
-                   similar applications.
-            </p>
-            
-            
-            
-              
-            <p><a name="BId-drakx-choosePackages-pa2"></a><span class="application">Mageia</span> sorts package groups into
-                  categories. You can mix and match applications from the various
-                  categories, so a <span class="guilabel">Workstation</span> installation can
-                  still have applications from the <span class="guilabel">Server</span>
-                  category installed.
-            </p>
-            
-              
-            <div class="orderedlist">
-               <ol class="orderedlist" type="1">
-                  <li class="listitem">
-                         
-                     <p><a name="BId-drakx-choosePackages-pa3"></a><a class="indexterm" name="BId-drakx-choosePackages-it2"></a><span class="guilabel">Workstation</span>:
-                              if you plan to use your machine as a workstation, select one or
-                              more of the groups in this category. The special
-                              <code class="literal">LSB</code> group will configure your system so that
-                              it complies as much as possible with the <a class="ulink" href="http://www.linuxbase.org/" target="_top">Linux Standard Base
-                                 Project</a> specifications.
-                     </p>
-                        
-                  </li>
-                  <li class="listitem">
-                         
-                     <p><a name="BId-drakx-choosePackages-pa5"></a><a class="indexterm" name="BId-drakx-choosePackages-it4"></a><span class="guilabel">Server</span>:
-                              if your machine is intended to be a server, select which of the
-                              more common services you wish to install on your machine.
-                     </p>
-                        
-                  </li>
-               </ol>
-            </div>
-            
-                
-            <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="tip.png"></td>
-                     <th align="left">Tip</th>
-                  </tr>
-                  <tr>
-                     <td align="left" valign="top">
-                              
-                        <p><a name="BId-drakx-choosePackages-pa7"></a>Moving the
-                           	mouse cursor over a group name will display a short
-                           	explanatory text about that group.
-                        </p>
-                            
-                     </td>
-                  </tr>
-               </table>
-            </div>
-            
-                <a class="indexterm" name="BId-drakx-choosePackages-it6"></a>
+            </div>  
             
-                
-            <p><a name="BId-drakx-choosePackages-pa11"></a>You can
-                     check the <span class="guilabel">Individual package selection</span> box,
-                     which is useful if you're familiar with the packages being
-                     offered or if you want to have total control over what will be
-                     installed.
+            <p><a name="choose-graphical-env-pa1"></a>Choose whether you prefer to use the
+                       <span class="application">KDE</span> or <span class="application">Gnome</span> desktop environment. Both
+                     come with a full set of  useful applications and tools. Tick <span class="guilabel">Custom</span> if
+                     you want to use neither or both, or if you want something other than the default software
+                     choice for these desktop environments.
             </p>
             
-                
-            <p><a name="BId-drakx-choosePackages-pa12"></a>If you
-                     start the installation in <span class="guilabel">Upgrade</span> mode,
-                     you can deselect all groups and prevent the installation of any new
-                     packages. This is useful for repairing or updating an existing
-                     system.
+             
+            <p><a name="choose-graphical-env-pa2"></a>Click <span class="guibutton">Next</span> to continue.
             </p>
-            
-            
+               
+               
          </div>
          
-               
+         
+         
+            
+            
             
-         <div class="section" title="Minimal Installation">
+         <div class="section" title="Package Group Selection">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="minimal-install"></a>Minimal Installation
+                     <h3 class="title"><a name="choosePackagesGroups"></a>Package Group Selection
                      </h3>
                   </div>
                </div>
-            </div>
-                  
+            </div>  
                
-            <p><a name="BIdNEW-minimal-install-pa19"></a>If you
-                   deselect all groups when performing a regular installation (as
-                   opposed to an upgrade), a new dialog shows after pressing the
-                   <span class="guibutton">Next</span> button, suggesting different options
-                   for a minimal installation:
+            <p><a name="choosePackagesGroups-pa1"></a>Packages have been sorted into groups, to make installing what you need on your system a lot easier.
             </p>
-            
                
-            <div class="itemizedlist"><a name="BIdNEW-drakx-choosePackages-item1"></a><ul class="itemizedlist">
+               
+            <p><a name="choosePackagesGroups-pa2"></a></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
                   <li class="listitem">
-                          
-                     <p><a name="BId-drakx-choosePackages-pa8"></a><span class="guilabel">With
-                                  X</span>: install the minimum number of packages possible
-                               to have a working graphical desktop.
-                     </p>
+                       
                          
+                     <p><a name="choosePackagesGroups-pa3"></a>Workstation: <span class="emphasis"><em>ADD SOME TEXT</em></span>.
+                     </p>
+                       
+                       
+                  </li>
+                  <li class="listitem">  
+                       
+                       
+                     <p><a name="choosePackagesGroups-pa4"></a>Server: <span class="emphasis"><em>ADD SOME TEXT</em></span>.
+                     </p>
+                       
+                       
                   </li>
                   <li class="listitem">
-                          
-                     <p><a name="BId-drakx-choosePackages-pa9"></a><span class="guilabel">With basic
-                                  documentation</span>: installs the base system plus basic
-                               utilities and their documentation. This installation is
-                               suitable for setting up a server.
+                       
+                       
+                     <p><a name="choosePackagesGroups-pa5"></a>Graphical Environment: <span class="emphasis"><em>ADD SOME TEXT</em></span>. .
                      </p>
-                         
+                       
+                       
                   </li>
                   <li class="listitem">
-                          
-                     <p><a name="BId-drakx-choosePackages-pa10"></a><span class="guilabel">Truly minimal install</span>:
-                               installs the absolute minimum number of packages necessary to
-                               get a working <span class="application">Linux</span> system. With this installation you
-                               will only have a command-line interface.
+                       
+                       
+                     <p><a name="choosePackagesGroups-pa6"></a>individual package selection: You can use
+                                    this option to manually add extra packages if you know what you want.
                      </p>
-                         
+                       
+                        
+                        
                   </li>
                </ul>
             </div>
-              
+            <p>
+               
+            </p>
+             
+            <p><a name="choosePackagesGroups-pa7"></a>Click <span class="guibutton">Next</span> to continue.
+            </p>
+               
+               
          </div>
-         
-          
-         <div class="section" title="Choosing Individual Packages to Install">
+            
+            
+         <div class="section" title="Minimal Install">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="drakxid-choosePackagesTree"></a>Choosing
-                           Individual Packages to Install
+                     <h3 class="title"><a name="minimal-install"></a>Minimal Install
                      </h3>
                   </div>
                </div>
-            </div>
-              
-            
-              
-            
-              
-            <p><a name="BId-drakx-choosePackages-pa13"></a>If you choose
-                  to install packages individually, the installer will present a tree
-                  structure containing all packages classified by groups and
-                  subgroups. While browsing the tree, you can select entire groups,
-                  subgroups, or individual packages.
-            </p>
-            
-              
-            <p><a name="BId-drakx-choosePackages-pa14"></a>Whenever you select a
-                  package on the tree, a description will appear on the right to let
-                  you know the purpose of that package.
-            </p>
-            
-              
-            <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="warning.png"></td>
-                     <th align="left">Warning</th>
-                  </tr>
-                  <tr>
-                     <td align="left" valign="top">
-                           
-                        <p><a name="BId-drakx-choosePackages-pa15"></a>If a server
-                               package has been selected, either because you specifically chose
-                               the individual package or because it was part of a group of
-                               packages, you will be asked to confirm that you really want those
-                               server packages to be installed. By default <span class="application">Mageia</span> will
-                               automatically start any installed services (servers) at boot
-                               time. Even if they are safe and have no known issues at the time
-                               the distribution was shipped, it is entirely possible that
-                               security holes were discovered after this version of
-                               <span class="application">Mageia</span> was finalized. If you don't know what a
-                               particular service is supposed to do or why it's being installed,
-                               then click <span class="guibutton">No</span>.
-                        </p>
-                            
-                     </td>
-                  </tr>
-               </table>
-            </div>
-            
-              
+            </div>  
                
-            <p><a name="BId-drakx-choosePackages-pa16"></a><a class="indexterm" name="BId-drakx-choosePackages-it7"></a> The <span class="guilabel">Show
-                       automatically selected packages</span> option is used to
-                    disable the warning dialog. Those appear whenever the installer
-                    automatically selects a package to resolve a dependency issue.
-                    Some packages depend on others and the installation of one
-                    particular package may require the installation of another
-                    one. The installer can determine which packages are required to
-                    satisfy a dependency and to successfully complete the
-                    installation.
-            </p>
-            
-              
-            
-              
-            <p><a name="BId-drakx-choosePackages-pa17"></a>The little
-                  floppy disk icon at the bottom of the list allows you to load or
-                  save the packages list. This is useful if you have a number of
-                  machines that you wish to configure identically. Click on this icon
-                  and select whether you wish to <span class="guilabel">Load</span> or
-                  <span class="guilabel">Save</span> the packages list, then select the medium
-                  in the following screen and click on the <span class="guibutton">Ok</span>
-                  button.
+                 
+            <p><a name="minimal-install-pa1"></a>You can choose a Minumal Installation by deselecting everything in the Package Group Selection screen.  Minimal Installation
+               is
+                      intended for those with specific uses in mind for their Mageia, such as a server or a specialised workstation. You
+               will probably use this option combined with Manual Package
+                      Selection. If you choose this installation class, then the next screen will offer you a few useful extras to install,
+               such as documentation and X, if you wish. 
+                    
             </p>
-              
+               
+                
          </div>
-         
+             
+             
+             
+             
       </div>
    </body>
 </html>
diff --git a/diskdrake.html b/diskdrake.html
index 31fb264..dbff069 100644
--- a/diskdrake.html
+++ b/diskdrake.html
@@ -2,247 +2,60 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Format Disks with DiskDrake</title>
+      <title>Custom disk partitioning with DiskDrake</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="formatPartitions.html" title="Choose Partitions to Be Formatted">
-      <link rel="next" href="choosePackages.html" title="Choose Packages to Install"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="formatPartitions.html" title="Formatting">
+      <link rel="next" href="choosePackages.html" title="Choosing packages to be installed"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Format Disks with DiskDrake">
+      <div lang="" class="section" title="Custom disk partitioning with DiskDrake">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-partition_with_diskdrake"></a>Format Disks with DiskDrake
+                  <h2 class="title"><a name="diskdrake"></a>Custom disk partitioning with
+                         DiskDrake
                   </h2>
                </div>
             </div>
          </div>
-             
-         
-             
-         
-             
-         
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa1"></a>At this point,
-            you need to choose which partition(s) will be used for the
-                installation of your <span class="application">Mandriva Linux</span> system. If partitions have
-                already been defined, either from a previous installation of
-                <span class="application">GNU/Linux</span> or by another partitioning tool, you can use existing
-                partitions. Otherwise, hard drive partitions must be
-                defined.
-         </p>
-             
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa2"></a>To create
-                partitions, you must first select a hard drive. You can select the
-                disk for partitioning by clicking on <span class="quote">&#8220;<span class="quote">hda</span>&#8221;</span> for the
-                first IDE drive, <span class="quote">&#8220;<span class="quote">hdb</span>&#8221;</span> for the second,
-                <span class="quote">&#8220;<span class="quote">sda</span>&#8221;</span> for the first <acronym class="acronym">SCSI</acronym> drive and so on.
-         </p>
-         
            
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa3"></a>To partition
-                the selected hard drive, you can use these options:
-         </p>
-         
-             
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa4"></a><span class="guibutton">Clear
-                              all</span>: this option deletes all partitions on the
-                           selected hard drive
-                  </p>
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa5"></a><span class="guibutton">Auto allocate</span>: this option
-                           enables you to automatically create <acronym class="acronym">ext3</acronym> and swap partitions
-                           in the free space of your hard drive
-                  </p>
-                        
-               </li>
-            </ul>
-         </div>
-         
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa6"></a><span class="guibutton">More</span>: gives access to
-            	additional features:
-         </p>
-         
-             
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa7"></a><span class="guibutton">Save
-                           partition table</span>: saves the partition table to a
-                        floppy. Useful for later partition-table recovery if necessary. It
-                        is strongly recommended that you perform this step.
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa8"></a><span class="guibutton">Restore
-                           partition table</span>: allows you to restore a previously
-                        saved partition table from a floppy disk.
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa9"></a><span class="guibutton">Rescue
-                           partition table</span>: if your partition table is damaged,
-                        you can try to recover it using this option. Please be careful and
-                        remember that it doesn't always work.
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa10"></a><span class="guibutton">Reload
-                           partition table</span>: discards all changes and reloads the
-                        partition table that was originally on the hard drive.
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa11"></a><span class="guilabel">Removable
-                           media auto-mounting</span>: unchecking this option will force
-                        users to manually mount and unmount removable media such as
-                        floppies and <acronym class="acronym">CD-ROM</acronym>s.
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa12"></a><span class="guibutton">Wizard</span>:
-                        use this option if you wish to use a wizard to partition your hard
-                        drive. This is recommended if you do not have a good understanding
-                        of partitioning.
-                  </p>
-               </li>
-               <li class="listitem">
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa13"></a><span class="guibutton">Undo</span>:
-                        use this option to cancel your changes.
-                  </p>
-               </li>
-               <li class="listitem">
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa14"></a><span class="guibutton">Toggle
-                           between normal/expert mode</span>: allows additional actions
-                        on partitions (type, options, format) and gives more information
-                        about the hard drive.
-                  </p>
-               </li>
-               <li class="listitem">
-                  	
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa15"></a><span class="guibutton">Done</span>:
-                        when you are finished partitioning your hard drive, this will save
-                        your changes back to disk.
-                  </p>
-                        
-               </li>
-            </ul>
-         </div>
          
-             
-         <div class="tip" title="Tip" style="margin-left: 0.5in; margin-right: 0.5in;">
-            <table border="0" summary="Tip">
+           
+         <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="[Tip]" src="tip.png"></td>
-                  <th align="left">Tip</th>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="./warning.png"></td>
+                  <th align="left">Warning</th>
                </tr>
                <tr>
                   <td align="left" valign="top">
-                           
-                     <p><a name="drakx-pa71a"></a>When defining the size of a partition,
-                              you can finely set the partition size by using the
-                              <span class="keysym">Arrow</span> keys of your keyboard.
-                     </p>
                          
-                  </td>
-               </tr>
-            </table>
-         </div>
-         
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa16"></a>Note: you can
-                reach any option using the keyboard. Navigate through the
-                partitions using <span class="keycap"><strong>Tab</strong></span> and the
-                <span class="keycap"><strong>Up/Down</strong></span> arrows.
-         </p>
-             
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa17"></a>When a partition is selected, you can
-                   use:
-         </p>
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                  	  
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa18"></a><span class="keysym">Ctrl-</span>+<span class="keysym">c</span>
-                            to create a new partition (when an empty partition is
-                            selected)
-                  </p>
-                  	
-               </li>
-               <li class="listitem">
-                  	  
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa19"></a><span class="keysym">Ctrl-</span>+<span class="keysym">d</span>
-                            to delete a partition
-                  </p>
-                  	
-               </li>
-               <li class="listitem">
-                  	  
-                  <p><a name="BId-drakxid-partition_with_diskdrake-pa20"></a><span class="keysym">Ctrl-</span>+<span class="keysym">m</span>
-                            to set the mount point
-                  </p>
-                  	
-               </li>
-            </ul>
-         </div> 
-         
-             
-         <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="note.png"></td>
-                  <th align="left">Note</th>
-               </tr>
-               <tr>
-                  <td align="left" valign="top">
-                           
-                     <p><a name="BId-drakxid-partition_with_diskdrake-pa21"></a>To get
-                            information about the different file system types available,
-                            please read the <acronym class="acronym">ext2FS</acronym> chapter from the
-                            <em class="citetitle">Reference Manual</em>.
+                     <p><a name="diskdrake-pa1"></a>If you wish to use encryption on
+                        any of your partitions you must ensure that you have a separate /boot
+                        partition. The encryption option for the /boot partition must NOT be set, 
+                            otherwise your system will be unbootable.
                      </p>
-                         
+                       
                   </td>
                </tr>
             </table>
          </div>
          
-             
-         <p><a name="BId-drakxid-partition_with_diskdrake-pa22"></a>If you
-               are installing on a PPC machine, you will want to create a small
-               HFS <span class="quote">&#8220;<span class="quote">bootstrap</span>&#8221;</span> partition of at least 1<acronym class="acronym">MB</acronym> which
-               will be used by the <span class="application">yaboot</span>
-               bootloader. If you opt to make the partition a bit larger, say
-               50<acronym class="acronym">MB</acronym>, you may find it a useful place to store a spare kernel
-               and ramdisk images for emergency boot situations.
+           
+         <p><a name="diskdrake-pa2"></a><span class="emphasis"><em>ADD SOME
+                    TEXT</em></span>.
          </p>
          
            
+         <p><a name="diskdrake-pa3"></a><span class="emphasis"><em>ADD SOME
+                    TEXT</em></span>.
+         </p>
+         
       </div>
    </body>
 </html>
diff --git a/doPartitionDisks.html b/doPartitionDisks.html
index fc95ea7..c3fadd5 100644
--- a/doPartitionDisks.html
+++ b/doPartitionDisks.html
@@ -2,188 +2,45 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Partitioning your Disk</title>
+      <title>Partitioning</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="setupSCSI.html" title="Disk Detection and Configuration">
-      <link rel="next" href="resizeFATChoose.html" title="Choose FAT Partition to Be Resized"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="selectKeyboard.html" title="Keyboard">
+      <link rel="next" href="resizeFATChoose.html" title="Choose Windows&reg; partition to resize"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Partitioning your Disk">
+      <div lang="" class="section" title="Partitioning">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-doPartitionDisks"></a>Partitioning your Disk
+                  <h2 class="title"><a name="doPartitionDisks"></a>Partitioning
                   </h2>
                </div>
             </div>
          </div>
-           
-         
-           
          
-           
          
+            
          
-         
-           
-         <p><a name="BId-drakxid-doPartitionDisks-pa1"></a>You now
-               need to decide where you want to install <span class="application">Mageia</span> on your
-            hard drive. If your hard drive is empty or if an existing operating
-            system is using all the available space you will have to
-            re-partition the drive. Basically, partitioning a hard drive means
-               to logically divide it in order to create the space required for
-               your new <span class="application">Mageia</span> system.
+          
+         <p><a name="doPartitionDisks-pa1"></a>In this screen you can see the content of your hard disk(s) and see the solutions the DrakX partitioning wizard found for
+            where to install <span class="application">Mageia</span>.
          </p>
-         
            
-         <p><a name="BId-drakxid-doPartitionDisks-pa2"></a><a class="indexterm" name="BIdNEW-drakxid-doPartitionDisks-it3"></a>Because the process of partitioning a hard drive is
-                usually irreversible and can lead to data loss, partitioning can
-                be intimidating and stressful for the inexperienced
-                user. Fortunately, <span class="application">DrakX</span> includes a wizard which simplifies
-                this process. Before continuing with this step, read through the
-                rest of this section and, above all, take your time.
-         </p>
-         
            
-         <p><a name="BId-drakxid-doPartitionDisks-pa3"></a>Depending on the
-              configuration of your hard drive, several options are available:
+         <p><a name="doPartitionDisks-pa2"></a><span class="emphasis"><em>ADD SOME TEXT</em></span>.
          </p>
-         
            
            
+         <p><a name="doPartitionDisks-pa3"></a><span class="emphasis"><em>ADD SOME TEXT</em></span>.
+         </p>
            
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa4"></a><span class="guibutton">Use free
-                              space</span>. This option will perform an automatic partitioning of
-                           your blank drive(s). If you use this option there will be no further
-                           prompts.
-                  </p>
-                      
-               </li>
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa5"></a><a class="indexterm" name="BId-drakxid-doPartitionDisks-it1"></a><span class="guibutton">Use existing
-                        	partitions</span>. The wizard has detected one or more
-                     	existing <span class="application">Linux</span> partitions on your hard drive. If you
-                     	want to use them, choose this option. You will then be asked
-                     	to choose the mount points associated with each of the
-                     	partitions. The legacy mount points are selected by default,
-                     	and for the most part it's a good idea to keep them. You will
-                     	also be asked to choose the partitions to be formatted or
-                     	preserved.
-                  </p>
-                      
-               </li>
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa6"></a><span class="guibutton">Use the free space on the Windows
-                              partition</span>. If <span class="application">Windows<sup>&reg;</sup></span> is installed on your hard
-                           drive, you might have to create free space for <span class="application">GNU/Linux</span>. To do
-                           so, you can delete your <span class="application">Windows<sup>&reg;</sup></span> partition and data (see the
-                           <span class="quote">&#8220;<span class="quote">Erase entire disk</span>&#8221;</span> solution below) or resize your
-                           <acronym class="acronym">FAT</acronym> or <acronym class="acronym">NTFS</acronym>
-                           partition. Resizing can be performed without the loss of any
-                           data, <span class="emphasis"><em>provided you've previously defragmented the
-                                 <span class="application">Windows<sup>&reg;</sup></span> partition. Backing up your data is strongly
-                                 recommended</em></span>. Using this option is recommended if you
-                           want to use both <span class="application">Mageia</span> and <span class="application">Windows<sup>&reg;</sup></span> on the same
-                           computer in a <span class="emphasis"><em>dual boot</em></span> configuration.
-                  </p>
-                  
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa7"></a>Before
-                           choosing this option, please understand that after this
-                           procedure, the size of your <span class="application">Windows<sup>&reg;</sup></span> partition will be
-                           smaller than when you started, which means you will have less
-                           free space to store your data or to install new software.
-                  </p>
-                      
-               </li>
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa8"></a><span class="guibutton">Erase entire disk</span>. If you
-                           want to delete all data and all partitions present on your hard
-                           drive and replace them with <span class="application">Mageia</span>, choose this
-                           option. Be warned that you won't be able to undo this operation
-                           after you confirm.
-                  </p>
-                  
-                        
-                  <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="./warning.png"></td>
-                           <th align="left">Warning</th>
-                        </tr>
-                        <tr>
-                           <td align="left" valign="top">
-                                      
-                              <p><a name="BId-drakxid-doPartitionDisks-pa9"></a>If you choose this option,
-                                         <span class="emphasis"><em>all</em></span> data on your disk will be deleted.
-                              </p>
-                                    
-                           </td>
-                        </tr>
-                     </table>
-                  </div>
-                      
-               </li>
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa10"></a><span class="guibutton">Remove Windows(TM)</span>. This
-                           option appears when the hard drive is entirely taken by
-                           <span class="application">Windows<sup>&reg;</sup></span>. Choosing this option will simply erase everything
-                           on the drive, partitioning everything from scratch.
-                  </p>
-                  
-                        
-                  <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="warning.png"></td>
-                           <th align="left">Warning</th>
-                        </tr>
-                        <tr>
-                           <td align="left" valign="top">
-                                      
-                              <p><a name="BId-drakxid-doPartitionDisks-pa11"></a>If you choose this
-                                         option, <span class="emphasis"><em>all</em></span> data on your disk will be
-                                         lost.
-                              </p>
-                                    
-                           </td>
-                        </tr>
-                     </table>
-                  </div>
-                      
-               </li>
-               <li class="listitem">
-                        
-                  <p><a name="BId-drakxid-doPartitionDisks-pa12"></a><a class="indexterm" name="BId-drakxid-doPartitionDisks-it2"></a><span class="guibutton">Custom disk
-                               partitioning</span>. Choose this option if you want to
-                            manually partition your hard drive. Be careful: it is a
-                            powerful but dangerous choice and you can very easily lose all
-                            your data. That's why this option is only recommended if you
-                            have performed custom disk partitioning before, and have enough
-                            <span class="application">GNU/Linux</span> experience to know what you are doing. For more instructions on how to use the
-                            <span class="application">DiskDrake</span> utility, refer to <span><a name="BIdNEW-drakxid-doPartitionDisks-ph3"></a>the <em class="citetitle"><a name="BId-drakxid-doPartitionDisks-ct1"></a>Managing Your Partitions</em>
-                               section in the <em class="citetitle">Starter Guide</em></span><span><a name="BIdNEW-drakxid-doPartitionDisks-ph4"></a>the
-                               <em class="citetitle"><a name="BId-drakxid-doPartitionDisks-ct2"></a>Managing Your Partitions</em>
-                               section in the <em class="citetitle">Starter Guide</em></span>.
-                  </p>
-                      
-               </li>
-            </ul>
-         </div>
          
+           
       </div>
    </body>
 </html>
diff --git a/exitInstall.html b/exitInstall.html
index 0104abe..27a00a0 100644
--- a/exitInstall.html
+++ b/exitInstall.html
@@ -2,151 +2,41 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>It's Done!</title>
+      <title>Congratulations</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="installUpdates.html" title="Installing Updates from the Internet">
-      <link rel="next" href="uninstall-linux.html" title="How to Uninstall Linux"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="installUpdates.html" title="Updates"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="It's Done!">
+      <div lang="" class="section" title="Congratulations">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-exitInstall"></a>It's Done!
+                  <h2 class="title"><a name="exitInstall"></a>Congratulations
                   </h2>
                </div>
             </div>
          </div>
-           
          
-           
-           
          
           
-         <p><a name="BId-drakxid-exitInstall-pa1"></a><a class="indexterm" name="BId-drakxid-exitInstall-it1"></a>There you are. The
-            installation is now complete and your <span class="application">GNU/Linux</span> system is ready to
-               be used. Just click on <span class="guibutton">Reboot</span> to restart the
-               system. Don't forget to remove the installation media (<acronym class="acronym">CD-ROM</acronym> or
-               floppy). The first thing you should see after your computer has
-               finished doing its hardware tests is the bootloader menu, which
-               allows you to choose between the <acronym class="acronym">OS</acronym>es your
-               system can boot.
+         <p><a name="exitInstall-pa1"></a>You have now finished installing and configuring <span class="application">Mageia</span> and it's now safe to reboot your computer 
+         </p>
+           
+           
+         <p><a name="exitInstall-pa2"></a><span class="emphasis"><em>ADD SOME TEXT</em></span>.
+         </p>
+           
+           
+         <p><a name="exitInstall-pa3"></a><span class="emphasis"><em>ADD SOME TEXT</em></span>. 
          </p>
            
-          
-         <div class="section" title="Advanced Options">
-            <div class="titlepage">
-               <div>
-                  <div>
-                     <h3 class="title"><a name="d5e948"></a>Advanced Options
-                     </h3>
-                  </div>
-               </div>
-            </div>
-              
-            
-              
-            <p><a name="BId-drakxid-exitInstall-pa2"></a>The
-                  <span class="guibutton">Advanced</span> button shows more buttons
-                  to:
-            </p>
-                
-              
-            <div class="orderedlist">
-               <ol class="orderedlist" type="1">
-                  <li class="listitem">
-                         
-                     <p><a name="BId-drakxid-exitInstall-pa3"></a><a class="indexterm" name="BId-drakxid-exitInstall-it2"></a><span class="guibutton">Generate auto-install floppy</span>:
-                              enables you to create an installation floppy disk which will
-                              automatically perform a whole installation, similar to the one
-                              just finished, without the help of an operator.
-                     </p>
-                     
-                         
-                     <p><a name="BId-drakxid-exitInstall-pa4"></a>Note that two different
-                             options are available after clicking on that button:
-                     </p>
-                     
-                         
-                     <div class="itemizedlist">
-                        <ul class="itemizedlist">
-                           <li class="listitem">
-                                    
-                              <p><a name="BId-drakxid-exitInstall-pa5"></a><a class="indexterm" name="BId-drakxid-exitInstall-it3"></a><span class="guibutton">Replay</span>. This is a partially
-                                 	automated installation. The partitioning step is the only
-                                 	interactive procedure.
-                              </p>
-                                   
-                           </li>
-                           <li class="listitem">
-                                    
-                              <p><a name="BId-drakxid-exitInstall-pa6"></a><a class="indexterm" name="BId-drakxid-exitInstall-it4"></a><span class="guibutton">Automated</span>. Fully automated
-                                 	installation: <span class="emphasis"><em>the hard disk is completely rewritten,
-                                       	all data is lost</em></span>.
-                              </p>
-                                   
-                           </li>
-                        </ul>
-                     </div>
-                     
-                     
-                     
-                         
-                     <p><a name="BIdNEW-drakxid-exitInstall-pa9"></a>This feature is very
-                             handy when installing on a number of similar machines. See the
-                             <a class="ulink" href="http://www.mandrakelinux.com/drakx/auto_inst.html" target="_top">Auto
-                                install</a> section on our web site for more
-                             information.
-                     </p>
-                        
-                  </li>
-                  <li class="listitem">
-                         
-                     
-                         
-                     <p><a name="BId-drakxid-exitInstall-pa7"></a><a class="indexterm" name="BId-drakxid-exitInstall-it5"></a><span class="guibutton">Save package
-                                 selection</span><sup>[<a name="d5e984" href="#ftn.d5e984" class="footnote">1</a>]</sup>: saves
-                              a list of the packages selected in this installation. The
-                              following screen shows you the possible media to use to save the
-                              package list onto: you might need to fill some parameters when
-                              you click on the <span class="guilabel">Next</span> button.
-                     </p>
-                     
-                         
-                     
-                         
-                     <p><a name="BIdNEW-drakxid-exitInstall-pa10"></a>To use this selection
-                             of packages with another installation, perform the installation
-                             as usual up to the point of the package selection, and choose to
-                             select individual packages, without worrying about the current
-                             package selection. Use the floppy icon and select the
-                             <span class="guilabel">Load</span> option. Then choose the medium which
-                             contains the package list. Finally click
-                             <span class="guibutton">OK</span>: the list of packages you loaded will
-                             be selected and be installed.
-                     </p>
-                        
-                  </li>
-               </ol>
-            </div>
-             
-         </div>
          
-         <div class="footnotes"><br><hr width="100" align="left">
-            <div class="footnote">
-               <p><sup>[<a name="ftn.d5e984" href="#d5e984" class="para">1</a>] </sup>If you chose to
-                        save on a floppy, you will need a <acronym class="acronym">FAT</acronym>-formatted floppy. To
-                        create one under <span class="application">GNU/Linux</span>, type <span class="command"><strong>mformat a:</strong></span>
-                        or, as root, <span class="command"><strong>fdformat /dev/fd0</strong></span> followed by
-                        <span class="command"><strong>mkfs.vfat /dev/fd0</strong></span>.
-               </p>
-            </div>
-         </div>
+           
       </div>
    </body>
 </html>
diff --git a/formatPartitions.html b/formatPartitions.html
index 31b981f..6de360b 100644
--- a/formatPartitions.html
+++ b/formatPartitions.html
@@ -2,22 +2,22 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choose Partitions to Be Formatted</title>
+      <title>Formatting</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="ask_mntpoint_s.html" title="Choosing Mount Points">
-      <link rel="next" href="partition_with_diskdrake.html" title="Format Disks with DiskDrake"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="ask_mntpoint_s.html" title="Choose the mount points">
+      <link rel="next" href="diskdrake.html" title="Custom disk partitioning with DiskDrake"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choose Partitions to Be Formatted">
+      <div lang="" class="section" title="Formatting">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-formatPartitions"></a>Choose Partitions to Be Formatted
+                  <h2 class="title"><a name="formatPartitions"></a>Formatting
                   </h2>
                </div>
             </div>
@@ -25,71 +25,38 @@
          
          
            
-         
-          
-         <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
-            <table border="0" summary="Note">
+         <p><a name="formatPartitions-pa1"></a>Here you can choose which partition(s) you wish to format. Any data on partitions not marked for formatting will be saved.
+         </p>
+           
+           
+         <p><a name="formatPartitions-pa2"></a>Usually at least the partitions DrakX selected, need to be formatted
+         </p>
+           
+           
+         <p><a name="formatPartitions-pa3"></a>Click on <span class="guibutton">Advanced</span> to choose partitions you want to check for so called <span class="emphasis"><em>bad blocks</em></span></p>
+           
+           
+         <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="[Note]" src="./note.png"></td>
-                  <th align="left">Note</th>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="./tip.png"></td>
+                  <th align="left">Tip</th>
                </tr>
                <tr>
                   <td align="left" valign="top">
-                       
-                     <p><a name="BIdNEW-drakxid-formatPartitions-pa8"></a>This
-                           step is available only if you chose to reuse existing
-                           <span class="application">Linux</span> partitions.
+                     <p><a name="formatPartitions-pa4"></a>If you're not sure you have made the right choice, you can click on <span class="guibutton">Previous</span>, again on <span class="guibutton">Previous</span> and then on <span class="guibutton">Custom</span> to get back to the main screen. In that screen you can choose to view what is in your partitions.
                      </p>
-                       
                   </td>
                </tr>
             </table>
          </div>
-         
-          
            
-          
-         <p><a name="BId-drakxid-formatPartitions-pa2"></a><a class="indexterm" name="BId-drakxid-formatPartitions-it1"></a>If
-               you chose to reuse some legacy <span class="application">GNU/Linux</span> partitions, you may wish
-               to reformat some of them and erase any data they contain. To do so,
-               please select those partitions as well.
-         </p>
-         
            
-         <p><a name="BId-drakxid-formatPartitions-pa3"></a>Please note that it's
-               not necessary to reformat all <a class="indexterm" name="BId-drakxid-formatPartitions-it2"></a>pre-existing partitions. You must reformat the
-               partitions containing the operating system (such as
-               <code class="literal">/</code>, <code class="literal">/usr</code> or
-               <code class="literal">/var</code>) but not the partitions containing data you
-               wish to keep (typically <code class="literal">/home</code>).
-         </p>
-         
-          
-         <p><a name="BId-drakxid-formatPartitions-pa4"></a>Please be
-              careful when selecting partitions. After the formatting is
-              completed, <span class="emphasis"><em>all data on the selected partitions will be
-                    deleted</em></span> and you won't be able to recover it.
+         <p><a name="formatPartitions-pa5"></a>When you are confident about the selection, click on <span class="guibutton">Next</span> to continue.
          </p>
-         
            
-         <p><a name="BId-drakxid-formatPartitions-pa5"></a>Click on
-                <span class="guibutton">Next</span> when you're ready to format the
-                partitions.
-         </p>
          
            
-         <p><a name="BId-drakxid-formatPartitions-pa6"></a>Click on
-                <span class="guibutton">Previous</span> if you want to choose other
-                partitions for your new <span class="application">Mageia</span> operating system
-                installation.
-         </p>
-           
-           
-         <p><a name="BId-drakxid-formatPartitions-pa7"></a>Click on
-                <span class="guibutton">Advanced</span> if you wish to select partitions
-                which will be checked for <a class="indexterm" name="BId-drakxid-formatPartitions-it3"></a>bad blocks on the disk.
-         </p>
-         
       </div>
    </body>
 </html>
diff --git a/index.html b/index.html
index 315af3a..305fe7b 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
       <title>Installation with DrakX</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
-      <link rel="next" href="intro.html" title="The Mageia Installer"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="next" href="installer.html" title="DrakX, the Mageia installer"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
@@ -23,112 +23,114 @@
          </div>
          <div class="toc">
             <dl>
-               <dt><span class="section"><a href="intro.html">The Mageia Installer</a></span></dt>
+               <dt><span class="section"><a href="installer.html">DrakX, the Mageia installer</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="intro.html#d5e29">The Installation Process</a></span></dt>
-                     <dt><span class="section"><a href="intro.html#drakx-options">Installation Options</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#installationSteps">The installation steps</a></span></dt>
+                     <dt><span class="section"><a href="installer.html#installationOptions">Installation options</a></span></dt>
                   </dl>
                </dd>
-               <dt><span class="section"><a href="selectLanguage.html">Choosing your Language</a></span></dt>
-               <dt><span class="section"><a href="acceptLicense.html">License Terms of the
-                          Distribution</a></span></dt>
-               <dt><span class="section"><a href="selectInstallClass.html">Installation Class</a></span></dt>
-               <dt><span class="section"><a href="selectKeyboard.html">Configuring the Keyboard</a></span></dt>
-               <dt><span class="section"><a href="setupSCSI.html">Disk Detection and Configuration</a></span></dt>
-               <dt><span class="section"><a href="doPartitionDisks.html">Partitioning your Disk</a></span></dt>
-               <dt><span class="section"><a href="resizeFATChoose.html">Choose FAT Partition to Be
-                            Resized</a></span></dt>
-               <dt><span class="section"><a href="takeOverHdChoose.html">Choose drive to install Linux on</a></span></dt>
-               <dt><span class="section"><a href="takeOverHdConfirm.html">Confirm data deletion</a></span></dt>
-               <dt><span class="section"><a href="ask_mntpoint_s.html">Choosing Mount Points</a></span></dt>
-               <dt><span class="section"><a href="formatPartitions.html">Choose Partitions to Be Formatted</a></span></dt>
-               <dt><span class="section"><a href="diskdrake.html">Format Disks with DiskDrake</a></span></dt>
-               <dt><span class="section"><a href="choosePackages.html">Choose Packages to Install</a></span></dt>
+               <dt><span class="section"><a href="selectLanguage.html">Please choose a language to use</a></span></dt>
+               <dt><span class="section"><a href="acceptLicense.html">License and Release Notes</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="choosePackages.html#drakxid-choose-graphical-env">Graphical Environment</a></span></dt>
-                     <dt><span class="section"><a href="choosePackages.html#drakxid-choosePackages">Choose Package
-                                 Groups to Install</a></span></dt>
-                     <dt><span class="section"><a href="choosePackages.html#minimal-install">Minimal Installation</a></span></dt>
-                     <dt><span class="section"><a href="choosePackages.html#drakxid-choosePackagesTree">Choosing
-                                 Individual Packages to Install</a></span></dt>
+                     <dt><span class="section"><a href="acceptLicense.html#license">License Agreement</a></span></dt>
+                     <dt><span class="section"><a href="acceptLicense.html#acceptLicense">Release Notes</a></span></dt>
                   </dl>
                </dd>
-               <dt><span class="section"><a href="setRootPassword.html">Root Password</a></span></dt>
-               <dt><span class="section"><a href="addUser.html">Adding a User</a></span></dt>
-               <dt><span class="section"><a href="setupX.html">Configuring X, the Graphical Server</a></span></dt>
-               <dt><span class="section"><a href="setupBootloaderBeginner.html">Installing a Bootloader</a></span></dt>
-               <dt><span class="section"><a href="misc-params.html">Checking Miscellaneous Parameters</a></span></dt>
+               <dt><span class="section"><a href="setupSCSI.html">Setup SCSI</a></span></dt>
+               <dt><span class="section"><a href="selectInstallClass.html">Install or Upgrade</a></span></dt>
+               <dt><span class="section"><a href="selectKeyboard.html">Keyboard</a></span></dt>
+               <dt><span class="section"><a href="doPartitionDisks.html">Partitioning</a></span></dt>
+               <dt><span class="section"><a href="resizeFATChoose.html">Choose <span class="application">Windows<sup>&reg;</sup></span> partition to resize</a></span></dt>
+               <dt><span class="section"><a href="takeOverHdChoose.html">Choose hard disk to erase for <span class="application">Mageia</span></a></span></dt>
+               <dt><span class="section"><a href="takeOverHdConfirm.html">Confirm hard disk to be formatted</a></span></dt>
+               <dt><span class="section"><a href="ask_mntpoint_s.html">Choose the mount points</a></span></dt>
+               <dt><span class="section"><a href="formatPartitions.html">Formatting</a></span></dt>
+               <dt><span class="section"><a href="diskdrake.html">Custom disk partitioning with
+                            DiskDrake</a></span></dt>
+               <dt><span class="section"><a href="choosePackages.html">Choosing packages to be installed</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="misc-params.html#drakxid-summary">Summary</a></span></dt>
-                     <dt><span class="section"><a href="misc-params.html#drakxid-configureTimezoneGMT">Time Zone Options</a></span></dt>
-                     <dt><span class="section"><a href="misc-params.html#drakxid-configureServices">Selecting Available Services
-                                 at Boot Time</a></span></dt>
+                     <dt><span class="section"><a href="choosePackages.html#choose-graphical-env">Desktop Selection</a></span></dt>
+                     <dt><span class="section"><a href="choosePackages.html#choosePackagesGroups">Package Group Selection</a></span></dt>
+                     <dt><span class="section"><a href="choosePackages.html#minimal-install">Minimal Install</a></span></dt>
                   </dl>
                </dd>
-               <dt><span class="section"><a href="installUpdates.html">Installing Updates from the Internet</a></span></dt>
-               <dt><span class="section"><a href="exitInstall.html">It's Done!</a></span></dt>
+               <dt><span class="section"><a href="addUser.html">User and Superuser Management</a></span></dt>
                <dd>
                   <dl>
-                     <dt><span class="section"><a href="exitInstall.html#d5e948">Advanced Options</a></span></dt>
+                     <dt><span class="section"><a href="addUser.html#root-password">Set Administrator (root) Password:</a></span></dt>
+                     <dt><span class="section"><a href="addUser.html#enterUser">Enter a user</a></span></dt>
+                     <dt><span class="section"><a href="addUser.html#addUserAdvanced">Advanced User Management</a></span></dt>
                   </dl>
                </dd>
-               <dt><span class="section"><a href="uninstall-linux.html">How to Uninstall Linux</a></span></dt>
+               <dt><span class="section"><a href="setupX.html">Set up X, graphic card and monitor configuration</a></span></dt>
+               <dt><span class="section"><a href="setupBootloaderBeginner.html">Bootloader main options </a></span></dt>
+               <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous
+                            parameters</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="misc-params.html#misc-params-system">System parameters</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#misc-params-hardware">Hardware parameters</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#misc-params-network">Network and Internet
+                                    parameters</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#drakxid-configureTimezoneGMT">Configure your
+                                    Timezone</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#drakxid-selectCountry">Select your Country /
+                                    Region</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#drakxid-configureServices">Configure your
+                                    Services</a></span></dt>
+                     <dt><span class="section"><a href="misc-params.html#draxid-miscellaneous">drakxid-miscellaneous</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="installUpdates.html">Updates</a></span></dt>
+               <dt><span class="section"><a href="exitInstall.html">Congratulations</a></span></dt>
             </dl>
          </div>
            
-             
-                 
-         
-                 
-         
-                 
-         
-                 
-         
-                
          
-                 
-         
-                 
-         
-                 
-         
-          
+           
          
+           
          
+           
          
+           
          
+           
          
+           
          
+           
          
-             
+           
          
-               
+           
          
            
          
-                 
+           
          
-              
+           
          
-          
+           
          
-            
+           
          
-                 
+           
          
-                 
+           
          
-                 
+           
          
-                 
+           
          
-                 
+           
          
+           
          
+           
          
       </div>
    </body>
diff --git a/installUpdates.html b/installUpdates.html
index 7ade37b..326f305 100644
--- a/installUpdates.html
+++ b/installUpdates.html
@@ -2,55 +2,44 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Installing Updates from the Internet</title>
+      <title>Updates</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="misc-params.html" title="Checking Miscellaneous Parameters">
-      <link rel="next" href="exitInstall.html" title="It's Done!"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="misc-params.html" title="Summary of miscellaneous parameters">
+      <link rel="next" href="exitInstall.html" title="Congratulations"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Installing Updates from the Internet">
+      <div lang="" class="section" title="Updates">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-installUpdates"></a>Installing Updates from the Internet
+                  <h2 class="title"><a name="installUpdates"></a>Updates
                   </h2>
                </div>
             </div>
          </div>
-           
-           
-           
-           
+         
+         
+            
+         
           
-         <p><a name="BId-drakxid-installUpdates-pa1"></a><a class="indexterm" name="BIdNEW-drakxid-installUpdates-it1"></a>
-              <a class="indexterm" name="BIdNEW-drakxid-installUpdates-it2"></a>By
-              the time you install <span class="application">Mageia</span>, it's likely that some packages
-            will have been updated since the initial release. Bugs may have been
-            fixed, security issues resolved, etc. To allow you to benefit from
-              these updates, you're now able to download them from the
-              Internet. Select <span class="guilabel">Yes</span> if you have a working
-              Internet connection and you want to install any updated packages
-              now, or <span class="guilabel">No</span> if you prefer to install updated
-              packages later.
+         <p><a name="installUpdates-pa1"></a>Since this version of <span class="application">Mageia</span> was released, some packages will have been updated or improved.
          </p>
-         
+           
           
-         <p><a name="BId-drakxid-installUpdates-pa2"></a>Choosing
-              <span class="guilabel">Yes</span> will display a list of web locations from
-              which updates can be retrieved. You should choose one near to you. A
-              tree containing package selections will appear: review the
-              selection, and press <span class="guibutton">Install</span> to retrieve and
-              install the selected package(s), or <span class="guibutton">Cancel</span> to
-              abort.
+         <p><a name="installUpdates-pa2"></a>Choose <span class="guilabel">yes</span> if you wish to download and install them, select <span class="guilabel">no</span> if you don't want to do this now, or if you aren't connected to the Internet
          </p>
+           
+           
+         <p><a name="installUpdates-pa3"></a>Then press <span class="guibutton">Next</span> to continue
+         </p>
+           
          
-         
-         
+           
       </div>
    </body>
 </html>
diff --git a/misc-params.html b/misc-params.html
index 0b7cc10..da329b9 100644
--- a/misc-params.html
+++ b/misc-params.html
@@ -2,303 +2,257 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Checking Miscellaneous Parameters</title>
+      <title>Summary of miscellaneous parameters</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="setupBootloaderBeginner.html" title="Installing a Bootloader">
-      <link rel="next" href="installUpdates.html" title="Installing Updates from the Internet"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="setupBootloaderBeginner.html" title="Bootloader main options">
+      <link rel="next" href="installUpdates.html" title="Updates"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Checking Miscellaneous Parameters">
+      <div lang="" class="section" title="Summary of miscellaneous parameters">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakx-misc-params"></a>Checking Miscellaneous Parameters
+                  <h2 class="title"><a name="misc-params"></a>Summary of miscellaneous
+                         parameters
                   </h2>
                </div>
             </div>
          </div>
            
+         
+           
+         <p><a name="misc-params-pa1"></a>DrakX made a smart choice for
+            the configuration of your system, depending on the choices you made before
+            and on the hardware DrakX detected. You can check the settings here and
+              change them if you want.
+         </p>
+         
            
-          
-         <div class="section" title="Summary">
+         <div class="section" title="System parameters">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="drakxid-summary"></a>Summary
+                     <h3 class="title"><a name="misc-params-system"></a>System parameters
                      </h3>
                   </div>
                </div>
             </div>
                 
-                
-                
-                
-              
-            <p><a name="BId-drakx-misc-params-pa1"></a><a class="indexterm" name="BIdNEW-drakx-misc-params-it16"></a>As a review,
-                  <span class="application">DrakX</span> will present a summary of information it has gathered
-               about your system. Depending on the hardware installed on your
-               machine, you may have some or all of the following entries. Each
-               entry is made up of the hardware item to be configured, followed by
-                  a quick summary of the current configuration. Click on the
-                  corresponding <span class="guibutton">Configure</span> button to make any
-                  changes.
-            </p>
             
-               
+                
             <div class="itemizedlist">
                <ul class="itemizedlist">
                   <li class="listitem">
-                         
-                     <p><a name="BId-drakx-misc-params-pa3"></a><span class="guilabel">Timezone</span>: <a class="indexterm" name="BId-drakx-misc-params-it2"></a>by
-                             default, <span class="application">DrakX</span> deduces your time zone based on the country
-                             you have chosen. You can click on the
-                             <span class="guibutton">Configure</span> button here if this is not
-                             correct.
+                             
+                     <p><a name="misc-params-system-pa2"></a><span class="guilabel">Timezone</span>:
                      </p>
-                        
+                           
                   </li>
-                  <li class="listitem">    
-                         
-                     <p><a name="drakxid-selectCountry"></a><a class="indexterm" name="drakx-it54a"></a><span class="guilabel">Country / Region</span>: check the
-                             current country selection. If you're not in the country selected
-                             by <span class="application">DrakX</span>, click on the <span class="guibutton">Configure</span>
-                             button and choose another. If your country isn't in the list
-                             shown, click on the <span class="guibutton">Other Countries</span> button to get a
-                             complete country list.
+                  <li class="listitem">
+                             
+                     <p><a name="misc-params-system-pa3"></a><span class="guilabel">Country /
+                                   Region</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakx-pa152a"></a><span class="guilabel">Bootloader</span>: if you wish to
-                             change your bootloader configuration, click this button. This
-                             should be reserved to advanced users. Refer to the printed
-                             documentation or the in-line help about bootloader configuration
-                             in the <span class="application">Mageia Control Center</span>.
+                             
+                     <p><a name="misc-params-system-pa4"></a><span class="guilabel">Bootloader</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakx-pa155b"></a><a class="indexterm" name="drakx-it57c"></a><span class="guilabel">Services</span>: with this entry
-                              you can fine tune which services will be run on your machine. If
-                              you plan to use this machine as a server it's a good idea to
-                              review this setup.
+                             
+                     <p><a name="misc-params-system-pa5"></a><span class="guilabel">User
+                                   management</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="BId-drakx-misc-params-pa2"></a><a class="indexterm" name="BId-drakx-misc-params-it1"></a><span class="guilabel">Keyboard</span>: check the current
-                             keyboard map configuration and change it if necessary.
+                             
+                     <p><a name="misc-params-system-pa6"></a><span class="guilabel">Services</span>:
                      </p>
-                        
+                           
                   </li>
+               </ul>
+            </div>
+              
+         </div>
+         
+           
+         <div class="section" title="Hardware parameters">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="misc-params-hardware"></a>Hardware parameters
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
                   <li class="listitem">
-                         
-                     <p><a name="BId-drakx-misc-params-pa4"></a><a class="indexterm" name="BId-drakx-misc-params-it3"></a><span class="guilabel">Mouse</span>:
-                              verify the current mouse configuration and click on the button
-                              to change it if necessary.
+                             
+                     <p><a name="misc-params-hardware-pa1"></a><span class="guilabel">Keyboard</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakxid-sound_config"></a><a class="indexterm" name="BId-drakx-misc-params-it5"></a><span class="guilabel">Sound card</span>: if a sound card is
-                               detected on your system, it will be displayed here. If you
-                               notice the sound card isn't the one actually present on your
-                               system, you can click on the button and choose a different
-                               driver.
+                             
+                     <p><a name="misc-params-hardware-pa2"></a><span class="guilabel">Mouse</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakx-pa152b"></a><a class="indexterm" name="drakx-it57b"></a><span class="guilabel">Graphical Interface</span>: by
-                               default, <span class="application">DrakX</span> configures your graphical interface with
-                               a resolution that best matches your video card and monitor
-                               combination. If that doesn't suit you, or <span class="application">DrakX</span> could
-                             not automatically configure it (<span class="guilabel">not
-                                  configured</span> is displayed), click on
-                               <span class="guibutton">Configure</span> to reconfigure your graphical
-                               interface. You can click on <span class="guibutton">Help</span> from
-                               within the configuration wizard to benefit from full in-line
-                               help.
+                             
+                     <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Sound
+                                   card</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakx-pa152c"></a><a class="indexterm" name="drakx-it57d"></a>
-                              <span class="guilabel">Network</span>: if you wish to configure your
-                              Internet or local network access, you can do so from here. Refer to
-                              the printed documentation or use the <span class="application">Mageia Control Center</span> after the
-                              installation has finished to benefit from full in-line
-                              help.
+                             
+                     <p><a name="misc-params-hardware-pa4"></a><span class="guilabel">Graphical
+                                   interface</span>:
                      </p>
-                        
+                           
                   </li>
+               </ul>
+            </div>
+              
+         </div>
+         
+           
+         <div class="section" title="Network and Internet parameters">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="misc-params-network"></a>Network and Internet
+                              parameters
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
                   <li class="listitem">
-                         
-                     <p><a name="BIdNEW-drakx-misc-params-pa62"></a><a class="indexterm" name="BIdNEW-drakx-misc-params-it17"></a><span class="guilabel">Proxies</span>: allows you to configure
-                              <acronym class="acronym">HTTP</acronym> and <acronym class="acronym">FTP</acronym> proxy addresses if the machine you're
-                              installing on is to be located behind a proxy server.
+                             
+                     <p><a name="misc-params-network-pa1"></a><span class="guilabel">First
+                                   entry</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                     <p><a name="drakx-pa155a"></a><a class="indexterm" name="drakx-it58a"></a><span class="guilabel">Security
-                                 Level</span>: this entry allows you to redefine the security
-                              level.
+                             
+                     <p><a name="misc-params-network-pa2"></a><span class="guilabel">2nd
+                                   entry</span>:
                      </p>
-                        
+                           
                   </li>
                   <li class="listitem">
-                         
-                         
-                     <p><a name="draxid-tinyfirewall"></a><a class="indexterm" name="drakx-it59a"></a><span class="guilabel">Firewall</span>: if you plan to connect
-                            your machine to the Internet, it's a good idea to protect yourself
-                            from intrusions by setting up a firewall. Consult <span><a name="BIdNEW-drakx-misc-params-ph5"></a>the
-                               corresponding chapter of the
-                               <em class="citetitle">Starter Guide</em></span> for details
-                            about firewall settings.
+                             
+                     <p><a name="misc-params-network-pa3"></a><span class="guilabel">3rd
+                                   entry</span>:
                      </p>
-                        
+                           
+                  </li>
+                  <li class="listitem">
+                             
+                     <p><a name="misc-params-network-pa4"></a><span class="guilabel">4th
+                                   entry</span>:
+                     </p>
+                           
                   </li>
                </ul>
             </div>
-             
+              
          </div>
          
            
-         <div class="section" title="Time Zone Options">
+         <div class="section" title="Configure your Timezone">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="drakxid-configureTimezoneGMT"></a>Time Zone Options
+                     <h3 class="title"><a name="drakxid-configureTimezoneGMT"></a>Configure your
+                              Timezone
                      </h3>
                   </div>
                </div>
             </div>
                 
+            
                 
-              
-              
-              
-              
-            <p><a name="BId-drakx-misc-params-pa7"></a>This dialog appears after selecting a new time zone in
-                  the time zones list. After you've chosen the location nearest to
-                  your time zone, two more options are shown.
+            <p><a name="drakxid-configureTimezoneGMT-pa2"></a>..............
             </p>
               
-              
-            <p><a name="BId-drakx-misc-params-pa8"></a><span class="application">GNU/Linux</span> manages
-                  time in <acronym class="acronym">GMT</acronym> (Greenwich Mean Time) and translates it to local time
-                  according to the time zone you selected. If the clock on your
-                  motherboard is set to local time, you may deactivate this by
-                  deselecting <span class="guilabel">Hardware clock set to GMT</span>, which
-                  will let <span class="application">GNU/Linux</span> know that the system clock and the hardware
-                  clock are in the same time zone. This is useful when the machine
-                  also hosts another operating system.
-            </p>
+         </div>
+         
+           
+         <div class="section" title="Select your Country / Region">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="drakxid-selectCountry"></a>Select your Country /
+                              Region
+                     </h3>
+                  </div>
+               </div>
+            </div>
                 
-              
-            <p><a name="BId-drakx-misc-params-pa9"></a>The
-                   <span class="guilabel">Automatic time synchronization</span> option will
-                   automatically regulate the system clock by connecting to a remote
-                   time server on the Internet. For this feature to work, you must
-                   have a working Internet connection. We recommend that you choose a
-                   time server located near you or the generic <span class="guilabel">World
-                      Wide</span> entry which will select the best server for
-                   you. This option actually installs a time server which can be used
-                   by other machines on your local network as well.
+            
+                
+            <p><a name="drakxid-selectCountry-pa1"></a>..........e
             </p>
               
          </div>
          
            
-         
-         
-         
-           
-         <div class="section" title="Selecting Available Services at Boot Time">
+         <div class="section" title="Configure your Services">
             <div class="titlepage">
                <div>
                   <div>
-                     <h3 class="title"><a name="drakxid-configureServices"></a>Selecting Available Services
-                           at Boot Time
+                     <h3 class="title"><a name="drakxid-configureServices"></a>Configure your
+                              Services
                      </h3>
                   </div>
                </div>
             </div>
-              
-              
-              
-              
+                
             
-              
-            <p><a name="BId-drakx-misc-params-pa57"></a><a class="indexterm" name="BId-drakx-misc-params-it15"></a><a class="indexterm" name="BIdNEW-drakx-misc-params-it18"></a>This
-                  dialog is used to select which services you wish to start at boot
-                  time.
-            </p>
-              
-              
-            <p><a name="BId-drakx-misc-params-pa58"></a><span class="application">DrakX</span> will
-                  list all services available on the current installation. Review
-                  each of them carefully and uncheck those which aren't needed at
-                  boot time.
+                
+            <p><a name="drakxid-configureServices-pa1"></a>...........
             </p>
-            
               
-            <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="tip.png"></td>
-                     <th align="left">Tip</th>
-                  </tr>
-                  <tr>
-                     <td align="left" valign="top">
-                           
-                        <p><a name="BId-drakx-misc-params-pa59"></a>A short
-                               explanatory text will be displayed about a service when it is
-                               selected. However, if you're not sure whether a service is useful
-                               or not, it is safer to leave the default behavior.
-                        </p>
-                            
-                     </td>
-                  </tr>
-               </table>
+         </div>
+         
+           
+         <div class="section" title="drakxid-miscellaneous">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="draxid-miscellaneous"></a>drakxid-miscellaneous
+                     </h3>
+                  </div>
+               </div>
             </div>
+                
             
+                
+            <p><a name="draxid-miscellaneous-pa1"></a>I don't understand
+                   where this segment (drakxid-miscellaneous) shows up
+            </p>
               
-            <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="warning.png"></td>
-                     <th align="left">Warning</th>
-                  </tr>
-                  <tr>
-                     <td align="left" valign="top">
-                           
-                        <p><a name="BId-drakx-misc-params-pa60"></a>At this stage,
-                               be very careful if you intend to use your machine as a server: you
-                               probably don't want to start any services which you don't
-                               need. Please remember that some services can be dangerous if
-                               they're enabled on a server. In general, select only those
-                               services you <span class="emphasis"><em>really</em></span> need.
-                        </p>
-                          
-                     </td>
-                  </tr>
-               </table>
-            </div>
-             
          </div>
          
       </div>
diff --git a/resizeFATChoose.html b/resizeFATChoose.html
index 1a9b7a9..8e9979f 100644
--- a/resizeFATChoose.html
+++ b/resizeFATChoose.html
@@ -2,94 +2,44 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choose FAT Partition to Be Resized</title>
+      <title>Choose Windows&reg; partition to resize</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="doPartitionDisks.html" title="Partitioning your Disk">
-      <link rel="next" href="takeOverHdChoose.html" title="Choose drive to install Linux on"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="doPartitionDisks.html" title="Partitioning">
+      <link rel="next" href="takeOverHdChoose.html" title="Choose hard disk to erase for Mageia"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choose FAT Partition to Be Resized">
+      <div lang="" class="section" title="Choose Windows&reg; partition to resize">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-resizeFATChoose"></a>Choose FAT Partition to Be
-                         Resized
+                  <h2 class="title"><a name="resizeFATChoose"></a>Choose <span class="application">Windows<sup>&reg;</sup></span> partition to resize
                   </h2>
                </div>
             </div>
          </div>
-           
          
-           
-         <p><a name="BId-drakxid-resizeFATChoose-pa1"></a><a class="indexterm" name="d5e316"></a> More than one <span class="application">Microsoft</span> partition
-            has been detected on your hard drive. Please choose the one which you want
-              to resize in order to install your new <span class="application">Mageia</span>
-              operating system.
-         </p>
          
-           
-         <p><a name="BId-drakxid-resizeFATChoose-pa2"></a>Each partition is listed as
-              follows: "Linux name", "Windows name", "Capacity".
-         </p>
+            
          
-           
-         <p><a name="BId-drakxid-resizeFATChoose-pa3"></a>"Linux name" is structured:
-              "hard drive type", "hard drive number", "partition number" (for example,
-              "sda1").
+          
+         <p><a name="resizeFATChoose-pa1"></a>You have more than one <span class="application">Windows<sup>&reg;</sup></span> partition. Choose which one should be made smaller to make space for installing <span class="application">Mageia</span>.  
          </p>
-         
            
-         <p><a name="BId-drakxid-resizeFATChoose-pa4"></a>"Hard drive type" is "sd"
-              
-         </p>
-         
            
-         <p>This is standard for hard drives now and has nothing to do with SD
-              Memory Cards. Hard drives were previously prefixed "hd" for IDE drives or
-              "sd" for SATA drives but they are all now prefixed with "sd". 
+         <p><a name="resizeFATChoose-pa2"></a>.......
          </p>
-         
            
-         <p><a name="BId-drakxid-resizeFATChoose-pa5"></a>"Hard drive number" is
-              actually a letter and always follows "sd": 
-         </p>
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                          
-                  <p><a name="BId-drakxid-resizeFATChoose-pa6"></a>"a" means "first hard
-                             drive";
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                          
-                  <p><a name="BId-drakxid-resizeFATChoose-pa7"></a>"b" means "second hard
-                             drive";
-                  </p>
-                        
-               </li>
-               <li class="listitem">
-                          
-                  <p><a name="BId-drakxid-resizeFATChoose-pa8"></a>and so on...
-                  </p>
-                        
-               </li>
-            </ul>
-         </div>
-         
            
-         <p><a name="BId-drakxid-resizeFATChoose-pa11"></a>"Windows name" is the letter
-              of your hard drive under
-              <span class="application">Windows<sup>&reg;</sup></span> (the first
-              disk or partition is called "C:").
+         <p><a name="resizeFATChoose-pa3"></a>........
          </p>
+           
          
+           
       </div>
    </body>
 </html>
diff --git a/selectInstallClass.html b/selectInstallClass.html
index 0e7ad9b..0fd842b 100644
--- a/selectInstallClass.html
+++ b/selectInstallClass.html
@@ -2,67 +2,72 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Installation Class</title>
+      <title>Install or Upgrade</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="acceptLicense.html" title="License Terms of the Distribution">
-      <link rel="next" href="selectKeyboard.html" title="Configuring the Keyboard"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="setupSCSI.html" title="Setup SCSI">
+      <link rel="next" href="selectKeyboard.html" title="Keyboard"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Installation Class">
+      <div lang="" class="section" title="Install or Upgrade">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-selectInstallClass"></a>Installation Class
+                  <h2 class="title"><a name="selectInstallClass"></a>Install or Upgrade
                   </h2>
                </div>
             </div>
          </div>
-           
          
-           
-         <p><a name="drakx-pa19a"></a>This step is shown only if an
-                existing <span class="application">GNU/Linux</span> partition is found on your machine.
-         </p>
          
-           
+            
          
-          
-         <p><a name="BId-drakxid-selectInstallClass-pa1"></a><a class="indexterm" name="BId-drakxid-selectInstallClass-it1"></a><span class="application">DrakX</span> now needs to
-               know if you want to install from scratch or upgrade your existing
-               <span class="application">Mageia</span> system:
+           
+         <p><a name="selectInstallClass-pa1"></a>Drakx wants to know whether you want to upgrade your existing Mageia install, or make a fresh install.
          </p>
-         
-         
-         
-         
-          
+           
+           
+           
          <div class="itemizedlist">
             <ul class="itemizedlist">
                <li class="listitem">
-                     
-                  <p><a name="BId-drakxid-selectInstallClass-pa3"></a><span class="guilabel">Upgrade</span>.<a class="indexterm" name="BId-drakxid-selectInstallClass-it2"></a>If you have an older <span class="application">Mageia</span> operating system, this option allows you to upgrade it. Your existing partitioning scheme and user data won't be altered.
-                     Most of the other configuration steps remain available and are similar to a standard installation.
-                  </p>
+                    
+                  <p><a name="selectInstallClass-pa2"></a><span class="guilabel">Upgrade</span>: Upgrading is like an extra good update of all your packages: your documents. pictures and films won't be touched. However,
+                     you'll be given the chance to make some changes to the configuration of your system.
+                  </p> 
                     
                </li>
-               <li class="listitem">
-                     
-                  <p><a name="BId-drakxid-selectInstallClass-pa2"></a><span class="guilabel">Install</span>. Use this option for everything except upgrading an existing Mageia installation.
+               <li class="listitem">  
+                    
+                       
+                  <p><a name="selectInstallClass-pa3"></a><span class="guilabel">Install</span>: Use this option for everything except upgrading an existing <span class="application">Mageia</span> installation.
                   </p>
                     
                </li>
             </ul>
          </div>
-         
-         
-         
-         
-         
+           
+           
+         <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="warning.png"></td>
+                  <th align="left">Warning</th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                     <p><a name="selectInstallClass-pa4"></a>Don't try to upgrade anything but a supported previous version of <span class="application">Mageia</span>.
+                     </p>
+                  </td>
+               </tr>
+            </table>
+         </div>
+           
+             
       </div>
    </body>
 </html>
diff --git a/selectKeyboard.html b/selectKeyboard.html
index ef66032..1565501 100644
--- a/selectKeyboard.html
+++ b/selectKeyboard.html
@@ -2,78 +2,84 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Configuring the Keyboard</title>
+      <title>Keyboard</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="selectInstallClass.html" title="Installation Class">
-      <link rel="next" href="setupSCSI.html" title="Disk Detection and Configuration"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="selectInstallClass.html" title="Install or Upgrade">
+      <link rel="next" href="doPartitionDisks.html" title="Partitioning"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Configuring the Keyboard">
+      <div lang="" class="section" title="Keyboard">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-selectKeyboard"></a>Configuring the Keyboard
+                  <h2 class="title"><a name="selectKeyboard"></a>Keyboard
                   </h2>
                </div>
             </div>
          </div>
-           
          
-          
-         <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
-            <table border="0" summary="Note">
+         
+            
+         
+           
+         <p><a name="selectKeyboard-pa1"></a>DrakX selects an appropriate keyboard for your language. If no suitable keyboard is found it will default to a US keyboard
+            layout.
+         </p>
+           
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                    
+                  <p><a name="selectKeyboard-pa2"></a>Make sure that the selection is correct or choose another keyboard layout. If you don't know which layout your keyboard has,
+                     look in the specifications that came with your system, or ask the computer vendor. There may even be a label on the keyboard
+                     that identifies the layout.  You can also look here: <a class="ulink" href="http://en.wikipedia.org/wiki/Keyboard_layout" target="_top">en.wikipedia.org/wiki/Keyboard_layout</a></p>
+                    
+               </li>
+               <li class="listitem">  
+                    
+                    
+                  <p><a name="selectKeyboard-pa3"></a>If your keyboard isn't in the list shown, click on <span class="guibutton">More</span> to get a full list, and select your keyboard there. Note that after having chosen your keyboard, you will return to the first
+                     screen and it will appear that a keyboard from this first screen was chosen. You can safely ignore this abberation and continue
+                     the installation: Your keyboard is the one you chose from the full list.
+                  </p>
+                    
+               </li>
+               <li class="listitem">  
+                    
+                     
+                  <p><a name="selectKeyboard-pa4"></a>If you choose a keyboard based on non-Latin characters, you'll get an extra dialog screen asking how you would prefer to switch
+                     between the Latin and non-Latin keyboard layouts
+                  </p>
+                    
+               </li>
+            </ul>
+         </div>
+           
+           
+         <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="[Note]" src="note.png"></td>
-                  <th align="left">Note</th>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
+                  <th align="left">Warning</th>
                </tr>
                <tr>
                   <td align="left" valign="top">
-                       
-                     <p><a name="BIdNEW-drakxid-selectKeyboard-pa5"></a>DrakX shows one or more keyboards, depending on which language(s) you have chosen
+                     <p><a name="selectKeyboard-pa5"></a>After choosing a keyboard from the <span class="guibutton">More</span> dialog, you'll return to the first keyboard choice dialog and it'll seem a keyboard from that screen was chosen. You can
+                        safely ignore this abberation and continue the installation: Your keyboard is the one you chose from the full list. 
                      </p>
-                       
                   </td>
                </tr>
             </table>
          </div>
            
-          
-         
-          
-         <p><a name="BId-drakxid-selectKeyboard-pa1"></a><a class="indexterm" name="BId-drakxid-selectKeyboard-it1"></a><a class="indexterm" name="BIdNEW-drakxid-selectKeyboard-it2"></a>Depending
-              on the language you chose (see <a class="xref" href="selectLanguage.html" title="Choosing your Language">the section called &#8220;Choosing your Language&#8221;</a>), <span class="application">DrakX</span> automatically
-            selects a particular type of keyboard configuration. Verify that the
-              selection suits you or choose another keyboard layout. If you don't know which layout your keyboard has, look in the specifications
-            that came with your system, or ask the computer vendor. You can also look here: <a class="ulink" href="http://en.wikipedia.org/wiki/Keyboard_layout" target="_top">en.wikipedia.org/wiki/Keyboard_layout</a>
-            
-         </p>
-           
-           
-         <p><a name="BId-drakxid-selectKeyboard-pa2"></a>If your keyboard isn't in the list shown, click on <span class="guibutton">More</span> to get a full list, and select your keyboard there. Note that after having chosen your keyboard, you will return to the first
-            screen and it'll seem that a keyboard from this first screen was chosen. You can safely ignore this and go on, the keyboard
-            you chose from the full list will now be configured! 
-         </p>
-           
            
-         <p><a name="BId-drakxid-selectKeyboard-pa3"></a>If you choose a keyboard
-                layout based on a non-Latin alphabet, the next dialog will allow
-                you to choose the key binding which will switch the keyboard
-                between the Latin and non-Latin layouts.
-         </p>
-         
-           
-         <p><a name="BId-drakxid-selectKeyboard-pa4"></a>Additional information: You may have a keyboard which does not correspond exactly to your language: for example, if you are
-            an English-speaking Swiss native, you may have a Swiss keyboard. Or if you speak English and are located in Qu&eacute;bec, you may
-            find yourself in the same situation where your native language and country-set keyboard don't match. In either case, this
-            installation step will allow you to select an appropriate keyboard. 
-         </p>
-         
-         
+             
       </div>
    </body>
 </html>
diff --git a/selectLanguage.html b/selectLanguage.html
index 214f718..e482bbb 100644
--- a/selectLanguage.html
+++ b/selectLanguage.html
@@ -2,146 +2,98 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choosing your Language</title>
+      <title>Please choose a language to use</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="intro.html" title="The Mageia Installer">
-      <link rel="next" href="acceptLicense.html" title="License Terms of the Distribution"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="installer.html" title="DrakX, the Mageia installer">
+      <link rel="next" href="acceptLicense.html" title="License and Release Notes"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choosing your Language">
+      <div lang="" class="section" title="Please choose a language to use">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-selectLanguage"></a>Choosing your Language
+                  <h2 class="title"><a name="selectLanguage"></a>Please choose a language to use
                   </h2>
                </div>
             </div>
-         </div>    
-           
+         </div>
          
-           
-         <p><a name="BId-drakxid-selectLanguage-pa1"></a>The first step is to
-               choose your preferred language.
-         </p>
-           
-              
-           
           
-         <p><a name="BId-drakxid-selectLanguage-pa2"></a><a class="indexterm" name="BId-drakxid-selectLanguage-it1"></a>First open the tree relative to the continent you are located in, and then choose
-              the language you speak. Your language choice will affect the installer, the documentation, and
-                the system in general. 
+         <p><a name="selectLanguage-pa1"></a>Select your preferred language, by first expanding
+                the list for your continent. <span class="application">Mageia</span> will use this selection during
+                the installation and for your installed system.
          </p>
          
-           
-         <p><a name="BId-drakxid-selectLanguage-pa3"></a>Click the <span class="guilabel">Multiple languages</span> button near the botom of the list to go to the screen to select additional languages for your workstation, thereby installing
-            the
-                language-specific files for system documentation and
-                applications. For example, if Spanish friends are to use your
-                machine, select English as the default language in the first screen
-                and <span class="guilabel">Espa&ntilde;ol</span> in the <span class="guilabel">Multiple languages</span> screen.
+          
+         <p><a name="selectLanguage-pa2"></a> If it is likely that you will require several
+                languages installed on your system, for yourself or other users, then you should use the
+                  <span class="guibutton">Multiple languages</span> button to add them now. It will be difficult to add
+                extra language support after installation.
          </p>
+           
          
          
-         <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
-            <table border="0" summary="Note">
+             
+             
+         <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="[Note]" src="note.png"></td>
-                  <th align="left">Note</th>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="warning.png"></td>
+                  <th align="left">Warning</th>
                </tr>
                <tr>
                   <td align="left" valign="top">
-                     
-                     <p><a name="BId-drakxid-selectLanguage-pa4"></a>You are advised to install the language of your keyboard and the language of the country you live in as additional languages
-                        if they are not the same as your preferred language.
+                     <p><a name="selectLanguage-pa3"></a>Even if you choose more than one language, you must
+                              first choose one of them as your preferred language in the first language screen.  It will
+                              also be marked as chosen in the multiple languages screen .
                      </p>
-                      
                   </td>
                </tr>
             </table>
          </div>
-         
-           
-         <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="note.png"></td>
-                  <th align="left">Note</th>
-               </tr>
-               <tr>
-                  <td align="left" valign="top">
-                         
-                     <p><a name="BId-drakxid-selectLanguage-pa5"></a>About
-                              <acronym class="acronym">UTF-8</acronym> (unicode) support: Unicode is a
-                              character encoding intended to cover all existing
-                              languages. <span class="application">Mageia Linux</span> uses <acronym class="acronym">UTF-8</acronym> by default for all languages
-                     </p>
-                     
+             
+             
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                    
+                  <p><a name="selectLanguage-pa4"></a>If your keyboard language is not the same as your preferred language, then it is advisable to install the language of your
+                     keyboard as well.
+                  </p>
+                    
+               </li>
+               <li class="listitem">  
+                    
+                    
+                  <p><a name="selectLanguage-pa5"></a>Mageia uses UTF-8 (Unicode) support by default.
+                             This may be disabled in the "multiple languages" screen if you know that it is inappropriate
+                             for your language. Disabling UTF-8 applies to all installed languages.
+                  </p>
+                    
+               </li>
+               <li class="listitem">  
+                    
                      
-                       
-                     <div class="orderedlist">
-                        <ol class="orderedlist" type="1">
-                           <li class="listitem">
-                                  
-                              <p><a name="BId-drakxid-selectLanguage-pa6"></a>If you know UTF-8 encoding doesn't work well for your language, tick the box <span class="guilabel">Old compatibility (non-UTF) encoding</span> at the top of the <span class="guilabel">Multiple languages</span> screen
-                              </p>
-                                 
-                           </li>
-                           <li class="listitem">
-                                  
-                              <p><a name="BId-drakxid-selectLanguage-pa7"></a>Be aware that this will then apply to all languages on your system
-                              </p>
-                                 
-                           </li>
-                        </ol>
-                     </div>
-                      
-                  </td>
-               </tr>
-            </table>
+                  <p><a name="selectLanguage-pa6"></a>You can change the language of your system after installation in the Mageia Control Center -&gt; System -&gt; Manage localization
+                     for your system.
+                  </p>
+                    
+               </li>
+            </ul>
          </div>
-         
            
-         <p><a name="BId-drakxid-selectLanguage-pa4"></a>Note that
-                you're not limited to choosing a single additional language. You
-                may choose several, or even install them all by selecting the
-                <span class="guilabel">All languages</span> box. Selecting support for a
-                language means translations, fonts, spell checkers, etc. will also
-                be installed for that language. Make sure you select all languages
-                which are likely to be useful on the machine now, it may be difficult
-                to configure support for languages not chosen at
-                install time at a later date.
-         </p>
          
          
+           
+            
          
-          
-         <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="./tip.png"></td>
-                  <th align="left">Tip</th>
-               </tr>
-               <tr>
-                  <td align="left" valign="top">
-                       
-                     <p><a name="drakx-pa18a"></a>To switch between the various
-                           languages installed on your system, you can launch the
-                           <span class="command"><strong>localedrake</strong></span> command as <code class="literal">root</code> to
-                           change the language used by the entire system. Running the command
-                           as a regular user will only change the language settings for that
-                           particular user.
-                     </p>
-                       
-                  </td>
-               </tr>
-            </table>
-         </div>
-         
+           
+             
       </div>
    </body>
 </html>
diff --git a/setupBootloaderBeginner.html b/setupBootloaderBeginner.html
index 153d5a5..7c6e04e 100644
--- a/setupBootloaderBeginner.html
+++ b/setupBootloaderBeginner.html
@@ -2,83 +2,59 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Installing a Bootloader</title>
+      <title>Bootloader main options</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="setupX.html" title="Configuring X, the Graphical Server">
-      <link rel="next" href="misc-params.html" title="Checking Miscellaneous Parameters"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="setupX.html" title="Set up X, graphic card and monitor configuration">
+      <link rel="next" href="misc-params.html" title="Summary of miscellaneous parameters"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Installing a Bootloader">
+      <div lang="" class="section" title="Bootloader main options">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-setupBootloaderBeginner"></a>Installing a Bootloader
+                  <h2 class="title"><a name="setupBootloaderBeginner"></a>Bootloader main options 
                   </h2>
                </div>
             </div>
          </div>
-           
-         
-           
-         
-          
          
-           
          
-           <a class="indexterm" name="BId-drakxid-setupBootloaderBeginner-it1"></a>
-           <a class="indexterm" name="BId-drakxid-setupBootloaderBeginner-it2"></a> 
-           <a class="indexterm" name="BId-drakxid-setupBootloaderBeginner-it3"></a> 
-           <a class="indexterm" name="BId-drakxid-setupBootloaderBeginner-it4"></a>
+            
          
            
-         <p><a name="BId-drakxid-setupBootloaderBeginner-pa1"></a>A
-            bootloader is a small program which is started by the computer
-            at boot time. It's responsible for starting up the whole
-                system. Normally, the bootloader installation is totally
-                automated. <span class="application">DrakX</span> will analyze the disk boot sector and act
-                according to what it finds there:
+         <p><a name="setupBootloaderBeginner-pa1"></a>If you don't like the bootloader settings chosen by DrakX, you can change them here. 
          </p>
-         
-          
-         <div class="itemizedlist">
-            <ul class="itemizedlist">
-               <li class="listitem">
-                     
-                  <p><a name="BId-drakxid-setupBootloaderBeginner-pa2"></a>If
-                         a <span class="application">Windows<sup>&reg;</sup></span> boot sector is found, it will replace it with a
-                         <span class="application">GRUB</span>/<span class="application">LILO</span> boot sector. This way you will be able to
-                         load either <span class="application">GNU/Linux</span> or any other <acronym class="acronym">OS</acronym> installed on your
-                         machine.
-                  </p>
-                    
-               </li>
-               <li class="listitem">
-                     
-                  <p><a name="BId-drakxid-setupBootloaderBeginner-pa3"></a>In
-                         any other case it will ask you where it should place the boot
-                         loader. Generally, the <span class="guilabel">First sector of the drive
-                            (MBR)</span> is the safest place.
-                  </p>
-                    
-               </li>
-            </ul>
-         </div>
-         
-          
-         <p><a name="BId-drakxid-setupBootloaderBeginner-pa4"></a>Choosing <span class="guilabel">Skip</span> won't install a
-              bootloader. Use this option only if you know what you're
-              doing.
+           
+           
+         <p><a name="setupBootloaderBeginner-pa2"></a>For instance if you have several Linux installs on your system and don't want to squeeze all of their bootloaders into the
+            MBR (Master Boot Record), you can choose to put the bootloader at the beginning of your new <code class="literal">/</code> partition and chainload into it from the bootloader of another Linux install 
          </p>
-         
            
-         
            
            
+         <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="warning.png"></td>
+                  <th align="left">Warning</th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                     <p><a name="setupBootloaderBeginner-pa3"></a>WRITE TIP OR WARNING ABOUT CHAINLOADING AND GRUB 2
+                     </p>
+                  </td>
+               </tr>
+            </table>
+         </div>
+           
+           
+         <p><a name="setupBootloaderBeginner-pa4"></a>If you have very limited disk space, it may be helpful if you click on <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp at each boot</span>. This may help you maintain some free space.
+         </p>
            
          
            
diff --git a/setupSCSI.html b/setupSCSI.html
index aa22751..c75e172 100644
--- a/setupSCSI.html
+++ b/setupSCSI.html
@@ -2,63 +2,46 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Disk Detection and Configuration</title>
+      <title>Setup SCSI</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="selectKeyboard.html" title="Configuring the Keyboard">
-      <link rel="next" href="doPartitionDisks.html" title="Partitioning your Disk"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="acceptLicense.html" title="License and Release Notes">
+      <link rel="next" href="selectInstallClass.html" title="Install or Upgrade"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Disk Detection and Configuration">
+      <div lang="" class="section" title="Setup SCSI">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-setupSCSI"></a>Disk Detection and Configuration
+                  <h2 class="title"><a name="setupSCSI"></a>Setup SCSI
                   </h2>
                </div>
             </div>
          </div>
-             
          
-             
          
-             
+            
          
-             
-         <p><a name="BId-drakxid-setupSCSI-pa1"></a><span class="application">DrakX</span> will first
-                  detect any <a class="indexterm" name="BId-drakxid-setupSCSI-it1"></a> <acronym class="acronym">IDE</acronym> devices present in your computer. It will
-                  also scan for one or more <a class="indexterm" name="BId-drakxid-setupSCSI-it2"></a><a class="indexterm" name="BId-drakxid-setupSCSI-it3"></a>
-                  <a class="indexterm" name="BId-drakxid-setupSCSI-it4"></a><acronym class="acronym">PCI</acronym>
-                  <acronym class="acronym">SCSI</acronym> cards on your system. If a <acronym class="acronym">SCSI</acronym> card is found, <span class="application">DrakX</span>
-                  will automatically install the appropriate driver.
-         </p>
-         
-             
-         <p><a name="BId-drakxid-setupSCSI-pa2"></a>Because hardware
-                  detection is not foolproof, <span class="application">DrakX</span> may fail in detecting
-                  your hard drives. If so, you'll have to specify your hardware by
-                  hand.
+           
+         <p><a name="setupSCSI-pa1"></a>DrakX usually detects your hard disks correctly. However
+            it may fail to detect some older SCSI drive controllers and thus fail to install the required
+            drivers and the installation may fail.
          </p>
-         
-             
-         <p><a name="BId-drakxid-setupSCSI-pa3"></a>If you had to manually
-                  specify your <acronym class="acronym">PCI</acronym> <acronym class="acronym">SCSI</acronym> adapter, <span class="application">DrakX</span> will ask if you
-                  want to configure options for it. You should allow <span class="application">DrakX</span>
-                  to probe the hardware for the card-specific options which are
-                  needed to initialize the adapter. Most of the time, <span class="application">DrakX</span>
-                  will get through this step without any issues.
+           
+           
+         <p><a name="setupSCSI-pa2"></a>If this happens, you'll need to manually tell Drakx
+                which SCSI drive(s) you have.
          </p>
-         
-             
-         <p><a name="BId-drakxid-setupSCSI-pa4"></a>If <span class="application">DrakX</span>
-                  is not able to probe for the options to automatically determine
-                  which parameters need to be passed to the hardware, you'll need
-                  to manually configure the driver.
+           
+           
+         <p><a name="setupSCSI-pa3"></a>After that, DrakX should be able to figure out which parameters need to be set for the drive to work. You should only have
+            to set them manually if DrakX doesn't manage to do it.
          </p>
+           
          
            
       </div>
diff --git a/setupX.html b/setupX.html
index f00a5f0..1c9a942 100644
--- a/setupX.html
+++ b/setupX.html
@@ -2,137 +2,83 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Configuring X, the Graphical Server</title>
+      <title>Set up X, graphic card and monitor configuration</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="addUser.html" title="Adding a User">
-      <link rel="next" href="setupBootloaderBeginner.html" title="Installing a Bootloader"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="addUser.html" title="User and Superuser Management">
+      <link rel="next" href="setupBootloaderBeginner.html" title="Bootloader main options"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Configuring X, the Graphical Server">
+      <div lang="" class="section" title="Set up X, graphic card and monitor configuration">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakx-setupX"></a>Configuring X, the Graphical Server
+                  <h2 class="title"><a name="setupX"></a>Set up X, graphic card and monitor configuration
                   </h2>
                </div>
             </div>
          </div>
-             
-             
-           
-             
          
-           
-         <p><a name="BId-drakx-setupX-pa1"></a><a class="indexterm" name="BId-drakx-setupX-it9"></a><span class="application">X</span> (for X Window System) is the heart of the
-                <span class="application">GNU/Linux</span> graphical interface on which all the graphical
-                environments (<span class="application">KDE</span>, <span class="application">GNOME</span>,
-                <span class="application">AfterStep</span>,
-                <span class="application">WindowMaker</span>, etc.) bundled with
-                <span class="application">Mageia</span> rely on.
-         </p>
          
-           
-         <p><a name="BId-drakx-setupX-pa2"></a>You will see a
-               list of different parameters which you can change in order to
-               optimize your graphical display.
-         </p>
+            
          
+          
+         <p><a name="setupX-pa1"></a>No matter which graphical environment (also known as desktop
+                environment) you chose for this install of <span class="application">Mageia</span>, they are all based
+            on a graphical user interface system called X-Windows, or simply X. So in order for KDE, Gnome,
+            LXDE or any other graphical environment to work well, the following X settings need to be
+                correct. Choose the correct settings if you can see that DrakX didn't make a choice, or if you
+                doubt the choice is correct. 
+         </p>
            
-         <div class="variablelist">
-            <dl>
-               <dt><a name="drakxid-configureX_card_list"></a><span class="term"><a name="BId-drakx-setupX-te1"></a>Graphic Card</span></dt>
-               <dd>
-                       
-                  <p><a name="BId-drakx-setupX-pa3"></a>If everything
-                           works fine, the installer should detect and configure the
-                           video card installed on your machine. If the detection or
-                           configuration is incorrect, you can choose the card installed on
-                           your system from a list.
-                  </p>
-                  
-                  
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
                       
-               </dd>
-               <dt><a name="drakxid-configureX_monitor"></a><span class="term"><a name="BId-drakx-setupX-te2"></a>Monitor</span></dt>
-               <dd>
-                       
-                  <p><a name="BId-drakx-setupX-pa4"></a>If the
-                           installer fails to detect or configure your monitor properly, you
-                           can choose from this list the monitor which is connected to your
-                           computer.
+                  <p><a name="setupX-pa2"></a><span class="emphasis"><em><span class="guibutton">Graphic card</span></em></span>: Choose your card from the list if needed.
                   </p>
-                      
-               </dd>
-               <dt><a name="drakxid-configureX_resolution"></a><span class="term"><a name="BId-drakx-setupX-te3"></a>Resolution</span></dt>
-               <dd>
+                    
+               </li>
+               <li class="listitem">  
+                    
                        
-                  <p><a name="BId-drakx-setupX-pa5"></a>Here you can
-                           choose the resolutions and color depths available for your
-                           graphics hardware. Choose the one which best suits your needs
-                           (you will be able to make changes after the installation). A
-                           sample of the chosen configuration will be shown in the monitor
-                           picture.
+                  <p><a name="setupX-pa3"></a><span class="emphasis"><em><span class="guibutton">Monitor</span></em></span>: You can choose <span class="guilabel">Plug'n Play</span> when applicable, or choose your monitor from the <span class="guilabel">Vendor</span> or <span class="guilabel">Generic</span> list. Choose <span class="guilabel">Custom</span> if you prefer to manually set the horizontal and vertical refresh rates of your monitor.
                   </p>
-                      
-               </dd>
-               <dt><span class="term"><a name="BId-drakx-setupX-te4"></a>Test</span></dt>
-               <dd>
-                       
-                       
-                  <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="note.png"></td>
-                           <th align="left">Note</th>
-                        </tr>
-                        <tr>
-                           <td align="left" valign="top">
-                                    
-                              <p><a name="BId-drakx-setupX-pa6"></a>Depending on your
-                                        hardware, this entry might not appear.
-                              </p>
-                                   
-                           </td>
-                        </tr>
-                     </table>
-                  </div>
-                       
-                       
-                       
-                  <p><a name="BId-drakx-setupX-pa7"></a>The system
-                           will try to open a graphical screen at the desired
-                           resolution. If you see the test message during the test and
-                           answer <span class="guimenu">Yes</span>, then <span class="application">DrakX</span> will proceed to
-                           the next step. If you don't see it, it means that some part of
-                           the auto-detected configuration was incorrect and the test will
-                           automatically end after a few seconds and return you to the
-                           menu. Change settings until you get a correct graphical
-                           display.
+                    
+               </li>
+               <li class="listitem">  
+                    
+                     
+                  <p><a name="setupX-pa4"></a><span class="emphasis"><em><span class="guibutton">Resolution</span></em></span>: Set the desired resolution and color depth of your monitor here.
                   </p>
-                      
-               </dd>
-               <dt><a name="drakxid-configureXxdm"></a><span class="term"><a name="BId-drakx-setupX-te5"></a>Options</span></dt>
-               <dd>
-                       
+                    
+               </li>
+               <li class="listitem">  
+                    
                        
-                  <p><a name="BId-drakx-setupX-pa8"></a>This step
-                           allows you to choose whether you want your machine to
-                           automatically switch to a graphical interface at
-                           boot. Obviously, you may want to select the
-                           <span class="guilabel">No</span> option if your machine is to act as a
-                           server, or if you were not successful in getting the display
-                           configured.
+                  <p><a name="setupX-pa5"></a><span class="emphasis"><em><span class="guibutton">Test</span></em></span>: The test button does not always appear during install. If the button is there, you can control your settings by pushing
+                     it. If you see a question asking you whether your settings are correct, you can answer "yes", and the settings will be kept.
+                     If you don't see anything, you'll return to the configuration screen and be able to reconfigure everything until the test
+                     is good. <span class="emphasis"><em>Make sure your settings are on the safe side if the test button isn't available</em></span> 
                   </p>
-                      
-               </dd>
-            </dl>
+                    
+               </li>
+               <li class="listitem">  
+                    
+                     
+                  <p><a name="setupX-pa5"></a><span class="emphasis"><em><span class="guibutton">Options</span></em></span>: Here you can choose to enable or disable some options.  
+                  </p>
+                    
+               </li>
+            </ul>
          </div>
-          
+           
+             
       </div>
    </body>
 </html>
diff --git a/takeOverHdChoose.html b/takeOverHdChoose.html
index 60b4c2f..d9736d6 100644
--- a/takeOverHdChoose.html
+++ b/takeOverHdChoose.html
@@ -2,38 +2,49 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Choose drive to install Linux on</title>
+      <title>Choose hard disk to erase for Mageia</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="resizeFATChoose.html" title="Choose FAT Partition to Be Resized">
-      <link rel="next" href="takeOverHdConfirm.html" title="Confirm data deletion"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="resizeFATChoose.html" title="Choose Windows&reg; partition to resize">
+      <link rel="next" href="takeOverHdConfirm.html" title="Confirm hard disk to be formatted"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Choose drive to install Linux on">
+      <div lang="" class="section" title="Choose hard disk to erase for Mageia">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-takeOverHdChoose"></a>Choose drive to install Linux on
-                  </h2>
+                  <h2 class="title"><a name="takeOverHdChoose"></a>Choose hard disk to erase for <span class="application">Mageia</span></h2>
                </div>
             </div>
          </div>
-             
          
-             
          
-             
+            
          
-           
-         <p><a name="BId-drakxid-takeOverHdChoose-pa1"></a>Choose the
-                hard drive you want to erase in order to install your new
-                <span class="application">Mageia</span> partition. Be careful, all data on this
-                drive will be lost and will not be recoverable!
+          
+         <p><a name="takeOverHdChoose-pa1"></a>Select the hard disk that should be formatted to install <span class="application">Mageia</span>.
          </p>
+           
+          
+         <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="warning.png"></td>
+                  <th align="left">Warning</th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                     <p><a name="takeOverHdChoose-pa2"></a>Make sure you don't select the wrong hard disk. All your data on the selected disk will get lost and this step can't be made
+                        undone
+                     </p>
+                  </td>
+               </tr>
+            </table>
+         </div> 
          
            
       </div>
diff --git a/takeOverHdConfirm.html b/takeOverHdConfirm.html
index ff8a46b..c884f0f 100644
--- a/takeOverHdConfirm.html
+++ b/takeOverHdConfirm.html
@@ -2,48 +2,39 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
-      <title>Confirm data deletion</title>
+      <title>Confirm hard disk to be formatted</title>
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
-      <link rel="prev" href="takeOverHdChoose.html" title="Choose drive to install Linux on">
-      <link rel="next" href="ask_mntpoint_s.html" title="Choosing Mount Points"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+      <link rel="prev" href="takeOverHdChoose.html" title="Choose hard disk to erase for Mageia">
+      <link rel="next" href="ask_mntpoint_s.html" title="Choose the mount points"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-      <div lang="" class="section" title="Confirm data deletion">
+      <div lang="" class="section" title="Confirm hard disk to be formatted">
          <div class="titlepage">
             <div>
                <div>
-                  <h2 class="title"><a name="drakxid-takeOverHdConfirm"></a>Confirm data deletion
+                  <h2 class="title"><a name="takeOverHdConfirm"></a>Confirm hard disk to be formatted
                   </h2>
                </div>
             </div>
          </div>
-             
          
-             
          
-             
+            
          
-           
-         <p><a name="BId-drakxid-takeOverHdConfirm-pa1"></a>Click on
-                <span class="guibutton">Next</span> if you want to delete all data
-             and partitions present on this hard drive. Be careful, after
-                  clicking on <span class="guibutton">Next</span> you will not be
-                able to recover any data and partitions present on this hard
-                drive, including any <span class="application">Windows<sup>&reg;</sup></span> data.
+          
+         <p><a name="takeOverHdConfirm-pa1"></a>Click on <span class="guibutton">Previous</span> if you are not sure you selected the correct hard disk.
          </p>
-         
            
-         <p><a name="BId-drakxid-takeOverHdConfirm-pa2"></a>Click on
-                <span class="guibutton">Previous</span> to quit this operation
-                without losing data and partitions present on this hard
-                drive.
+          
+         <p><a name="takeOverHdConfirm-pa2"></a>Click on <span class="guibutton">Next</span> if you are sure and want to erase every partition, every operating system and all data on that hard disk.
          </p>
-         
+           
+          
            
       </div>
    </body>
author	Anne Nicolas <ennael@mageia.org>	2012-04-05 12:01:37 +0000
committer	Anne Nicolas <ennael@mageia.org>	2012-04-05 12:01:37 +0000
commit	3134e07e03891115644be39cdde82a03761ad934 (patch)
tree	987244fbb58c4a551665bb3d30affa7a4719588b
parent	afa67b4b64d58d5c37fb360deafb13adb258e4ba (diff)
download	drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.gz drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.bz2 drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.tar.xz drakx-installer-help-3134e07e03891115644be39cdde82a03761ad934.zip