From a704c1dbdd009b728a267f2f9c98049aed0adecb Mon Sep 17 00:00:00 2001
From: Kamil Rytarowski <kamil@mageia.org>
Date: Mon, 16 Apr 2012 19:37:44 +0000
Subject: - update files (2014-04-16)

---
 misc-params.html | 132 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 112 insertions(+), 20 deletions(-)

(limited to 'misc-params.html')

diff --git a/misc-params.html b/misc-params.html
index f375ca8..de5ff14 100644
--- a/misc-params.html
+++ b/misc-params.html
@@ -23,13 +23,19 @@
                </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.
+              change them if you want after pressing <span class="guibutton">Configure</span>.
          </p>
          
            
@@ -49,27 +55,39 @@
                <ul class="itemizedlist">
                   <li class="listitem">
                              
-                     <p><a name="misc-params-system-pa2"></a><span class="guilabel">Timezone</span>:
-                     </p>
+                     <p><a name="misc-params-system-pa2"></a><span class="guilabel">Timezone</span></p>
+                     	
+                     <p><a name="misc-params-system-pa2a"></a>DrakX selected a time zone for you, depending on your preferred language. You can change it if needed. See also <a class="xref" href="misc-params.html#drakxid-configureTimezoneGMT" title="Configure your Timezone">the section called &#8220;Configure your
+                                 Timezone&#8221;</a></p>
+                     	
                            
                   </li>
                   <li class="listitem">
                              
                      <p><a name="misc-params-system-pa3"></a><span class="guilabel">Country /
-                                   Region</span>:
-                     </p>
+                                   Region</span></p>
+                     	
+                     <p><a name="misc-params-system-pa3a"></a>If you are not in the selected country, it is very important that you correct the setting. See <a class="xref" href="misc-params.html#drakxid-selectCountry" title="Select your Country / Region">the section called &#8220;Select your Country /
+                                 Region&#8221;</a></p>
                            
                   </li>
                   <li class="listitem">
                              
-                     <p><a name="misc-params-system-pa4"></a><span class="guilabel">Bootloader</span>:
+                     <p><a name="misc-params-system-pa4"></a><span class="guilabel">Bootloader</span></p>
+                     	
+                     <p><a name="misc-params-system-pa4a"></a>DrakX made a good choice for the settings of the bootloader. 
+                     </p>
+                     	
+                     <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know a lot about grub and/or lilo 
                      </p>
                            
                   </li>
                   <li class="listitem">
                              
                      <p><a name="misc-params-system-pa5"></a><span class="guilabel">User
-                                   management</span>:
+                                   management</span></p>
+                     	
+                     <p><a name="misc-params-system-pa5a"></a>You can add extra users here. They will get their own <code class="literal">/home</code> directories and will not be able to look in your or each other's documents, mails, pictures and other files.
                      </p>
                            
                   </li>
@@ -148,29 +166,65 @@
                <ul class="itemizedlist">
                   <li class="listitem">
                              
-                     <p><a name="misc-params-network-pa1"></a><span class="guilabel">First
-                                   entry</span>:
+                     <p><a name="misc-params-network-pa1"></a><span class="guilabel">Network</span>:
                      </p>
+                     	
+                     <p><a name="misc-params-network-pa2"></a>You can configure your network here, but for network cards with non-free drivers it is better to do that after reboot, in
+                        the <span class="application">Mageia Control Center</span>, after having enabled the non-free repositories. 
+                     </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="misc-params-network-pa3"></a>When you add a network card, do not forget to set your firewall to watch that interface (too).
+                                 </p>
+                              </td>
+                           </tr>
+                        </table>
+                     </div>
+                     	
                            
                   </li>
                   <li class="listitem">
                              
-                     <p><a name="misc-params-network-pa2"></a><span class="guilabel">2nd
-                                   entry</span>:
+                     <p><a name="misc-params-network-pa4"></a><span class="guilabel">Proxies</span>:
                      </p>
                            
                   </li>
+               </ul>
+            </div>
+              
+         </div>
+           
+           
+         <div class="section" title="Security">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="misc-params-security"></a>Security
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
                   <li class="listitem">
                              
-                     <p><a name="misc-params-network-pa3"></a><span class="guilabel">3rd
-                                   entry</span>:
+                     <p><a name="misc-params-security-pa1"></a><span class="guilabel">Security Level</span>:
                      </p>
                            
                   </li>
                   <li class="listitem">
                              
-                     <p><a name="misc-params-network-pa4"></a><span class="guilabel">4th
-                                   entry</span>:
+                     <p><a name="misc-params-security-pa2"></a><span class="guilabel">Firewall</span>:
                      </p>
                            
                   </li>
@@ -193,8 +247,28 @@
                 
             
                 
-            <p><a name="drakxid-configureTimezoneGMT-pa2"></a>..............
+            <p><a name="drakxid-configureTimezoneGMT-pa1"></a>Choose your time zone 
+                     by choosing your country or a city close to you in the same time zone.
+            </p>
+                  
+            <p><a name="drakxid-configureTimezoneGMT-pa2"></a>In next screen you can choose to set your hardware clock to local time or to GMT, also known as UTC. 
             </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="drakxid-configureTimezoneGMT-pa3"></a>If you have more than one operating system on your computer, make sure they are all set to local time, or all to UTC/GMT.
+                        </p>
+                     </td>
+                  </tr>
+               </table>
+            </div>
+                  
               
          </div>
          
@@ -212,8 +286,27 @@
                 
             
                 
-            <p><a name="drakxid-selectCountry-pa1"></a>..........e
+            <p><a name="drakxid-selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, like the currency and wireless regulatory domain.
+               Setting the wrong country can lead to not being able to use WLAN
+            </p>
+                
+            <p><a name="drakxid-selectCountry-pa2"></a>If your country isn't in the list, click the <span class="guilabel">Other Countries</span> button and choose your country / region there.
             </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="drakxid-selectCountry-pa3"></a>If your country is only in the <span class="guilabel">Other Countries</span> list, after clicking <span class="guibutton">OK</span> it may seem a country from the first list was chosen. Please ignore this, DrakX will follow your real choice.
+                        </p>
+                     </td>
+                  </tr>
+               </table>
+            </div>
               
          </div>
          
@@ -248,9 +341,8 @@
             </div>
                 
             
-                
-            <p><a name="draxid-miscellaneous-pa1"></a>I don't understand
-                   where this segment (drakxid-miscellaneous) shows up
+             
+            <p><a name="draxid-miscellaneous-pa1"></a>This section seems to show up in the <span class="guilabel">Security Level</span> screen in the Summary step of the configuration after installation.
             </p>
               
          </div>
-- 
cgit v1.2.1