diff options
Diffstat (limited to 'hu/misc-params.html')
| -rw-r--r-- | hu/misc-params.html | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/hu/misc-params.html b/hu/misc-params.html index 1aa2164..cba9c59 100644 --- a/hu/misc-params.html +++ b/hu/misc-params.html @@ -29,31 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="misc-params-pa1"></a>DrakX made smart choices for the configuration of your system depending on the choices you made and on the hardware DrakX detected. You can check the settings here and change them if you want after pressing @@ -61,7 +36,6 @@ </p> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -100,8 +74,6 @@ </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="System parameters"> <div class="titlepage"> <div> @@ -143,11 +115,7 @@ </p> -<<<<<<< HEAD <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 -======= - <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub and/or Lilo ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -212,7 +180,6 @@ <p><a name="misc-params-hardware-pa1a"></a>This is where you setup or change your keyboard layout which will depend on your location, language or type of keyboard. </p> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> @@ -232,8 +199,6 @@ </tr> </table> </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -252,11 +217,7 @@ <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Sound card</span>: </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="misc-params-hardware-pa3a"></a>The installer uses the default driver, if there is a default one. The option to select a different driver is only given when there is more than one driver for your card, but none of them is the default one. @@ -395,12 +356,8 @@ <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your -<<<<<<< HEAD selections will depend on what you use your computer for. For more information, see <a class="xref" href="">???</a>. -======= - selections will depend on what you use your computer for. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> |