updated English files

1 files changed, 221 insertions, 33 deletions

diff --git a/installer.html b/installer.html
index 0d1d604..cbef2a5 100644
--- a/installer.html
+++ b/installer.html
@@ -6,7 +6,7 @@
       <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="index.html" title="Installation with DrakX">
+      <link rel="prev" href="Select-and-use-ISOs.html" title="Select and use ISOs">
       <link rel="next" href="selectLanguage.html" title="Please choose a language to use"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
@@ -22,7 +22,6 @@
                </div>
             </div>
          </div>
-         
            
          
            
@@ -54,11 +53,197 @@
            
          
            
-         <p>If there are problems during install, then it may be necessary to use
-              special installation options, see <a class="xref" href="installer.html#installationOptions" title="Installation options">the section called &#8220;Installation options&#8221;</a>.
+         <p>From this first screen, it is possible to set some personal
+              preferences:
+         </p>
+         
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                        
+                  <p>The language (for the installation only, may be different that the
+                           chosen language for the system) by pressing the key F2
+                  </p>
+                  
+                        
+                  <p></p>
+                  
+                        
+                  
+                        
+                  <p>Use the arrow keys to select the language and press the key
+                           Enter.
+                  </p>
+                  
+                        
+                  <p>Here is for example, the French welcome screen when using a Live
+                           DVD/CD. Note that the Live DVD/CD menu does not propose:
+                           <span class="guilabel">Rescue System</span>, <span class="guilabel">Memory test</span> and
+                           <span class="guilabel">Hardware Detection Tool</span>.
+                  </p>
+                  
+                        
+                  <p></p>
+                  
+                        
+                  
+                        
+                  <p></p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Change the screen resolution by pressing the F3 key.</p>
+                  
+                        
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Add some kernel options by pressing the F6 key.</p>
+                  
+                        
+                  <p>If the installation fails, then it may be necessary to try again
+                           using one of the extra options. The menu called by F6 displays a new
+                           line called <span class="guilabel">Boot options</span> and propose four
+                           entries:
+                  </p>
+                  
+                        
+                  <p>- Default, it doesn't alter anything in the default
+                           options.
+                  </p>
+                  
+                        
+                  <p>- Safe Settings, priority is given to the safer options to the
+                           detriment of performances.
+                  </p>
+                  
+                        
+                  <p>- No ACPI (Advanced Configuration and Power Interface), power
+                           management isn't taken into account.
+                  </p>
+                  
+                        
+                  <p>- No Local APIC (Local Advanced Programmable Interrupt
+                           Controller), it is about CPU interruptions, select this option if you
+                           are asked for.
+                  </p>
+                  
+                        
+                  <p>When you select one of these entries, it modifies the default
+                           options displayed in the <span class="guilabel">Boot Options</span> line.
+                  </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"></th>
+                        </tr>
+                        <tr>
+                           <td align="left" valign="top">
+                                      
+                              <p>In some Mageia releases, it may happen that the entries selected
+                                         with the key F6 does not appear in the <span class="guilabel">Boot
+                                            Options</span> line, however, they are really taken into
+                                         account.
+                              </p>
+                                    
+                           </td>
+                        </tr>
+                     </table>
+                  </div>
+                  
+                        
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Add more kernel options by pressing the key F1</p>
+                  
+                        
+                  <p>Pressing F1 opens a new window with more available options. Select
+                           one with the arrow keys and press Enter to have more details or press
+                           the Esc key to go back to the welcome screen.
+                  </p>
+                  
+                        
+                  <p></p>
+                  
+                        
+                  
+                        
+                  <p></p>
+                  
+                        
+                  <p>The detailed view about the option splash. Press Esc or select
+                           <span class="guilabel">Return to Boot Options</span> to go back to the options
+                           list. These options can by added by hand in the <span class="guilabel">Boot
+                              options</span> line.
+                  </p>
+                  
+                        
+                  
+                        
+                  <p></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"></th>
+                        </tr>
+                        <tr>
+                           <td align="left" valign="top">
+                                      
+                              <p>The help is translated in the chosen language with the F2
+                                         key.
+                              </p>
+                                    
+                           </td>
+                        </tr>
+                     </table>
+                  </div>
+                      
+               </li>
+            </ul>
+         </div>
+         
+           
+         <p>Here is the default welcome screen when using a Wired Network-based
+              Installation CD (Boot.iso or Boot-Nonfree.iso images):
          </p>
          
            
