From 3c587a150c7a5b6776557f4e9da803138871718c Mon Sep 17 00:00:00 2001 From: Papoteur Date: Tue, 6 Jun 2017 08:11:51 +0200 Subject: Update English files --- Select-and-use-ISOs.html | 262 +++++-------------------- addUser.html | 67 +------ chooseDesktop.html | 42 ++-- choosePackageGroups.html | 48 ++--- diskdrake.html | 48 +++-- doPartitionDisks.html | 92 +++------ exitInstall.html | 34 ++-- index.html | 34 ++-- installer.html | 446 +++++++++++++++++++++++-------------------- misc-params.html | 29 +-- selectCountry.html | 88 ++++----- selectLanguage.html | 19 +- setupBootloader.html | 411 +++++++++++++++++++++++++++------------ setupBootloaderAddEntry.html | 127 ++---------- soundConfig.html | 40 ++-- uninstall-Mageia.html | 15 +- 16 files changed, 794 insertions(+), 1008 deletions(-) diff --git a/Select-and-use-ISOs.html b/Select-and-use-ISOs.html index c2f71d6..f7bd945 100644 --- a/Select-and-use-ISOs.html +++ b/Select-and-use-ISOs.html @@ -23,9 +23,7 @@ - -
@@ -37,15 +35,12 @@
-

Mageia is distributed via ISO images. This page will help you to choose which image match your needs.

-

There is two families of media:

-
-

Details are given in the next sections.

-
@@ -87,7 +80,6 @@
-
@@ -99,19 +91,16 @@
-

Here, a medium (plural: media) is an ISO image file that allows you to install and/or update Mageia and by extension any physical support the ISO file is copied to.

-

You can find them here.

-
@@ -123,7 +112,6 @@
-
@@ -135,7 +123,6 @@
-
-
- - - - -
-
-
-
-
DVD -
-
-
-
- - - -
-
  • -

    Different media for architecture 32 or 64 bits.

    +

    Different media for 32 or 64 bit architectures.

  • @@ -203,77 +170,30 @@
- - -
-
-
-
-
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.

    - -
    • -
-
- -
-
-

Live media +

Live media

-
-
Common features +
Common features
-
    @@ -286,8 +206,8 @@
  • -

    Each ISO contains only one desktop environment (KDE or - GNOME). +

    Each ISO contains only one desktop environment (Plasma, + GNOME or Xfce).

    • @@ -312,54 +232,50 @@
- -
+
-
Live CD KDE +
Live DVD Plasma
-
  • -

    KDE desktop environment only.

    +

    Plasma desktop environment only.

  • -

    English language only.

    +

    All languages are present.

  • -

    32 bit only.

    +

    64 bit architecture only.

- -
+
-
Live CD GNOME +
Live DVD GNOME
-
    @@ -367,41 +283,6 @@

    GNOME desktop environment only.

    - -
  • - -

    English language only.

    - -
    • -
  • - -

    32 bit only.

    - -
    • -
-
- -
- - -
-
-
-
-
Live DVD KDE -
-
-
-
- - - -
-
    -
  • - -

    KDE desktop environment only.

    -
  • @@ -410,32 +291,30 @@
  • -

    Different media for 32 or 64 bit architectures.

    +

    64 bit architecture only

- -
+
-
Live DVD GNOME +
Live DVD Xfce
-
  • -

    GNOME desktop environment only.

    +

    Xfce desktop environment only.

  • @@ -445,7 +324,7 @@
  • -

    Different media for 32 or 64 bit architectures.

    +

    32 or 64 bit architectures.

@@ -454,31 +333,28 @@
-
-

Boot-only CD media +

Boot-only CD media

-
-
Common features +
Common features
-
    @@ -516,46 +392,40 @@
- -
+
-
boot.iso +
netinstall.iso
-
  • -

    Contains only free software, for those people who refuse to - use non-free software. -

    +

    Contains only free software, for those people who prefer not to use non-free software.

- -
+
-
boot-nonfree.iso +
netinstall-nonfree.iso
-
    @@ -574,133 +444,111 @@
-
-

Downloading and Checking Media +

Downloading and Checking Media

-
-

Downloading +

Downloading

- -

