From 0a7773d995c2c69988abe2670e880b6e03ad2c00 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Wed, 25 Apr 2012 08:29:04 +0000 Subject: - tag 2.9 --- Makefile | 3 +- NEWS | 3 + acceptLicense.html | 10 +- addUser.html | 52 +++---- ask_mntpoint_s.html | 14 +- doPartitionDisks.html | 66 ++++----- exitInstall.html | 28 +++- formatPartitions.html | 14 +- index.html | 23 +++- installUpdates.html | 4 +- misc-params.html | 262 ++++++++++++++++++++++++++++++------ resizeFATChoose.html | 10 +- selectMouse.html | 21 +-- setupBootloaderBeginner.html | 195 ++++++++++++++++++++++++--- setupBootloaderExpert.html | 314 +++++++++++++++++++++++++++++++++++++++++++ setupSCSI.html | 23 ++-- setupX.html | 15 ++- takeOverHdChoose.html | 4 +- takeOverHdConfirm.html | 5 +- 19 files changed, 892 insertions(+), 174 deletions(-) create mode 100644 setupBootloaderExpert.html diff --git a/Makefile b/Makefile index b0e2746..055c39e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ PACKAGE = drakx-installer-help -VERSION = 2.8 -SVNPATH = svn+ssh://svn.mageia.org/svn/soft/$(PACKAGE) +VERSION = 2.9 HTML_FILES = acceptLicense.html \ addUser.html \ diff --git a/NEWS b/NEWS index c2cb814..fad5ca3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +* Wed Apr 25 2012 Kamil Rytarowski 2.8 +- new .HTML files (the 2012-04-25 version) + * Thu Apr 19 2012 Kamil Rytarowski 2.8 - add Makefile to prepare a tarball - remove images/ (no need for screenshots) diff --git a/acceptLicense.html b/acceptLicense.html index 8f5f960..7a0908e 100644 --- a/acceptLicense.html +++ b/acceptLicense.html @@ -22,15 +22,23 @@ + + + + + + + + - + diff --git a/addUser.html b/addUser.html index 83d1a4f..9762bd8 100644 --- a/addUser.html +++ b/addUser.html @@ -32,6 +32,12 @@ + + + + + +
@@ -50,7 +56,7 @@

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 shield in its colour will change from red to + 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 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 @@ -93,10 +99,9 @@ -

Add a user here. A user has less rights than the superuser (root), - but by default 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 surf the internet, use office applications or play games and + anything else the average user does with his computer

