From 1f0046f1025957ca64a28a2936f08b08d88aec50 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Mon, 16 Apr 2012 19:40:12 +0000 Subject: - tag 2.6 --- NEWS | 4 + acceptLicense.html | 9 +++ addUser.html | 180 +++++++++++++++++++++++++------------------ ask_mntpoint_s.html | 94 +++++++++++----------- choosePackages.html | 164 +++++++++++++++++++-------------------- diskdrake.html | 7 ++ doPartitionDisks.html | 6 +- exitInstall.html | 22 ++++-- formatPartitions.html | 37 ++++++--- index.html | 27 ++++--- installUpdates.html | 26 ++++--- installer.html | 17 +++- misc-params.html | 132 ++++++++++++++++++++++++++----- resizeFATChoose.html | 36 ++++++--- selectInstallClass.html | 13 +++- selectKeyboard.html | 7 +- selectLanguage.html | 9 +++ selectMouse.html | 21 ++--- setupBootloaderBeginner.html | 38 +++++---- setupSCSI.html | 29 ++++--- setupX.html | 90 +++++++++++++--------- takeOverHdChoose.html | 26 ++++--- takeOverHdConfirm.html | 25 +++--- 23 files changed, 651 insertions(+), 368 deletions(-) diff --git a/NEWS b/NEWS index 3c481d4..9e8efa4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +* Mon Apr 16 2012 Kamil Rytarowski 2.6 +- update .HTML files (the 2012-04-16 version) +- drop unused or merged files (intro, setRoot, uninstall) + * Wed Apr 11 2012 Kamil Rytarowski 2.5 - update .HTML files (all old Mandriva files are removed) - update COPYING and README diff --git a/acceptLicense.html b/acceptLicense.html index 2dc2f85..8f5f960 100644 --- a/acceptLicense.html +++ b/acceptLicense.html @@ -23,6 +23,15 @@ + + + + + + + + + diff --git a/addUser.html b/addUser.html index bb00765..83d1a4f 100644 --- a/addUser.html +++ b/addUser.html @@ -22,25 +22,42 @@ + + + + + + + + + +
-

Set Administrator (root) Password: +

Set Administrator (root) + Password:

-
+
+ -

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

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

- - + +
@@ -50,22 +67,20 @@
-

All passwords are case sensitive, it is best to use a mixture of letters (upper and lower case), numbers and other characters - in a password. + +

All passwords are case sensitive, it is best to use a mixture of + letters (upper and lower case), numbers and other characters in a + password.

+
- - + - - - - - +
@@ -74,54 +89,62 @@
-
- -

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

- + +
  • - -

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

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

    - +
  • - -

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

    Real Name: Insert a 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 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.

    +
  • - -

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

    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)

    - +
  • - -

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

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

    - +
- - - - + - - + +
@@ -130,15 +153,17 @@
-
- - -

If the advanced button is clicked then you get 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. The guest account allows a guest to log into and use the PC, but he has more restricted - access than normal users + + + + +

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

- - + +
@@ -147,49 +172,56 @@
-

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

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.

+
- - + +
  • - -

    Enable guest account: Here you can enable or disable a guest account + +

    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.

    - +
  • - -

    Shell: This drop down list allows you to change the shell used by the user you are adding in the previous screen, options are Bash, - Dash and Sh + +

    Shell: This drop down list allows you to + change the shell used by the user you are adding in the previous + screen, options are Bash, Dash and Sh

    - +
  • - -

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

    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.

    - +
  • - -

    Group ID: This lets you set the group ID. Also a number, usually the same one as for the user. + +

    Group ID: This lets you set the group ID. + Also a number, usually the same one as for the user.

    - +
- - + - - + diff --git a/ask_mntpoint_s.html b/ask_mntpoint_s.html index 2270a6e..7492b39 100644 --- a/ask_mntpoint_s.html +++ b/ask_mntpoint_s.html @@ -22,13 +22,24 @@ + - + -

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

+ + + + + + + +

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

+
@@ -39,62 +50,55 @@
-

If you change anything, make sure you still have at least ONE / partition +

If you change anything, make sure you still have a + / (root) partition.

+
- - +
  • - - -

    Every partition is shown - as follows: "Device" ("Capacity", "Mount point", "Type"). + +

    Every partition is shown as follows: "Device" ("Capacity", "Mount + point", "Type").

    - - -
    • -
  • - - -

    "Device", is made up of: "hard drive", "hard drive number", "partition number" (for example, "sda5").

    - - +
  • - - -

    Each partition is listed - as follows: "Device", "Capacity", "Mount point", "Type". + +

    "Device", is made up of: "hard drive", ["hard drive + number"(letter)], "partition number" (for example, "sda5").

    - - +
  • - - -

    If you have many partitions, you can choose many different mount points from the drop down menu, such as /, /home and /var. You can even make your own mount points, for instance /video for a partition where you want to store your films, or /cauldron-home for the /home partition of a cauldron install. + +

    If you have many partitions, you can choose many different mount + points from the drop down menu, such as /, + /home and /var. You can even make + your own mount points, for instance /video for a + partition where you want to store your films, or + /cauldron-home for the /home + partition of a cauldron install.

    - - - +
  • - - -

    For partitions you don't need to have access to, you can leave the mount point field blank.

    - - + +

    For partitions you don't need to have access to, you can leave the + mount point field blank. +

    +
