From b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 10 Feb 2017 18:39:25 +0200 Subject: Sync with Calenco --- docs/installer/en/SelectAndUseISOs2.xml | 70 ++---- docs/installer/en/addUser.xml | 44 +--- docs/installer/en/chooseDesktop.xml | 63 +++-- docs/installer/en/choosePackageGroups.xml | 82 +++---- docs/installer/en/diskdrake.xml | 53 ++-- docs/installer/en/doPartitionDisks.xml | 73 ++++-- docs/installer/en/exitInstall.xml | 45 ++-- docs/installer/en/misc-params.xml | 116 ++++----- docs/installer/en/reboot.xml | 35 +-- docs/installer/en/selectCountry.xml | 94 +++----- docs/installer/en/setupBootloader.xml | 334 ++++++++++++++++++-------- docs/installer/en/setupBootloaderAddEntry.xml | 74 +----- docs/installer/en/soundConfig.xml | 60 ++--- docs/installer/en/uninstall-Mageia.xml | 16 +- 14 files changed, 585 insertions(+), 574 deletions(-) (limited to 'docs/installer/en') diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml index 12a8c2e6..dca3b62f 100644 --- a/docs/installer/en/SelectAndUseISOs2.xml +++ b/docs/installer/en/SelectAndUseISOs2.xml @@ -1,5 +1,7 @@ -
- +
+ Select and use ISOs @@ -89,30 +91,6 @@
- -
- DVD dual arch - - - - Both architectures are present on the same medium, the - choice is made automatically according to the detected CPU. - - - - Uses Xfce desktop only. - - - - Not all languages are available. (be, bg, ca, de, en, es, - fr, it, mk, pl, pt, ru, sv, uk) TO BE CHECKED! - - - - It contains non free software. - - -
@@ -128,8 +106,8 @@ - Each ISO contains only one desktop environment (KDE or - GNOME). + Each ISO contains only one desktop environment (KDE, GNOME + or Xfce). @@ -149,49 +127,31 @@
- Live CD KDE + Live DVD Plasma - KDE desktop environment only. + Plasma desktop environment only. - English language only. + All languages are present. - 32 bit only. + Different media for 32 or 64 bit architectures.
- Live CD GNOME + Live DVD GNOME GNOME desktop environment only. - - English language only. - - - - 32 bit only. - - -
- -
- Live DVD KDE - - - - KDE desktop environment only. - - All languages are present. @@ -203,11 +163,11 @@
- Live DVD GNOME + Live DVD Xfce - GNOME desktop environment only. + Xfce desktop environment only. @@ -255,7 +215,7 @@
- boot.iso + netinstall.iso @@ -266,7 +226,7 @@
- boot-nonfree.iso + netinstall-nonfree.iso diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml index 7676bdc2..680847ba 100644 --- a/docs/installer/en/addUser.xml +++ b/docs/installer/en/addUser.xml @@ -1,32 +1,13 @@ -
+
User and Superuser Management - - - - - - - - - - - - - - - + - + @@ -96,20 +77,11 @@ - Any user you add while installing Mageia, will have a world - readable (but write protected) home directory. - - However, while using your new install, any user you add in - MCC - System - Manage users on system will have a - home directory that is both read and write protected. - - If you don't want a world readable home directory for anyone, it - is advised to only add a temporary user now and to add the real one(s) - after reboot. + Any user you add while installing Mageia, will have a both read + and write protected home directory (umask=0027). - If you prefer world readable home directories, you might want to - add all extra needed users in the Configuration - - Summary step during the install. Choose User + You can add all extra needed users in the Configuration + - Summary step during the install. Choose User management. The access permissions can also be changed after the @@ -117,7 +89,7 @@
-
+
Advanced User Management diff --git a/docs/installer/en/chooseDesktop.xml b/docs/installer/en/chooseDesktop.xml index 792a8a92..50edc24d 100644 --- a/docs/installer/en/chooseDesktop.xml +++ b/docs/installer/en/chooseDesktop.xml @@ -1,35 +1,28 @@ -
- - - - Desktop Selection - - - - - - Depending on your selection here, you may be offered further screens to fine tune your choice. - - After the selection step(s), you will see a slide show during package - installation. The slide show can be disabled by pressing the - Details button - - - - - - - - - - Choose whether you prefer to use the KDE - or Gnome desktop environment. Both come with a - full set of useful applications and tools. Tick - Custom if you want to use neither or both, or if you - want something other than the default software choices for these desktop - environments. The LXDE desktop is lighter than - the previous two, sporting less eye candy and fewer packages installed by - default. -
- +
+ + Desktop Selection + + + + + Depending on your selection here, you may be offered further screens + to fine tune your choice. + + After the selection step(s), you will see a slide show during package + installation. The slide show can be disabled by pressing the + Details button + + + + + + + + Choose whether you prefer to use the KDE or + Gnome desktop environment. Both come with a full + set of useful applications and tools. Tick Custom if + you want to use neither or both, or if you want something other than the + default software choices for these desktop environments. The + LXDE desktop is lighter than the previous two, + sporting less eye candy and fewer packages installed by default. +
\ No newline at end of file diff --git a/docs/installer/en/choosePackageGroups.xml b/docs/installer/en/choosePackageGroups.xml index 7e50d6ae..65838436 100644 --- a/docs/installer/en/choosePackageGroups.xml +++ b/docs/installer/en/choosePackageGroups.xml @@ -1,42 +1,40 @@ -
- - - Package Group Selection - - - - - - - - - - - Packages have been sorted into groups, to make choosing what you - need on your system a lot easier. The groups are fairly self explanatory, - however more information about the content of each is available in - tool-tips which become visible as the mouse is hovered over them. - - - - Workstation. - - - - Server. - - - - Graphical Environment. - - - - Individual Package Selection: You can use this option to - manually add or remove packages. - - - Read for instructions on - how to do a minimal install (without or with X & IceWM). -
- +
+ + Package Group Selection + + + + + + + + + + + Packages have been sorted into groups, to make choosing what you need + on your system a lot easier. The groups are fairly self explanatory, however + more information about the content of each is available in tool-tips which + become visible as the mouse is hovered over them. + + + + Workstation. + + + + Server. + + + + Graphical Environment. + + + + Individual Package Selection: You can use this option to manually + add or remove packages. + + + + Read for instructions on how to do a + minimal install (without or with X & IceWM). +
\ No newline at end of file diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml index 0affba06..a4eb1a53 100644 --- a/docs/installer/en/diskdrake.xml +++ b/docs/installer/en/diskdrake.xml @@ -1,20 +1,7 @@
- + - - - - - - - - - - +Lebarhon 20170902 added SC--> Custom disk partitioning with @@ -22,10 +9,11 @@ </info> <mediaobject> - <imageobject condition='classical'> + <imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png" align="center"/> </imageobject> - <imageobject condition='live' > + + <imageobject condition="live"> <imagedata fileref="live-diskdrake.png" align="center"/> </imageobject> </mediaobject> @@ -38,37 +26,56 @@ will be unbootable.</para> </warning> - <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s) + <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s) here. You can remove or create partitions, change the filesystem of a partition or change its size and even view what is in them before you start.</para> - <para revision="1" xml:id="diskdrake-pa4">There is a tab for every detected + <para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected hard disk or other storage device, like an USB key. For example sda, sdb and sdc if there are three of them.</para> - <para revision="1" xml:id="diskdrake-pa5">Push <guibutton>Clear + <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected storage device</para> - <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on + <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it, or choose a filesystem and a mount point, resize it or wipe it.</para> <para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted everything to your wishes.</para> - <para revision="1" xml:id="diskdrake-pa7">Click <guibutton>Done</guibutton> + <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para> <note> <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI System Partition) is present and correctly mounted on /boot/EFI (see - above)</para> + below)</para> <para><mediaobject> <imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject> + </mediaobject><mediaobject> + <imageobject> + <imagedata fileref="live-diskdrake2.png"/> + </imageobject> </mediaobject></para> </note> + + <note> + <para>If you are installing Mageia on a Legacy/GPT system, check that a + BIOS boot partition is present with a correct type</para> + + <mediaobject> + <imageobject> + <imagedata fileref="dx2-doPartitionDisks3.png"/> + </imageobject> + + <imageobject> + <imagedata fileref="live-doPartitionDisks3.png"/> + </imageobject> + </mediaobject> + </note> </section> \ No newline at end of file diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml index e583d579..aead94ea 100644 --- a/docs/installer/en/doPartitionDisks.xml +++ b/docs/installer/en/doPartitionDisks.xml @@ -1,24 +1,32 @@ <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="doPartitionDisks"> <!----> - <!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 --> + <!-- lebarhon 20161216 updated for Mageia 6 + +lebarhon 20170209 added SC--> <info> <title xml:id="doPartitionDisks-ti1">Partitioning - In this screen you can see + In this screen you can see the content of your hard drive(s) and see the solutions the DrakX partitioning wizard found for where to install Mageia. - The options available from + The options available from the list below will vary depending on your particular hard drive(s) layout and content. - + + + + + + + @@ -27,24 +35,24 @@ Use Existing Partitions - If this option is + If this option is available, then existing Linux compatible partitions have been found and may be used for the installation. - Use Free Space + Use Free Space - If you have unused + If you have unused space on your hard drive then this option will use it for your new Mageia installation. - Use Free Space on a + Use Free Space on a Windows Partition - If you have unused + If you have unused space on an existing Windows partition, the installer may offer to use it. @@ -53,7 +61,7 @@ operation so you should make sure you have backed up all important files! - Note that this + Note that this involves shrinking the size of the Windows partition. The partition must be "clean", meaning that Windows must have closed down correctly the last time it was used. It must also have been defragmented, @@ -72,28 +80,34 @@ + + + + + + - Erase and use Entire + Erase and use Entire Disk. - This option will use + This option will use the complete drive for Mageia. - Note! This will + Note! This will erase ALL data on the selected hard drive. Take care! - If you intend to use + If you intend to use part of the disk for something else, or you already have data on the drive that you are not prepared to lose, then do not use this option. - Custom + Custom - This gives you + This gives you complete control over the placing of the installation on your hard drive(s). @@ -143,6 +157,33 @@ check it has been correctly done + + If you are using a Legacy (as known as CSM or BIOS) system with a + GPT disk, you need to create a Bios boot partition if not already + existing. It is an about 1 MiB partition with no mount point. Choose the + "Custom disk partitioning" option to be able to create it with the + Installer like any other partition, just select BIOS boot partition as + filesystem type. + + + + + + + + + + + + + + + + + + + + Some newer drives are now using 4096 byte logical sectors, instead of the previous standard of 512 byte logical sectors. Due to lack of diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml index 229aba28..7cf642d5 100644 --- a/docs/installer/en/exitInstall.xml +++ b/docs/installer/en/exitInstall.xml @@ -1,37 +1,30 @@ -
- +
Congratulations - - - - - - - + + + - - + - You have finished installing - and configuring Mageia and it is now safe to - remove the installation medium and reboot your computer. + You have finished installing and + configuring Mageia and it is now safe to remove + the installation medium and reboot your computer. + + After reboot, in the bootloader + screen, you can choose between the operating systems on your computer (if + you have more than one). + + If you didn't adjust the + settings for the bootloader, your Mageia install will be automatically + selected and started. - After reboot, in the bootloader screen, - you can choose between the operating systems on your computer (if you have more than one). + Enjoy! - If you didn't adjust the settings for - the bootloader, your Mageia install will be automatically selected and started. - - Enjoy! - - Visit www.mageia.org if you have any questions - or want to contribute to Mageia - - + Visit www.mageia.org if you have + any questions or want to contribute to Mageia
\ No newline at end of file diff --git a/docs/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml index b3475c3e..bbc50975 100644 --- a/docs/installer/en/misc-params.xml +++ b/docs/installer/en/misc-params.xml @@ -1,45 +1,39 @@ -
+
Summary of miscellaneous parameters - - - - - - - - - - - - - - - - - - - - - - - + - + - DrakX made smart choices for the + 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 Configure. + + As a general rule, default settings are recommended and you can keep + them with 3 exceptions: + + there are known issues with a default setting + + + + the default setting has already been tried and it fails + + + + something else is said in the detailed sections below + + + +
System parameters @@ -55,38 +49,38 @@ - Country / + Country / Region - If you are not in + If you are not in the selected country, it is very important that you correct the setting. See - Bootloader + Bootloader - DrakX has made + DrakX has made good choices for the bootloader setting. - Do not change - anything, unless you know how to configure Grub and/or Lilo + Do not change + anything, unless you know how to configure Grub2 - For more + For more information, see - User + User management - You can add extra + You can add extra users here. They will each get their own /home directories. - Services: + Services: System services refer to those small programs which run the background (daemons). This @@ -108,45 +102,50 @@ - Keyboard: + Keyboard: This is where you setup or change your keyboard layout which will depend on your location, language or type of keyboard. + + + If you notice a wrong keyboard layout and want to change it, + keep in mind that your passwords are going to change too. + - Mouse: + Mouse: - Here you can add + Here you can add or configure other pointing devices, tablets, trackballs etc. - Sound + Sound card: - 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. + 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. Graphical interface: - This section + This section allows you to configure your graphic card(s) and displays. - For more + For more information, see . - +
@@ -159,7 +158,7 @@ - Network: + Network: You can configure your network here, but for network cards with non-free drivers it is @@ -182,7 +181,7 @@ This section allows you to configure your computer to utilize a proxy service. - You may need to + You may need to consult your systems administrator to get the parameters you need to enter here @@ -196,33 +195,34 @@ - Security + Security Level: - Here you set the + Here you set the Security level for your computer, in most cases the default setting (Standard) is adequate for general use. - Check the option + Check the option which best suits your usage. Firewall: - A firewall is + A firewall is intended to be a barrier between your important data and the rascals out there on the internet who would compromise or steal it. - Select the + Select the services that you wish to have access to your system. Your selections - will depend on what you use your computer for. + will depend on what you use your computer for. For more information, + see . - Bear in mind + Bear in mind that allowing everything (no firewall) may be very risky.
-
+
\ No newline at end of file diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml index 84f9412f..a0241fc5 100644 --- a/docs/installer/en/reboot.xml +++ b/docs/installer/en/reboot.xml @@ -1,24 +1,29 @@ - -
+
Reboot - + + + + Once the bootloader has been installed, you will be prompted to halt + your computer, remove the live CD and restart the computer, click on + Finish and act as + asked in this order! + + - + - Once the bootloader has been installed, you will be prompted to halt - your computer, remove the live CD and restart the computer. When you - restart, you will see a succession of download progress bars. These indicate - that the software media are being downloaded (see Software + When you restart, you will see a succession of download progress bars. + These indicate that the software media are being downloaded (see Software management). -
+ + + + + + +
\ No newline at end of file diff --git a/docs/installer/en/selectCountry.xml b/docs/installer/en/selectCountry.xml index 300188c3..a167abd0 100644 --- a/docs/installer/en/selectCountry.xml +++ b/docs/installer/en/selectCountry.xml @@ -1,68 +1,50 @@ - -
+
+ + Select your Country / Region + + - - - Select your Country / - Region - - - - - - + - + + 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 a Wireless network. - 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 a Wireless network. - - If your country - isn't in the list, click the Other Countries button - and choose your country / region there. - - - If your country is - only in the Other Countries list, after clicking - OK it may seem a country from the first list was - chosen. Please ignore this, DrakX will follow your real choice. - + If your country isn't in the + list, click the Other Countries button and choose your + country / region there. -
+ + If your country is only in + the Other Countries list, after clicking + OK it may seem a country from the first list was + chosen. Please ignore this, DrakX will follow your real choice. + - - Input method - +
+ + Input method + - In the - Other Countries screen you can also select an input - method (at the bottom of the list). Input methods allow users to input - multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method in Mageia DVDs, Africa/India and Asia/no-India - Live-CDs. For Asian and African locales, IBus will be set as default - input method so users should not need to configure it manually. Other - input methods(SCIM, GCIN, HIME, etc) also provide similar functions and - can be installed if you added HTTP/FTP media before package - selection. + In the Other + Countries screen you can also select an input method (at the + bottom of the list). Input methods allow users to input multilingual + characters (Chinese, Japanese, Korean, etc). IBus is the default input + method, so users should not need to configure it manually. Other input + methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be + installed if you added HTTP/FTP media before package selection. - - If you missed - the input method setup during installation, you can access it after - you boot your installed system via "Configure your Computer" -> - "System", or by running localedrake as root. - -
+ + If you missed the input + method setup during installation, you can access it after you boot your + installed system via "Configure your Computer" -> "System", or by + running localedrake as root. +
- +
\ No newline at end of file diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml index 938d2618..90a86690 100644 --- a/docs/installer/en/setupBootloader.xml +++ b/docs/installer/en/setupBootloader.xml @@ -1,137 +1,263 @@
- + Bootloader main options - - - - - - - - -
- With a Bios system + Bootloader interface - If you prefer different - bootloader settings to those chosen automatically by the installer, you - can change them here. + By default, Mageia uses exclusively: - You may already have - another operating system on your machine, in which case you need to decide - whether to add Mageia to your existing bootloader, or allow Mageia to - create a new one. + + + Grub2 (with or without graphical menu) for a Legacy/MBR or + Legacy/GPT system + + + + Grub2-efi for a UEFI system. + + The Mageia graphical menus are nice : -
- - Using a Mageia - bootloader - - - By default, Mageia - writes a new GRUB (legacy) bootloader into the MBR (Master Boot Record) - of your first hard drive. If you already have other operating systems - installed, Mageia attempts to add them to your new Mageia boot - menu. - - Mageia now also offers GRUB2 as an optional - bootloader in addition to GRUB legacy and Lilo. - - - Linux systems which - use the GRUB2 bootloader are not currently supported by GRUB (legacy) - and will not be recognized if the default GRUB bootloader is - used. - - The best solution here is to use the GRUB2 - bootloader which is available at the Summary page during - installation. - -
+
+ Grub2 on Legacy/MBR and Legacy/GPT systems -
- - Using an - existing bootloader - - - If you decide to use an - existing bootloader then you will need to remember to STOP at the - summary page during the installation and click the Bootloader - Configure button, which will allow you to change - the bootloader install location. - - Do not select a device - e.g."sda", or you will overwrite your existing MBR. You must select the - root partition that you chose during the partitioning phase earlier, - e.g. sda7. - - To be clear, sda is a - device, sda7 is a partition on that device. - - - Go to tty2 with - Ctrl+Alt+F2 and type df to check where your - / (root) partition is. Ctrl+Alt+F7 takes you back - to the installer screen. - - - The exact procedure for - adding your Mageia system to an existing bootloader is beyond the scope - of this help, however in most cases it will involve running the relevant - bootloader installation program which should detect and add it - automatically. See the documentation for the operating system in - question. + + + + + + + + + + + + + Don't modify the "Boot Device" unless really knowing what you + do.
-
- - Bootloader - advanced option - - - If you have very - limited disk space for the / partition that contains - /tmp, click on Advanced and - check the box for Clean /tmp at each boot. This - helps to maintain some free space. +
+ Grub2-efi on UEFI systems + + With an UEFI system, the user interface is slightly different as + you cannot choose between with or without graphical menu + + + + + + + + + + + + + + If Mageia is the first system installed on your computer, the + installer created an ESP (EFI System Partition) to receive the + bootloader (Grub2-efi). If there was already UEFI operating systems + previously installed on your computer (Windows 8 for example), the + Mageia installer detected the existing ESP created by Windows and adds + grub2-efi. Although it is possible to have several ESPs, only one is + advised and enough whatever the number of operating systems you + have. + + Don't modify the "Boot Device" unless really knowing what you + do.
- With an UEFI system + Using a Mageia bootloader + + By default, according to your system, Mageia writes a new: - With an UEFI system, the user interface is slightly different as you - cannot choose the boot loader since only Grub2-efi is available. + + + GRUB2 bootloader either into the MBR (Master Boot Record) of + your first hard drive or in the BIOS boot partition. + + + + Grub2-efi bootloader into the ESP + + + + If you already have other operating systems installed, Mageia + attempts to add them to your new Mageia boot menu. If you don't want this + behaviour, click on Next and then uncheck the box + Probe Foreign OS - - + + - - + + + + + +
+ +
+ Using an existing bootloader + + The exact procedure for adding your Mageia system to an existing + bootloader is beyond the scope of this help, however in most cases it will + involve running the relevant bootloader installation program which should + detect and add it automatically. See the documentation for the operating + system in question. +
- If Mageia is the first system installed on your computer, the - installer created an ESP (EFI System Partition) to receive the bootloader - (Grub2-efi). If there was already UEFI operating systems previously - installed on your computer (Windows 8 for example), the Mageia installer - detected the existing ESP created by Windows and added grub2-efi. Although - it is possible to have several ESPs, only one is advised and enough - whatever the number of operating systems you have. +
+ Using the chain loading + + If you don't want a bootable Mageia, but chain load it from another + OS, click on Next, then on + Advanced and Check the box Do not touch + ESP or MBR. - Don't modify the "Boot Device" unless really knowing what you - do. + + + + + + + + + + + + + You will get a warning that the bootloader will lack, ignore it by a + click on OK. + + + + + + +
+ +
+ Options + +
+ First page + + + + Delay before booting the default image: + This text box lets you set a delay in seconds before the default + operating system is started up. + + + + Security: This allows you to set a + password for the bootloader. This means other people can not enter + single user mode or change settings at the boot time. + + + + Password: This text box is where you + actually put the password + + + + Password (again): Retype the password + and Drakx will check that it matches with the one set + above. + + + + Advanced + + + + Enable ACPI: ACPI (Advanced + Configuration and Power Interface) is a standard for the power + management. It can save energy by stopping unused devices, + this was the method used before APM. Uncheck it be useful, for + example, if your computer does not support ACPI or if you + think the ACPI implementation might cause some problems (for + instance random reboots or system lockups). + + + + Enable SMP: This option enables / + disables symmetric multiprocessing for multi core + processors. + + + + Enable APIC: Enabling or disabling + this gives the operating system access to the Advanced + Programmable Interrupt Controller. APIC devices permit more + complex priority models, and Advanced IRQ (Interrupt Request) + management. + + + + Enable Local APIC: Here you can set + local APIC, which manage all external interrupts for some + specific processor in an SMP system. + + + + +
+ +
+ Next page + + + + Default: Operating system started up by + default + + + + Append: This option lets you pass the + kernel information or tell the kernel to give you more information + as it boots. + + + + Probe foreign OS: see above Using a Mageia bootloader + + + + Advanced + + Video mode: This sets the screen + size and colour depth the boot menu will use. If you click the + down triangle you will be offered other size and colour depth + options. + + + + Do not touch ESP or + MBR: see above Using the chain + loading + + + + +
\ No newline at end of file diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml index 0096b862..0af54953 100644 --- a/docs/installer/en/setupBootloaderAddEntry.xml +++ b/docs/installer/en/setupBootloaderAddEntry.xml @@ -1,74 +1,18 @@
- + Add or Modify a Boot Menu Entry - - - - - - - - - -
- With a Bios system - - You can add an entry or modify the one you select first, by pressing - the relevant button in the Bootloader Configuration - screen and editing the screen that pops up on top of it. - - - If you have chosen Grub 2 as your bootloader, you - cannot use this tool to edit entries at this step, press 'Next'. You - need to manually edit /boot/grub2/custom.cfg or use - grub-customizer instead. - - - - - - - - - Some things that can be done without any risk, are changing the - label of an entry and ticking the box to make an entry the default - one. - - You can add the proper version number of an entry, or rename it - completely. - - The default entry is the one the systems boots into if you don't - make a choice while booting up. - - - Editing other things can leave you with an unbootable system. - Please don't just try something without knowing what you are - doing. - -
- -
- With an UEFI system - - In this case you are using Grub2-efi and you cannot use this tool to - edit entries at this step. To do that you need to manually edit - /boot/grub2/custom.cfg or use grub-customizer - instead. All you can do here, is to choose the default entry in the drop - down list. - - After a click on the Next button, another - drop down list allows to choose the video resolution for Grub2 which is a - graphical boot loader. + To do that you need to manually edit /boot/grub2/custom.cfg or use the + software grub-customizer instead (Available in the Mageia + repositories). - - - - - -
+ + For more information, see our wiki: https://wiki.mageia.org/en/Grub2-efi_and_Mageia +
\ No newline at end of file diff --git a/docs/installer/en/soundConfig.xml b/docs/installer/en/soundConfig.xml index 62e92941..a9371cc2 100644 --- a/docs/installer/en/soundConfig.xml +++ b/docs/installer/en/soundConfig.xml @@ -1,54 +1,42 @@ - -
- +
Sound Configuration - + - + - In this screen the name of the driver that the installer chose for your - sound card is given, which will be the default driver if we have a - default one. - - The default driver should work without problems. However, if after - install you do encounter problems, then run draksound - or start this tool via MCC (Mageia Control Center), by choosing the - Hardware tab and clicking on Sound - Configuration at the top right of the screen. - - Then, in the draksound or "Sound Configuration" tool screen, click on - Advanced and then on - Troubleshooting to find very useful advice about how - to solve the problem. - + In this screen the name of the driver that the installer chose for + your sound card is given, which will be the default driver if we have a + default one. + + The default driver should work without problems. However, if after + install you do encounter problems, then run draksound or + start this tool via MCC (Mageia Control Center), by choosing the + Hardware tab and clicking on Sound + Configuration at the top right of the screen. + + Then, in the draksound or "Sound Configuration" tool screen, click on + Advanced and then on + Troubleshooting to find very useful advice about how + to solve the problem.
Advanced - Clicking Advanced in this screen, during - install, is useful if there is no default driver and there are several - drivers available, but you think the installer selected the wrong one. - - - In that case you can select a different driver after clicking on - Let me pick any driver. - + Clicking Advanced in this screen, during + install, is useful if there is no default driver and there are several + drivers available, but you think the installer selected the wrong + one. + In that case you can select a different driver after clicking on + Let me pick any driver.
-
+
\ No newline at end of file diff --git a/docs/installer/en/uninstall-Mageia.xml b/docs/installer/en/uninstall-Mageia.xml index b5be8f5a..e5c9b3b9 100644 --- a/docs/installer/en/uninstall-Mageia.xml +++ b/docs/installer/en/uninstall-Mageia.xml @@ -1,9 +1,10 @@ -
+
Uninstalling Mageia - +
Howto @@ -13,9 +14,10 @@ the possibility to uninstall. This is not true for every operating system. - After your data backup, reboot your installation Mageia DVD and select Rescue - system, then, Restore Windows boot loader. At the next boot, you will only - have Windows with no option to choose your operating system. + After your data backup, reboot your installation Mageia DVD and + select Rescue system, then, Restore Windows boot loader. At the next boot, + you will only have Windows with no option to choose your operating + system. To recover the space used by Mageia partitions on Windows, click on Start -> Control Panel -> Administrative Tools -> Computer @@ -25,8 +27,8 @@ in the disk. Right click on each of these partitions and select Delete. The space will be freed. - If you are using Windows XP, you can create a new partition and format it (FAT32 - or NTFS). It will get a partition letter. + If you are using Windows XP, you can create a new partition and + format it (FAT32 or NTFS). It will get a partition letter. If you have Vista or 7, you have one more possibility, you can extend the existing partition that is at the left of the freed space. -- cgit v1.2.1