Once you have chosen your ISO file, you can download it using - either http or BitTorrent. In both cases, a window gives you some - information, such as the mirror in use and the possibility to change if - the bandwidth is to low. If http is chosen, you may also see something - like +

Once you have chosen your ISO file, you can download it using either http or BitTorrent. In both cases, a window gives you + some information, such as the mirror in use and an opportunity to change if the bandwidth is to low. If http is chosen, you + may also see something like

- -

md5sum and sha1sum are tools to check the ISO integrity. Use only one of them. Keep one of them for further - usage. Then this window appears: + usage. Then a window similar to this one appears:

- -

Check the radio button Save File.

- -
+
-

Checking the downloaded media - integrity +

Checking the integrity of the downloaded media

-

Both checksums are hexadecimal numbers calculated by an algorithm from the file to be downloaded. When you ask these algorithms to recalculate this number from your downloaded file, either you have the same number and your downloaded file is correct, or the number is different and you have a failure. A failure infers that you should retry - the download. + the download or attempt a repair using BitTorrent.

-

Open a console, no need to be root, and:

-

- To use md5sum, type: [sam@localhost]$ md5sum path/to/the/image/file.iso.

-

- To use sha1sum, type: [sam@localhost]$ sha1sum path/to/the/image/file.iso.

-

and compare the obtained number on your computer (you may have to wait for a while) with the number given by Mageia. Example:

- -

-
-

Burn or dump the ISO +

Burn or dump the ISO

-

The checked ISO can now be burned to a CD or DVD or dumped to a USB - stick. These operations are not a simple copy and aim to make a boot-able + stick. These operations are not a simple copy and aim to make a bootable medium.

-
-

Burning the ISO to a CD/DVD +

Burning the ISO to a CD/DVD

-

Use whatever burner you wish but ensure the burning device is set correctly to burn an image, burn data @@ -709,24 +557,21 @@

-
-

Dump the ISO to a USB stick +

Dump the ISO to a USB stick

-

All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick and then use it to boot and install the system.

-
@@ -737,7 +582,7 @@
-

"dumping" an image onto a flash device destroys any previous +

"Dumping" an image onto a flash device destroys any previous file-system on the device; any other data will be lost and the partition capacity will be reduced to the image size.

@@ -746,67 +591,58 @@
-

To recover the original capacity, you must redo partitioning and re-format the USB stick.

-
-
Using a graphical tool within Mageia +
Using a graphical tool within Mageia
-

You can use a graphical tool like IsoDumper

-
-
Using a graphical tool within Windows +
Using a graphical tool within Windows
-

You could try:

-

- Rufus using the "ISO image" option;

-

- Win32 Disk Imager

-
-
Using Command line within a GNU/Linux system +
Using Command line within a GNU/Linux system
-
@@ -825,10 +661,8 @@
-

You can also use the dd tool in a console:

-
    @@ -842,14 +676,13 @@

    Become root with the command su - (don't forget the final '-' )

    -
  1. -

    Plug your USB stick (do not mount it, this also means do not - open any application or file manager that could access or read +

    Plug in your USB stick (do not mount it, this also means do + not open any application or file manager that could access or read it)

    @@ -857,16 +690,13 @@

  2. Enter the command fdisk -l

    - -

    Alternatively, you can get the device name with the command dmesg: at end, you see the device name starting with sd, and sdd in this case:

    - 
    [72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -898,14 +728,10 @@
                                        
                            
    Enter the command: # dd if=path/to/the/ISO/file
                                                 of=/dev/sdX bs=1M
    
-                           
                                        
                            
    Where X=your device name eg: /dev/sdc
    
-                           
                                        
-                           
    Example: # dd
-                                                if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
-                                                bs=1M
    
+                           
    Example: # dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdb bs=1M
  3. diff --git a/addUser.html b/addUser.html index f063b77..077cf0d 100644 --- a/addUser.html +++ b/addUser.html @@ -23,25 +23,8 @@
- - - - - - - - - - - - - - - - -
@@ -54,18 +37,16 @@
-

It is advisable for all Mageia installations to set a superuser or administrator's password, usually called the root password in Linux. As you type a password into the top box the colour of its shield will change from red to - yellow to green depending on the strength of the password. A green shield + 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.

-
@@ -87,7 +68,6 @@ -
@@ -99,34 +79,28 @@
- -

Add a user here. A user has fewer rights than the superuser (root), - but enough to surf the internet, use office applications or play games and - anything else the average user does with his computer +

Add a user here. A user has fewer rights than the superuser (root), but enough to use the internet, office applications or + play games and anything else the average user does with his computer

-
  • -

    Icon: if you click on this button it will - change the users icon. +

    Icon: if you click on this button it will change the user's icon.

  • -

    Real Name: Insert the users real name into - this text box. +

    Real Name: Insert the user's real name into this text box.

  • -

    Login Name: Here you enter the user login - name or let drakx use a version of the users real name. The +

    Login Name: Here you enter the user login name or let drakx use a version of the user's real name. The login name is case sensitive.

    • @@ -148,7 +122,6 @@
-
@@ -159,29 +132,14 @@ @@ -73,12 +79,11 @@ -
+
-

Using a Mageia - bootloader +

Grub2 on Legacy/MBR and Legacy/GPT systems

@@ -86,54 +91,20 @@ -

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. +

Don't modify the "Boot Device" unless you really know what you are + doing.

- - -
-
-

Any user you add while installing Mageia, will have a world - readable (but write protected) home directory. +

Any user you add while installing Mageia, will have a both read + and write protected home directory (umask=0027).

- -

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. -

- - -

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 install. @@ -193,7 +151,6 @@ -

@@ -205,18 +162,15 @@
-

If the advanced button is clicked you are offered a screen that allows you to edit the settings for the user you are adding.

-

Additionally, you can disable or enable a guest account.

-
@@ -236,7 +190,6 @@
-
    diff --git a/chooseDesktop.html b/chooseDesktop.html index dff9fa5..0263673 100644 --- a/chooseDesktop.html +++ b/chooseDesktop.html @@ -22,37 +22,33 @@
+ + - - - - - - -

Depending on your selection here, you may be offered further screens to fine tune your choice.

+ +

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 + 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. -

+

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. +

+ diff --git a/choosePackageGroups.html b/choosePackageGroups.html index b99af15..ebb1135 100644 --- a/choosePackageGroups.html +++ b/choosePackageGroups.html @@ -22,52 +22,52 @@ + - - - - + + - -

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. + +

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.

    +

    Workstation.

    +
  • - -

    Server.

    +

    Server.

    +
  • - -

    Graphical Environment.

    +

    Graphical Environment.

    +
  • - -

    Individual Package Selection: You can use this option to - manually add or remove packages. -

    +

    Individual Package Selection: You can use this option to manually + add or remove packages. +

    +
- -

Read the section called “Minimal Install” for instructions on - how to do a minimal install (without or with X & IceWM). -

+ +

Read the section called “Minimal Install” for instructions on how to do a + minimal install (without or with X & IceWM). +

+ diff --git a/diskdrake.html b/diskdrake.html index ebb4ad1..d83324e 100644 --- a/diskdrake.html +++ b/diskdrake.html @@ -24,23 +24,8 @@ - - - - - - - - - - - - - - -
@@ -62,41 +47,36 @@
-

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.

-

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. + sdc if there are three of them.

-

Push Clear all to wipe all partitions on the selected storage device

-

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. + mount point, resize it or wipe it. Toggle to expert + mode (or Expert mode) gives some more + tools like to add a label or to choose a partition type.

-

Continue until you adjusted everything to your wishes.

-

Click Done when you're ready.

-
@@ -109,9 +89,8 @@

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) + below)

-

@@ -119,6 +98,23 @@
+ +
+ + + + + + + + +
[Note]
+ +

If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot partition is present and of the correct type

+ + +
+
diff --git a/doPartitionDisks.html b/doPartitionDisks.html index a8d9412..cb704f7 100644 --- a/doPartitionDisks.html +++ b/doPartitionDisks.html @@ -23,75 +23,54 @@ - - -

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 list below will vary depending on your particular hard drive(s) layout and content.

- -

  • -

    Use Existing Partitions

    - -

    If this option is available, then existing Linux compatible partitions have been found and may be used for the installation.

    -
  • -

    Use Free Space

    - -

    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 Windows Partition

    - -

    If you have unused space on an existing Windows partition, the installer may offer to use it.

    - -

    This can be a useful way of making room for your new Mageia installation, but is a risky operation so you should make sure you have backed up all important files!

    - -

    Note that this involves shrinking the size of the Windows partition. The partition must be "clean", meaning that Windows must have closed down correctly @@ -100,17 +79,12 @@ been moved out of the area that is about to be used. It is highly recommended to back up your personal files.

    - -

    With this option, the installer displays the remaining Windows partition in light blue and the future Mageia partition in dark blue with their intended sizes just under. You have the possibility to adapt these sizes by clicking and dragging the gap between both partitions. See the screen-shot below.

    - - -
@@ -118,106 +92,78 @@
  • -

    Erase and use Entire Disk.

    - -

    This option will use the complete drive for Mageia.

    - -

    Note! This will erase ALL data on the selected hard drive. Take care!

    - -

    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 disk + partitioning

    - -

    This gives you complete control over the placing of the installation on your hard drive(s).

    -
- -

Partitions sizing:

- +

Partition sizing:

The installer will share the available place out according to the following rules:

-
  • -

    If the total available place is lower than 50 GB, only one partition is created for /, there is no separate partition for /home.

    -
  • -

    If the total available place is over 50 GB, then three partitions are created

    - -
    • -

      6/19 of the total available place is allocated to / with a maximum of 50 GB

      -
    • -

      1/19 is allocated to swap with a maximum of 4 GB

      -
    • -

      the rest (at least 12/19) is allocated to /home

      -
    -
-

That means that from 160 GB and over of available place, the installer will create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.

-
@@ -230,15 +176,38 @@

If you are using an UEFI system, the ESP (EFI System Partition) will be automatically detected, or created if it does not exist yet, and - mounted on /boot/EFI. The "Custom" option is the only one that allows to - check it has been correctly done + mounted on /boot/EFI. The "Custom disk partitioning" option is the only + one that allows to check it has been correctly done

- + +
+ + + + + + + + +
[Note]
+ +

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 section called “Custom disk partitioning with + DiskDrake” to be able to create it with the Installer like any + other partition, just select BIOS boot partition as filesystem + type. +

+ + + +
+
@@ -257,13 +226,10 @@ alternative partitioning tool like gparted, if you own such a device, and to use the following settings:

-

"Align to" "MiB"

-

"Free space preceding (MiB)" "2"

-

Also make sure all partitions are created with an even number of megabytes. diff --git a/exitInstall.html b/exitInstall.html index a124588..d51760a 100644 --- a/exitInstall.html +++ b/exitInstall.html @@ -22,43 +22,31 @@ - - - - - - - - -

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). +

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. +

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