+         <p>It does not allow to change the language, the available options are
+              described in the screen. For more information about using a Wired
+              Network-based Installation CD, see <a class="ulink" href="https://wiki.mageia.org/en/Boot.iso_install" target="_top">the Mageia
+                 Wiki</a></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"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>The keyboard layout is the American one.</p>
+                       
+                  </td>
+               </tr>
+            </table>
+         </div>
+         
+           
+         
+           
          <div class="section" title="The installation steps">
             <div class="titlepage">
                <div>
@@ -115,27 +300,8 @@
          </div>
          
            
-         <div class="section" title="Installation options">
-            <div class="titlepage">
-               <div>
-                  <div>
-                     <h3 class="title"><a name="installationOptions"></a>Installation options
-                     </h3>
-                  </div>
-               </div>
-            </div>
-                
-            
-                
-            <p>If the installation fails then it may be necessary to try again by
-                   using one of the extra options available by hitting the <span class="guibutton">F1
-                      (Help)</span> key see <a class="xref" href="installer.html#dx-welcome" title="Figure&nbsp;1.&nbsp;Installation Welcome Screen">Figure&nbsp;1, &#8220;Installation Welcome Screen&#8221;</a></p>
-            
-                
-            <p>This will open the following text based help.</p>
-            
-                
-            
+         <div class="section">
+            <div class="titlepage"></div>
                 
             <div class="section" title="Installation Problems and Possible Solutions">
                <div class="titlepage">
@@ -175,12 +341,13 @@
                         </li>
                         <li class="listitem">
                                        
-                           <p>If the hardware is very old, a graphical installation may
-                                          not be possible. In this case it is worth trying a text mode
-                                          installation. To use this hit ESC at the first welcome screen and
-                                          confirm with ENTER. You will be presented with a black screen with
-                                          the word "boot:". Type "text" and hit ENTER. Now continue with the
-                                          installation in text mode.<span class="emphasis"><em></em></span></p>
+                           <p>If the hardware is very old, a graphical
+                                          installation may not be possible. In this case it is worth trying
+                                          a text mode installation. To use this hit ESC at the first welcome
+                                          screen and confirm with ENTER. You will be presented with a black
+                                          screen with the word "boot:". Type "text" and hit ENTER. Now
+                                          continue with the installation in text mode.
+                           </p>
                                      
                         </li>
                      </ul>
@@ -211,11 +378,11 @@
                </div>
                
                      
-               <div class="section" title="Kernel Options">
+               <div class="section" title="RAM problem">
                   <div class="titlepage">
                      <div>
                         <div>
-                           <h5 class="title"><a name="kernelOptions"></a>Kernel Options
+                           <h5 class="title"><a name="kernelOptions"></a>RAM problem
                            </h5>
                         </div>
                      </div>
@@ -231,6 +398,27 @@
                   </p>
                         
                </div>
+               
+                     
+               <div class="section" title="Dynamic partitions">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="DynamicPartitions"></a>Dynamic partitions
+                           </h5>
+                        </div>
+                     </div>
+                  </div>
+                          
+                  
+                          
+                  <p>If you converted your hard disk from "basic" format to "dynamic"
+                             format on Microsoft Windows, you must know that it is impossible to
+                             install Mageia on this disc. To go back to a basic disk, see the
+                             Microsoft documentation: <a class="ulink" href="http://msdn.microsoft.com/en-us/library/cc776315.aspx" target="_top">http://msdn.microsoft.com/en-us/library/cc776315.aspx</a>.
+                  </p>
+                        
+               </div>
                    
             </div>