- +
@@ -103,20 +107,24 @@
- -

Choose Previous if you are not sure what to choose, and then tick Custom disk partitioning. In the screen that follows, you can click on a partition to see it's type and size. + +

Choose Previous if you are not sure what to + choose, and then tick Custom disk partitioning. In + the screen that follows, you can click on a partition to see its type + and size.

+
- -

You are sure the mount points are correct? Now click on Next, and choose whether you only want to format the partition(s) DrakX suggests, or more. + +

If you are sure the mount points are correct, click on + Next, and choose whether you only want to format the + partition(s) DrakX suggests, or more.

- - diff --git a/choosePackages.html b/choosePackages.html index b30e56a..ad6a870 100644 --- a/choosePackages.html +++ b/choosePackages.html @@ -17,17 +17,27 @@
-

Choosing packages to be installed +

Choosing packages to be + installed

+ + + + + + + -

Depending on your choice, you may get one or more screens about choosing packages + +

Depending on your selections + here, you may be offered further screens to fine tune your choices.

- +
@@ -36,27 +46,22 @@
-
- -

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 - choice for these desktop environments. -

+ + - -

Click Next to continue. + +

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 choice for these desktop + environments. The LXDE desktop is lighter than the previous two, sporting + less eye candy and fewer packages installed by default.

- - + - - - - - +
@@ -65,60 +70,46 @@
-
- -

Packages have been sorted into groups, to make installing what you need on your system a lot easier.

- - + + + + +

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 dragged over them. +

+
  • - - -

    Workstation: ADD SOME TEXT. -

    - - + +

    Workstation.

    +
    • -
  • - - -

    Server: ADD SOME TEXT. -

    - - +
  • + +

    Server.

    +
  • - - -

    Graphical Environment: ADD SOME TEXT. . -

    - - + +

    Graphical Environment.

    +
  • - - -

    individual package selection: You can use - this option to manually add extra packages if you know what you want. + +

    Individual package selection: You can use this option to + manually add extra packages.

    - - - +
-

- -

- -

Click Next to continue. -

- - + - - + +
@@ -127,42 +118,45 @@
-
- - -

You can choose a Minumal Installation by deselecting everything in the Package Group Selection screen. Minimal Installation - is - intended for those with specific uses in mind for their Mageia, such as a server or a specialised workstation. You - will probably use this option combined with Manual Package - Selection. If you choose this installation class, then the next screen will offer you a few useful extras to install, - such as documentation and X, if you wish. - -

- + - + + +

You can choose a Minimal Installation by de-selecting everything in + the Package Group Selection screen. Minimal Installation is intended for + those with specific uses in mind for their Mageia, such as a server or a + specialised workstation. You will probably use this option combined with + Manual Package Selection. If you choose this installation class, then the + next screen will offer you a few useful extras to install, such as + documentation and X. +

+ + +
-

Choose individual packages +

Choose individual + packages

-
- - -

TEXT - +

+ + + +

Here you can add any extra packages to customise your + installation.

- +

After having made your choice, you can click on the floppy icon at the bottom of the page to save your choice of packages (saving to a USB key works, too). You can then use this file to + install the same packages on another system, by pressing the same button during install and choosing to load it. +

+ - - - - + diff --git a/diskdrake.html b/diskdrake.html index 50c0a9f..93ce20f 100644 --- a/diskdrake.html +++ b/diskdrake.html @@ -23,6 +23,13 @@ + + + + + + + diff --git a/doPartitionDisks.html b/doPartitionDisks.html index d830ba8..d6736da 100644 --- a/doPartitionDisks.html +++ b/doPartitionDisks.html @@ -7,7 +7,7 @@ - -
+
-

Choose Windows® partition to resize +

Resize + Windows® partition

+ + + + + + - -

You have more than one Windows® partition. Choose which one should be made smaller to make space for installing Mageia. -

+ + + -

....... +

You have more than one + Windows® partition. + Choose which one should be made smaller to make space for installing + Mageia.

+ + + +

....... +

+ + +

........

- - + +
diff --git a/selectInstallClass.html b/selectInstallClass.html index 007c4a7..54a0d60 100644 --- a/selectInstallClass.html +++ b/selectInstallClass.html @@ -22,6 +22,15 @@
+ + + + + + + + + @@ -35,8 +44,8 @@

Install

-

Use this option for a fresh - Mageia installation. +

Use this option for a fresh Mageia + installation.

diff --git a/selectKeyboard.html b/selectKeyboard.html index d4327d3..4d13cb1 100644 --- a/selectKeyboard.html +++ b/selectKeyboard.html @@ -22,13 +22,16 @@ + + +

DrakX selects an appropriate keyboard for your language. If no suitable keyboard is found it will default - to a US keyboard layout. + to a US keyboard layout.

@@ -50,7 +53,7 @@

If your keyboard isn't in the list shown, click on More to get a full list, - and select your keyboard there. + and select your keyboard there.

diff --git a/selectLanguage.html b/selectLanguage.html index 7027685..8bd866e 100644 --- a/selectLanguage.html +++ b/selectLanguage.html @@ -22,6 +22,15 @@ + + + + + + + + + diff --git a/selectMouse.html b/selectMouse.html index b907e4e..89c5601 100644 --- a/selectMouse.html +++ b/selectMouse.html @@ -7,7 +7,7 @@ -