- - diff --git a/index.html b/index.html index 23b5f5a..c816941 100644 --- a/index.html +++ b/index.html @@ -28,16 +28,18 @@
Introduction
Media
-
Downloading and Checking Media
-
Burn or dump the ISO
+
Downloading and Checking Media
+
Burn or dump the ISO
-
DrakX, the Mageia Installer
+
DrakX, the Mageia + Installer
-
The installation steps
-
Installation Problems and - Possible Solutions
+
Installation Welcome Screen
+
The installation steps
+
Installation Problems and Possible Solutions
+
Please choose a language to use
@@ -82,18 +84,15 @@
Bootloader main options
-
With a Bios system
-
With an UEFI system
+
Bootloader interface
+
Using a Mageia bootloader
+
Using an existing bootloader
+
Using chain loading
+
Options
Add or Modify a Boot Menu Entry
-
-
-
With a Bios system
-
With an UEFI system
-
-
Summary of miscellaneous parameters
@@ -106,8 +105,7 @@
Configure your Timezone
-
Select your Country / - Region
+
Select your Country / Region
Input method
@@ -129,7 +127,11 @@
Uninstalling Mageia
+<<<<<<< HEAD +
Howto
+=======
Howto
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
diff --git a/installer.html b/installer.html index 43fd64e..51f5868 100644 --- a/installer.html +++ b/installer.html @@ -17,7 +17,8 @@
-

DrakX, the Mageia Installer +

DrakX, the Mageia + Installer

@@ -25,242 +26,267 @@ - - - - - - - - - - - -

Whether you are new to GNU-Linux or an experienced user, the Mageia Installer is designed to help make your installation or upgrade as easy as possible.