@@ -111,31 +116,31 @@
  • -

    Real Name: Insert a users real name into +

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

  • -

    Login Name: Here you can type in a log in - name or drakx will use a version of the users real name. The - log in name is case sensitive.

    +

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

  • Password: In this text box you should type - in a users pass word. Again it has a shield in the corner of the text - box that indicates the strength of the users password. (See also Note) + in the user password. There is a shield at the end of the text box + that indicates the strength of the password. (See also Note)

  • -

    Password (again): Retype the users password +

    Password (again): Retype the user password into this text box and drakx will check you have the same password in - each of the users password text boxes. + each of the user password text boxes.

  • @@ -157,10 +162,9 @@ -

    If the advanced button is clicked then you - are offered this screen that allows you to edit the settings for the user - you are adding. Additionally, you can disable or enable a guest account. - +

    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.

    @@ -174,8 +178,8 @@

    Anything a guest with a default rbash guest - account saves to his /home directory will be erased. The guest should - save his important files to a USB key. + account saves to his /home directory will be erased when he logs out. + The guest should save his important files to a USB key.

    @@ -189,8 +193,9 @@
  • Enable guest account: Here you can enable - or disable a guest account. The guest account allows a guest to log into - and use the PC, but he has more restricted access than normal users. + or disable a guest account. The guest account allows a guest to log + into and use the PC, but he has more restricted access than normal + users.

  • @@ -206,14 +211,15 @@

    User ID: Here you can set the user ID for the user you are adding in the previous screen. This is a number. - Don't enter anything here if you don't know what it should be. + Leave it blank unless you know what you are doing.

  • Group ID: This lets you set the group ID. - Also a number, usually the same one as for the user. + Also a number, usually the same one as for the user. Leave it blank + unless you know what you are doing.

  • diff --git a/ask_mntpoint_s.html b/ask_mntpoint_s.html index 7492b39..a78ade2 100644 --- a/ask_mntpoint_s.html +++ b/ask_mntpoint_s.html @@ -22,22 +22,22 @@
    - - - - - + + + + +

    Here you see the Linux partitions that have been found on your - computer. If you don't agree with the suggestions of - DrakX, you can change the mount points. + computer. If you don't agree with the DrakX + suggestions, you can change the mount points.

    diff --git a/doPartitionDisks.html b/doPartitionDisks.html index c0a1a76..c21edda 100644 --- a/doPartitionDisks.html +++ b/doPartitionDisks.html @@ -22,38 +22,43 @@ - - - + + + + + + +

    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 + partitioning wizard found for where to install Mageia.

    -

    The options available from the list below will vary +

    The options available from the list below will vary depending on your particular hard drive(s) layout and content.

    -

    +

    • -

      Use Existing Partitions

      +

      Use Existing Partitions +

      -

      If this option is available, then existing Linux compatible +

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

      @@ -61,33 +66,36 @@
    • -

      Use Free Space

      +

      Use Free Space +

      -

      If you have unused space on your hard drive then this option +

      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

      +

      Use Free Space on a Windows Partition +

      -

      If you have unused space on an existing Windows partition, the +

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

      This can be a useful way of making room for your new Mageia + installation, but is a risky operation and should be a last resort!

      -

      Note that this involves shrinking the size of the Windows +

      Note that this involves shrinking the size of the Windows partition, which is not without some risk. The partition must be - "clean" meaning that Windows must have closed down correctly the last - time it was used. + "clean", meaning that Windows must have closed down correctly the last + time it was used. It must also have been defragmented, although this is not a guarantee that all files in the partition + have been moved out of the area that is about to be used. You should check this carefully before proceeding.

    • @@ -97,18 +105,20 @@
      • -

        Erase and use Entire Disk.

        +

        Erase and use Entire Disk. +

        -

        This option will use the complete drive for Mageia.

        +

        This option will use the complete drive for Mageia. +

        -

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

        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 +

        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.

        @@ -120,20 +130,14 @@
        • -

          Custom

          - - -

          This gives you complete control over the placing of the - installation on your hard drive(s). It allows for the use of a - separate partition for the /home folder (which is recommended) and - many more options. [saying that means that the other options don't - allow a separate partition for /home] +

          Custom

          -

          For users new to Linux the /home folder is where all your - personal files and settings are stored. +

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

          +
        diff --git a/exitInstall.html b/exitInstall.html index bcb4f0a..578e971 100644 --- a/exitInstall.html +++ b/exitInstall.html @@ -26,22 +26,36 @@ + + + + + -

        You have now finished installing - and configuring Mageia and it's now safe to - reboot your computer +

        You have finished installing + and configuring Mageia and it is now safe to remove the installation medium and + reboot your computer.

        -

        ADD SOME - TEXT. +

        After reboot, in the bootloader screen, you can choose between the operating systems on your computer (if you have more than + one).

        -

        ADD SOME - TEXT. +

        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

        + +
    diff --git a/formatPartitions.html b/formatPartitions.html index 222a28b..2aa128b 100644 --- a/formatPartitions.html +++ b/formatPartitions.html @@ -22,15 +22,23 @@ - - + + + + + + + + + +

    Here you can choose which - partition(s) you wish to format. Any data on partitions not marked for + partition(s) you wish to format. Any data on partitions not marked for formatting will be saved.

    diff --git a/index.html b/index.html index e8afa58..6ba6d05 100644 --- a/index.html +++ b/index.html @@ -76,6 +76,25 @@ configuration
    Bootloader main options
    +
    +
    +
    Using the Mageia boot + loader
    +
    Using an + existing boot loader
    +
    Boot loader advanced + option
    +
    +
    +
    Bootloader expert use
    +
    +
    +
    Adding a GRUB2 based system + manually
    +
    Using an + existing GRUB2 boot loader
    +
    +
    Summary of miscellaneous parameters
    @@ -91,7 +110,7 @@ Region
    Configure your Services
    -
    drakxid-miscellaneous
    +
    Security Level
    Select mouse
    @@ -133,6 +152,8 @@ + + diff --git a/installUpdates.html b/installUpdates.html index b6c7171..369786e 100644 --- a/installUpdates.html +++ b/installUpdates.html @@ -27,8 +27,10 @@ + + - +

    Since this version of diff --git a/misc-params.html b/misc-params.html index de5ff14..2f5cd96 100644 --- a/misc-params.html +++ b/misc-params.html @@ -6,7 +6,7 @@ - + + +

    +
    +
    +
    +

    Bootloader expert use +

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + +

    If you haven't done so + yet, please read the section called “Bootloader main + options” first. +

    + + +
    +
    +
    +
    +

    Adding a GRUB2 based system + manually +

    +
    +
    +
    + + + +

    A GRUB2 based system + may be added to the Mageia boot menu as follows: +

    + + +
    +
      +
    • + +

      Boot into the + system in question and in order to determine the grub version, in a terminal run the command: +

      + + +

      sudo + grub-install --version

      + + +

      or if that + fails try: +

      + + +

      sudo + grub2-install --version

      + +
    • +
    • + +

      If this returns + "GNU GRUB version 0.97" (possibly with a custom suffix), then it is + using GRUB (otherwise called GRUB legacy) not GRUB2 and your system + should be correctly identified by Mageia during installation and added + automatically to the menu. +

      + +
    • +
    • + +

      If this returns + (GRUB) 1.98 or 1.99 or 2.xx, then you are using GRUB2. +

      + + +

      Make a note of + the version and enter this command to identify the root partition: +

      + + +

      df / +

      + + +

      This will + output something like : +

      + + +

      Filesystem Size Used + Avail Use% Mounted on

      + + +

      /dev/sdb11 15G 7.0G 7.0G + 50% /

      + + +

      The "sdb11" + part is the root partition - make a note of it. +

      + +
    • +
    • + +

      You can now + shut down the system and install Mageia. +

      + +
    • +
    • + +

      In your new + running Mageia system, open a terminal and as root edit the file + /boot/grub/menu.lst. as follows: +

      + +
    • +
    • + +

      To become root + use: +

      + + +

      su

      + + +

      (enter root + password) +

      + +
    • +
    • + +

      To open the + file in an editor use: +

      + + +

      kwrite + /boot/grub/menu.lst

      + + +

      (replace + "kwrite" with "gedit" if you are using Gnome) +

      + +
    • +
    • + +

      Add the + following entry for your (e.g. Ubuntu) system possibly as the second + stanza: +

      + + +

      title + Ubuntu

      + + +

      root + (hd1,10)

      + + +

      kernel + /boot/grub/core.img

      + +
    • +
    • + +

      If the GRUB2 + version is 2.xx then change the last line to : +

      + + +

      kernel + /boot/grub/i386-pc/core.img

      + + +

      If you needed + to use "grub2-install" earlier then change /grub/ + to /grub2/ in the last line. +

      + +
    • +
    • + +

      Save the file + and re-boot. You should now see your "Ubuntu" entry in the menu and be + able to boot from it. +

      + +
    • +
    +
    + + +
    + + + + + + + + +
    [Note]Note
    + +

    The "sdb" + indicates the second hard drive hd1, (sda would be hd0), likewise sdb11 + indicates partition 11 which in GRUB legacy (counting from zero) is + partition 10. +

    + + +

    So: +

    + + +

    sdb11 = + (hd1,10)

    + + +

    sda1 = + (hd0,0)

    + +
    +
    + +
    + + +
    +
    +
    +
    +

    Using an + existing GRUB2 boot loader +

    +
    +
    +
    + + + +

    If you didn't read + the general part about using an existing bootloader yet, do so now. See + the section called “Using an + existing boot loader”

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

    There is a known + bug in OS-prober used during GRUB2 installation in some older versions of + Debian/Ubuntu that incorrectly creates grub.cfg when adding Mageia (or + Mandriva) systems. This is simple to work around and details of a fix + can be found in the Mageia forum here : + https://forums.mageia.org/en/viewtopic.php?p=13547#p13547 +

    + + +

    To make the fix + permanent so that it will survive an Ubuntu kernel update, the Mageia + entry should be added to /etc/grub.d/40_custom

    + +
    +
    + +
    + +
    + + diff --git a/setupSCSI.html b/setupSCSI.html index b7c5603..75fc720 100644 --- a/setupSCSI.html +++ b/setupSCSI.html @@ -24,31 +24,30 @@ - - - + + + + + -

    DrakX usually detects your hard - disks correctly. However it may fail to detect some older SCSI drive - controllers and thus fail to install the required drivers and the - installation may fail. +

    DrakX usually detects hard + disks correctly. It may not however detect some older SCSI drive + controllers and therefore fail to install the required drivers.

    -

    If this happens, you'll need to +

    If this happens, you will need to manually tell Drakx which SCSI drive(s) you have.

    -

    After that, DrakX should be able - to figure out which parameters need to be set for the drive to work. You - should only have to set them manually if DrakX doesn't manage to do - it. +

    DrakX should then be able + to configure the drive(s) correctly.

    diff --git a/setupX.html b/setupX.html index f2b4b11..7bbcc0f 100644 --- a/setupX.html +++ b/setupX.html @@ -32,9 +32,12 @@ + + + -

    No matter which graphical environment (also known as desktop +

    No matter which graphical environment (also known as desktop environment) you chose for this install of Mageia, they are all based on a graphical user interface system called X-Windows, or simply X. So in order for KDE, Gnome, @@ -48,14 +51,14 @@

    • -

      Graphic card: Choose +

      Graphic card: Choose your card from the list if needed.

    • -

      Monitor: You can +

      Monitor: You can choose Plug'n Play when applicable, or choose your monitor from the Vendor or Generic list. Choose Custom if @@ -66,14 +69,14 @@

    • -

      Resolution: Set the +

      Resolution: Set the desired resolution and color depth of your monitor here.

    • -

      Test: The test button +

      Test: The test button does not always appear during install. If the button is there, you can control your settings by pushing it. If you see a question asking you whether your settings are correct, you can answer "yes", and the @@ -85,7 +88,7 @@

    • -

      Options: Here you can +

      Options: Here you can choose to enable or disable some options.

      diff --git a/takeOverHdChoose.html b/takeOverHdChoose.html index 54c9f43..dc4efda 100644 --- a/takeOverHdChoose.html +++ b/takeOverHdChoose.html @@ -44,8 +44,8 @@

      Be sure to select the - correct hard disk. All data on the selected disk will be lost and this - step can not be undone. + correct hard disk. All data on the selected disk will be lost. This step + can not be undone.

      diff --git a/takeOverHdConfirm.html b/takeOverHdConfirm.html index 09b714d..c48781c 100644 --- a/takeOverHdConfirm.html +++ b/takeOverHdConfirm.html @@ -30,11 +30,12 @@ + +

      Click on - Previous if you are not sure you selected the correct - hard disk. + Previous if you are not sure about your choice.

      -- cgit v1.2.1