- -

The initial menu screen has various options, however the default one will start the installer, which will normally be all that you will need.

- - - - -

From this first screen, it is possible to set some personal - preferences: -

- - -
-
    -
  • - -

    The language (for the installation only, may be different that the - chosen language for the system) by pressing the key F2 (Legacy mode - only) -

    - - -

    - - - - -

    Use the arrow keys to select the language and press the key - Enter. -

    - - -

    Here is for example, the French welcome screen when using a Live - DVD/CD. Note that the Live DVD/CD menu does not propose: - Rescue System, Memory test and - Hardware Detection Tool. -

    - - -

    - - - - -

    - -
    • -
  • - -

    Change the screen resolution by pressing the F3 key (Legacy mode - only). -

    - +
    +
    +
    +
    +

    Installation Welcome Screen +

    +
    +
    +
    + + + +
    +
    +
    +
    +

    Using a Mageia DVD +

    +
    +
    +
    + + + +

    Here are the default welcome screens when using a Mageia DVD, The + first one with an UEFI system and the second one with a Legacy + system: +

    + + + + +

    From this screen, you can access to options by pressing the "e" + letter to enter the "edit mode". To come back to this screen, press + either the key "esc" to quit without saving or press the key "Ctrl" or + "F10" to quit with saving. +

    + + + + +

    From this screen, it is possible to set some personal + preferences: +

    +
    +
      +
    • + +

      The language (for the installation only, may be different + that the chosen language for the system) by pressing the key F2 + (Legacy mode only) +

      - -
      • -
    • + -

      Add some kernel options by pressing the F6 key for the legacy mode or the e key for the UEFI mode. -

      - + +

      Use the arrow keys to select the language and press the key + Enter. +

      -

      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 Boot options and propose four - entries: -

      - + +

      Here is for example, the French welcome screen when using a + Live DVD/CD. Note that the Live DVD/CD menu does not propose: + Rescue System, Memory + test and Hardware Detection + Tool. +

      -

      - Default, it doesn't alter anything in the default - options. -

      - + + +
      • +
    • + +

      Change the screen resolution by pressing the F3 key (Legacy + mode only). +

      -

      - Safe Settings, priority is given to the safer options to the - detriment of performances. -

      - + + +
      • +
    • + +

      Add some kernel options by pressing the F6 key for the legacy mode or the e key for the UEFI mode. +

      -

      - No ACPI (Advanced Configuration and Power Interface), power - management isn't taken into account. -

      - + +

      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 Boot options and + propose four entries: +

      -

      - No Local APIC (Local Advanced Programmable Interrupt - Controller), it is about CPU interruptions, select this option if you - are asked for. -

      - + +

      - Default, it doesn't alter anything in the default + options. +

      -

      When you select one of these entries, it modifies the default - options displayed in the Boot Options line. -

      - + +

      - Default, it doesn't alter anything in the default + options. +

      -
      -
- - - - - - - -
[Note]
- -

In some Mageia releases, it may happen that the entries selected - with the key F6 does not appear in the Boot - Options line, however, they are really taken into - account. -

-
-
- +

- No ACPI (Advanced Configuration and Power Interface), + power management isn't taken into account. +

- - -
  • + +

    - No Local APIC (Local Advanced Programmable Interrupt + Controller), it is about CPU interruptions, select this option if + you are asked for. +

    -

    Add more kernel options by pressing the key F1 (Legacy mode - only). -

    - + +

    When you select one of these entries, it modifies the + default options displayed in the Boot Options + line. +

    -

    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. -

    - + +
    + + + + + + + + +
    [Note]
    + +

    In some Mageia releases, it may happen that the entries + selected with the key F6 does not appear in the Boot + Options line, however, they are really taken into + account. +

    + +
    +
    -

    - + + +
    • +
  • + +

    Add more kernel options by pressing the key F1 (Legacy mode + only). +

    - + +

    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. +

    -

    - + -

    The detailed view about the option splash. Press Esc or select - Return to Boot Options to go back to the options - list. These options can by added by hand in the Boot - options line. -

    - + +

    The detailed view about the option splash. Press Esc or + select Return to Boot Options to go back to + the options list. These options can by added by hand in the + Boot options line. +

    - + -

    - + +
    + + + + + + + + +
    [Note]
    + +

    The help is translated in the chosen language with the F2 + key. +

    + +
    +
    -
    - - - - - - - - -
    [Note]
    - -

    The help is translated in the chosen language with the F2 - key. -

    -
    +

    For more information about kernel options on legacy and UEFI + systems, see: https://wiki.mageia.org/en/How_to_set_up_kernel_options

    + +
    • + + + + + + +
    +
    +
    +
    +

    Using a Wired Network +

    +
    - - - -
    - - -

    For more information about kernel options on legacy and UEFI systems, - see: https://wiki.mageia.org/en/How_to_set_up_kernel_options

    - - -

    Here is the default welcome screen when using a Wired Network-based - Installation CD (Boot.iso or Boot-Nonfree.iso images): -

    - - -

    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 the Mageia - Wiki

    - - -
    - - - - - - - - -
    [Warning]
    - -

    The keyboard layout is the American one.

    - -
    +
    + + + +

    Here is the default welcome screen when using a Wired + Network-based Installation CD (netinstall.iso or netinstall-nonfree.iso + images): +

    + + +

    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 the Mageia + Wiki

    + + +
    + + + + + + + + +
    [Warning]
    + +

    The keyboard layout is the American one.

    + +
    +
    + + + +
    + - -
    -

    The installation steps +

    The installation steps

    @@ -316,8 +342,7 @@
    -

    Installation Problems and - Possible Solutions +

    Installation Problems and Possible Solutions

    @@ -329,7 +354,7 @@
    -

    No Graphical Interface +

    No Graphical Interface

    @@ -350,12 +375,12 @@
  • -

    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. +

    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.

    • @@ -369,7 +394,7 @@
    -

    The Install Freezes +

    The Install Freezes

    @@ -391,7 +416,7 @@
    -

    RAM problem +

    RAM problem

    @@ -412,7 +437,7 @@
    -

    Dynamic partitions +

    Dynamic partitions

    @@ -430,6 +455,11 @@
    + +
    +
    +
    +
    diff --git a/misc-params.html b/misc-params.html index e4ba56d..b80fd2b 100644 --- a/misc-params.html +++ b/misc-params.html @@ -30,31 +30,9 @@ - - - - - - - - - - - - - - - - - - - - - -

    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 + hardware DrakX detected. You can check the settings here and change them if you want after pressing Configure.

    @@ -129,8 +107,7 @@

    If you are not in the selected country, it is very important that you correct the - setting. See the section called “Select your Country / - Region”

    + setting. See the section called “Select your Country / Region”

  • @@ -144,7 +121,7 @@

    Do not change - anything, unless you know how to configure Grub and/or Lilo + anything, unless you know how to configure Grub2

    diff --git a/selectCountry.html b/selectCountry.html index e3398cd..049487e 100644 --- a/selectCountry.html +++ b/selectCountry.html @@ -17,37 +17,31 @@
    -

    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 isn't in the + list, click the Other Countries button and choose your + country / region there.

    - +
    @@ -56,19 +50,19 @@
    - -

    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 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. +

    +
    - +
    @@ -78,23 +72,19 @@
    + - - - -

    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.

    - +
    @@ -103,20 +93,20 @@
    - -

    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. +

    +
    - +
    • - +
    diff --git a/selectLanguage.html b/selectLanguage.html index 9e13156..26e1479 100644 --- a/selectLanguage.html +++ b/selectLanguage.html @@ -23,23 +23,18 @@
    - - - - - - -

    Select your preferred language, by first expanding the list for your - continent. Mageia will use this selection during - the installation and for your installed system. +

    Select your preferred language, by first + expanding the list for your continent. Mageia + will use this selection during the installation and for your installed + system.

    - +

    If it is likely that you will require several languages installed on your system, for yourself or other users, then you @@ -47,9 +42,7 @@ now. It will be difficult to add extra language support after installation.

    - -
    @@ -69,7 +62,6 @@
    -
      @@ -84,7 +76,6 @@

    • 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 diff --git a/setupBootloader.html b/setupBootloader.html index 68ef89d..924521b 100644 --- a/setupBootloader.html +++ b/setupBootloader.html @@ -29,13 +29,11 @@ - - -

      +
      -

      With a Bios system +

      Bootloader interface

      @@ -43,17 +41,25 @@ -

      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.

        + +
        • +
      +
      @@ -65,7 +71,7 @@
    -

    The Mageia graphical menus are nice :

    +

    The Mageia graphical menus are nice :)
    - - - - - - - -
    [Warning]
    - -

    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. -

    - -
    -
    -
    +
    -

    Using an - existing bootloader +

    Grub2-efi on UEFI systems

    @@ -141,88 +112,102 @@ -

    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. +

    With an UEFI system, the user interface is slightly different as + you cannot choose between with or without graphical menu

    -

    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. +

    If Mageia is the only system installed on your computer, the + installer created an ESP (EFI System Partition) to receive the + bootloader (Grub2-efi). If there are already UEFI operating systems + installed on your computer (Windows 8 for example), the Mageia installer + detects 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.

    -
    - - - - - - - - -
    [Tip]
    - -

    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 you really know what you are + doing.

    + +
    + + +
    +
    +
    +
    +

    Using a Mageia bootloader +

    +
    +
    +
    + -
    -
    +

    By default, according to your system, Mageia writes a new:

    + + +
    +
      +
    • + +

      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

    + + + +
    + + +
    +
    +
    -
    -

    Bootloader - advanced option -

    -
    +

    Using an existing bootloader +

    - - - -

    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. -

    -
    + + + +

    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. +

    -
    +
    -

    With an UEFI system +

    Using chain loading

    @@ -230,26 +215,202 @@ -

    With an UEFI system, the user interface is slightly different as you - cannot choose the boot loader since only Grub2-efi is available. +

    If you don't want a bootable Mageia, but to chain load it from + another OS, click on Next, then on + Advanced and Check the box Do not touch + ESP or MBR.

    -

    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. +

    You will get a warning that the bootloader is missing, ignore it by + clicking OK.

    -

    Don't modify the "Boot Device" unless really knowing what you - do. -

    + +
    + + +
    +
    +
    +
    +

    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 a username and password + will be asked at the boot time to select a booting entry or change + settings. The username is "root" and the password is the one + chosen here after. +

      + +
      • +
    • + +

      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. Unchecking it could be + useful if, for example, 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 manages all external interrupts for a + 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

        + +
        • +
      +
      + +
      • +
    +
    + +
    diff --git a/setupBootloaderAddEntry.html b/setupBootloaderAddEntry.html index 768d1bb..49de1ed 100644 --- a/setupBootloaderAddEntry.html +++ b/setupBootloaderAddEntry.html @@ -24,118 +24,27 @@
    - - - - -
    -
    -
    -
    -

    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. -

    - - -
    - - - - - - - - -
    [Note]
    - -

    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. -

    - - -
    - - - - - - - - -
    [Warning]
    - -

    Editing other things can leave you with an unbootable system. - Please don't just try something without knowing what you are - doing. -

    - -
    -
    - -
    - +

    To do that you need to manually edit /boot/grub2/custom.cfg or use the + software grub-customizer instead (Available in the Mageia + repositories). +

    -
    -
    -
    -
    -

    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. -

    - - - +
    + + + + + + + + +
    [Note]
    + +

    For more information, see our wiki: https://wiki.mageia.org/en/Grub2-efi_and_Mageia

    + +
    diff --git a/soundConfig.html b/soundConfig.html index 4f39101..a6d204e 100644 --- a/soundConfig.html +++ b/soundConfig.html @@ -22,7 +22,6 @@
    - @@ -30,25 +29,24 @@ -

    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. - +

    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 +

    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 +

    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. -

    @@ -64,18 +62,16 @@ -

    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. - +

    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. - +

    In that case you can select a different driver after clicking on + Let me pick any driver.

    -
    diff --git a/uninstall-Mageia.html b/uninstall-Mageia.html index 1450834..69dabb1 100644 --- a/uninstall-Mageia.html +++ b/uninstall-Mageia.html @@ -30,7 +30,11 @@
    +<<<<<<< HEAD +

    Howto +=======

    Howto +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

    @@ -45,9 +49,10 @@

    -

    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.

    @@ -61,8 +66,8 @@

    -

    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.

    -- cgit v1.2.1