aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/sl/DrakX-cover.xml42
-rw-r--r--docs/installer/sl/SelectAndUseISOs2.xml14
-rw-r--r--docs/installer/sl/add_supplemental_media.xml10
-rw-r--r--docs/installer/sl/choosePackageGroups.xml2
-rw-r--r--docs/installer/sl/diskdrake.xml52
-rw-r--r--docs/installer/sl/doPartitionDisks.xml18
-rw-r--r--docs/installer/sl/installer.xml108
-rw-r--r--docs/installer/sl/minimal-install.xml45
-rw-r--r--docs/installer/sl/setupBootloader.xml9
-rw-r--r--docs/installer/sl/setupBootloaderAddEntry.xml8
10 files changed, 183 insertions, 125 deletions
diff --git a/docs/installer/sl/DrakX-cover.xml b/docs/installer/sl/DrakX-cover.xml
index b5e35f0a..c2534821 100644
--- a/docs/installer/sl/DrakX-cover.xml
+++ b/docs/installer/sl/DrakX-cover.xml
@@ -14,16 +14,17 @@
<para role="tagline">The Official Documentation for Mageia</para>
<mediaobject>
<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
- <info>
- <title>Namestitev s programom DrakX</title>
- <publisher> <publishername>Mageia.org</publishername> </publisher>
- <revhistory>
- <revision>
- <date>Februar 2014</date>
- <revremark>Mageia 4</revremark>
- </revision>
- </revhistory>
- </info>
+ <para>The texts and screenshots in this manual are available under the CC BY-SA
+3.0 license <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+ </para>
+ <para>This manual was produced with the help of the <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>It was written by volunteers in their free time. Please contact <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
<article>
@@ -33,34 +34,25 @@
- <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
-<para><note>
+<title>Namestitev s programom DrakX</title>
+ <para><note>
<para>No one will see all the installer screens that you see in this manual. Which
screens you will see, depends on your hardware and the choices you make
while installing.</para>
</note></para>
-
- <para>The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
-
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
-
- <para>It was written by volunteers in their free time. Please contact <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="drakx-intro.xml"/>
-->
-<xi:include href="installer.xml"/>
+<xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="installer.xml"/>
<xi:include href="selectLanguage.xml"/>
diff --git a/docs/installer/sl/SelectAndUseISOs2.xml b/docs/installer/sl/SelectAndUseISOs2.xml
index ba5ad3a3..d773e4a4 100644
--- a/docs/installer/sl/SelectAndUseISOs2.xml
+++ b/docs/installer/sl/SelectAndUseISOs2.xml
@@ -257,8 +257,7 @@ mirror in use and the possibility to change if the bandwidth is to low. If
http is chosen, you may also see something like</para>
<mediaobject>
-<imageobject> <imagedata fileref="Checking.png" contentwidth="650"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
them. Both hexadecimal numbers have been calculated by an algorithm from the
@@ -289,8 +288,7 @@ path/to/the/image/file.iso</userinput>.</para>
while) with the number given by Mageia. Example:</para>
<mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png" contentwidth="650"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
<para/>
</section>
@@ -345,8 +343,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
final '-' )</para>
<mediaobject>
-<imageobject> <imagedata contentwidth="650" fileref="../Root.png"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
</listitem>
<listitem>
@@ -358,8 +355,7 @@ application or file manager that could access or read it)</para>
<para>Enter the command <userinput>fdisk -l</userinput></para>
<mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png" contentwidth="650"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
</listitem>
<listitem>
@@ -412,4 +408,4 @@ Mageia documentation</link>.</para>
ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
wiki</link>.</para>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/installer/sl/add_supplemental_media.xml b/docs/installer/sl/add_supplemental_media.xml
index 0d9349aa..89b795de 100644
--- a/docs/installer/sl/add_supplemental_media.xml
+++ b/docs/installer/sl/add_supplemental_media.xml
@@ -42,4 +42,14 @@ the URL, you can designate a specific repository or your own NFS
installation.</para>
</listitem>
</orderedlist>
+
+ <note>
+ <para>If you are updating a 64 bit installation which may contain some 32 bit
+packages, it is advised to use this screen to add an online mirror by
+ticking one of the Network protocols here. The 64 bit DVD iso only contains
+64 bit and noarch packages, it will not be able to update the 32 bit
+packages. However, after adding an online mirror, installer will find the
+needed 32 bit packages there.</para>
+ </note>
+
</section>
diff --git a/docs/installer/sl/choosePackageGroups.xml b/docs/installer/sl/choosePackageGroups.xml
index 328f2d66..7c6a4b19 100644
--- a/docs/installer/sl/choosePackageGroups.xml
+++ b/docs/installer/sl/choosePackageGroups.xml
@@ -35,6 +35,6 @@ remove packages.</para>
</listitem>
</itemizedlist>
<para>Read <xref linkend="minimal-install"></xref> for instructions on how to do a
-minimal install.</para>
+minimal install (without or with X &amp; IceWM).</para>
</section>
diff --git a/docs/installer/sl/diskdrake.xml b/docs/installer/sl/diskdrake.xml
index cfbfbef8..1cf1e7d2 100644
--- a/docs/installer/sl/diskdrake.xml
+++ b/docs/installer/sl/diskdrake.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" 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:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="diskdrake">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="diskdrake">
@@ -6,11 +6,12 @@
+
+
+
+
-
-
-
<info>
<!-- Started by marja on 2012 03 29 -->
@@ -27,35 +28,40 @@
<title xml:id="diskdrake-ti1">Razdeljevanje diska po meri s programom DiskDrake</title>
</info>
-
-
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png"
-align="center"></imagedata> </imageobject></mediaobject>
-
+<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
+</imageobject></mediaobject>
-<warning>
+ <warning>
<para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <literal>/</literal> partition you
must ensure that you have a separate <literal>/boot</literal> partition. The
encryption option for the <literal>/boot</literal> partition must NOT be
set, otherwise your system will be unbootable.</para>
</warning>
- <para revision="2" xml:id="diskdrake-pa3">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="2" xml:id="diskdrake-pa3">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 hard disk or other storage device, like an
-USB key. For example sda, sdb and sdc if there are three of them.
- </para>
-
+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 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 the desired partition first. Then view it,
or choose a filesystem and a mount point, resize it or wipe it.</para>
-
- <para revision="1" xml:id="diskdrake-pa6a">Continue until you adjusted everything to your wishes. </para>
-
- <para revision="1" xml:id="diskdrake-pa7">Click <guibutton>Done</guibutton> when you're ready.</para> </section> \ No newline at end of file
+
+ <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> 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>
+
+ <para><mediaobject>
+<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
+ </note>
+</section>
+
diff --git a/docs/installer/sl/doPartitionDisks.xml b/docs/installer/sl/doPartitionDisks.xml
index bf32a87a..fb1c5794 100644
--- a/docs/installer/sl/doPartitionDisks.xml
+++ b/docs/installer/sl/doPartitionDisks.xml
@@ -16,7 +16,7 @@
-
+
<info>
@@ -43,8 +43,8 @@ solutions the DrakX partitioning wizard found for where to install
particular hard drive(s) layout and content.</para>
<mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-doPartitionDisks.png"
-/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-doPartitionDisks.png"/>
+</imageobject></mediaobject>
<para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
<listitem>
@@ -77,6 +77,15 @@ 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. It is highly recommended to
back up your personal files.</para>
+
+ <para>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 draging the gap between both partitions. See the screen-shot below.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
+</imageobject></mediaobject>
</listitem>
</itemizedlist> <itemizedlist>
<listitem>
@@ -114,4 +123,5 @@ settings: </para>
<para>Also make sure all partitions are created with an even number of megabytes.</para>
</warning>
-</section> \ No newline at end of file
+</section>
+
diff --git a/docs/installer/sl/installer.xml b/docs/installer/sl/installer.xml
index fc0e76ff..dd1b10e6 100644
--- a/docs/installer/sl/installer.xml
+++ b/docs/installer/sl/installer.xml
@@ -41,23 +41,30 @@ start the installer, which will normally be all that you will need.</para>
<title xml:id="installer-ti2">Installation Welcome Screen</title>
</info>
- <para>Here is the default welcome screen when using a Mageia DVD:</para>
+ <para>Here are the default welcome screens when using a Mageia DVD, The first one
+with a legacy system and the second one with an UEFI system:
+ </para>
<mediaobject>
<imageobject> <imagedata xml:id="BId-drakx-intro-im1" revision="1"
align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediaobject></figure>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome2.png" align="center"/>
+</imageobject></mediaobject>
+
<para>From this first screen, it is possible to set some personal preferences:</para>
<itemizedlist>
<listitem>
<para>The language (for the installation only, may be different that the chosen
-language for the system) by pressing the key F2</para>
+language for the system) by pressing the key F2 (Legacy mode only)</para>
<para/>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="dx-welcome-lang.png" align="center"/>
+</imageobject></mediaobject>
<para>Use the arrow keys to select the language and press the key Enter.</para>
@@ -69,20 +76,24 @@ Detection Tool</guilabel>.</para>
<para/>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="dx-welcome4fr.png" align="center"/>
+</imageobject></mediaobject>
<para/>
</listitem>
<listitem>
- <para>Change the screen resolution by pressing the F3 key.</para>
+ <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="dx-welcome5def.png" align="center"/>
+</imageobject></mediaobject>
</listitem>
<listitem>
- <para>Add some kernel options by pressing the F6 key.</para>
+ <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
+key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
+the UEFI mode.</para>
<para>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
@@ -109,11 +120,12 @@ however, they are really taken into account.</para>
</note>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome6opt.png"/>
+</imageobject></mediaobject>
</listitem>
<listitem>
- <para>Add more kernel options by pressing the key F1</para>
+ <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
<para>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
@@ -122,7 +134,8 @@ go back to the welcome screen.</para>
<para/>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp1.png" align="center"/>
+</imageobject></mediaobject>
<para/>
@@ -132,7 +145,8 @@ list. These options can by added by hand in the <guilabel>Boot
options</guilabel> line.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcomeHelp2.png"/>
+</imageobject></mediaobject>
<para/>
@@ -142,6 +156,10 @@ options</guilabel> line.</para>
</listitem>
</itemizedlist>
+ <para>For more information about kernel options on legacy and UEFI systems, see:
+<link
+ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
+
<para>Here is the default welcome screen when using a Wired Network-based
Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
@@ -186,67 +204,67 @@ rebooting is what you want, go to a text terminal by pressing the three keys
</note>
</section>
- <section xml:id="installationProblems">
+ <section xml:id="installationProblems">
+ <info>
+ <title xml:id="installationProblems-ti1">Installation Problems and Possible Solutions</title>
+ </info>
+
+ <section xml:id="noX">
<info>
- <title xml:id="installationProblems-ti1">Installation Problems and Possible Solutions</title>
+ <title xml:id="noX-ti2">No Graphical Interface</title>
</info>
- <section xml:id="noX">
- <info>
- <title xml:id="noX-ti2">No Graphical Interface</title>
- </info>
-
- <itemizedlist>
- <listitem>
- <para>After the initial screen you did not reach the language selection
+ <itemizedlist>
+ <listitem>
+ <para>After the initial screen you did not reach the language selection
screen. This can happen with some graphic cards and older systems. Try using
low resolution by typing <code>vgalo</code> at the prompt.</para>
- </listitem>
+ </listitem>
- <listitem>
- <para revision="2">If the hardware is very old, a graphical installation may not be
+ <listitem>
+ <para revision="2">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.</para>
- </listitem>
- </itemizedlist>
- </section>
+ </listitem>
+ </itemizedlist>
+ </section>
- <section xml:id="installFreezes">
- <info>
- <title xml:id="installFreezes-ti1">The Install Freezes</title>
- </info>
+ <section xml:id="installFreezes">
+ <info>
+ <title xml:id="installFreezes-ti1">The Install Freezes</title>
+ </info>
- <para>If the system appeared to freeze during the installation, this may be a
+ <para>If the system appeared to freeze during the installation, this may be a
problem with hardware detection. In this case the automatic detection of
hardware may be bypassed and dealt with later. To try this, type
<code>noauto</code> at the prompt. This option may also be combined with
other options as necessary.</para>
- </section>
+ </section>
- <section xml:id="kernelOptions">
- <info>
- <title xml:id="kernelOptions-ti1">RAM problem</title>
- </info>
+ <section xml:id="kernelOptions">
+ <info>
+ <title xml:id="kernelOptions-ti1">RAM problem</title>
+ </info>
- <para>These will rarely be needed, but in some cases the hardware may report the
+ <para>These will rarely be needed, but in some cases the hardware may report the
available RAM incorrectly. To specify this manually, you can use the
<code>mem=xxxM</code> parameter, where xxx is the correct amount of
RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
- </section>
+ </section>
- <section xml:id="DynamicPartitions">
- <info>
- <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
- </info>
+ <section xml:id="DynamicPartitions">
+ <info>
+ <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
+ </info>
- <para>If you converted your hard disk from "basic" format to "dynamic" format on
+ <para>If you converted your hard disk from "basic" format to "dynamic" format on
Microsoft Windows, you must know that it is impossible to install Mageia on
this disc. To go back to a basic disk, see the Microsoft documentation:
<link
ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
- </section>
</section>
+ </section>
</section>
diff --git a/docs/installer/sl/minimal-install.xml b/docs/installer/sl/minimal-install.xml
index 2156d572..c9573833 100644
--- a/docs/installer/sl/minimal-install.xml
+++ b/docs/installer/sl/minimal-install.xml
@@ -1,24 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="minimal-install">
- <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="minimal-install"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1999/xhtml"
+ xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xlink"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+ <!--2012-12-26 marja - exported this section from choosePackages.xml to
+ start a new page-->
<!--2013-05-05 marja - added screenshot and s/next/related/ -->
<info>
- <title xml:id="minimal-install-ti1">Minimalna namestitev</title>
- </info>
+ <title xml:id="minimal-install-ti1">Minimalna namestitev</title>
+ </info>
-
-
+
+
- <para>You can choose a Minimal Installation by de-selecting everything in the
+ <para>You can choose a Minimal Installation by de-selecting everything in the
Package Group Selection screen, see <xref
linkend="choosePackageGroups"></xref>.</para>
- <para>Minimal Installation is intended for those with specific uses in mind for
+ <para>If desired, you can additionally tick the "Individual package selection"
+option in the same screen.</para>
+ <para>Minimal Installation is intended for those with specific uses in mind for
their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with Manual Package
-Selection, see <xref linkend="choosePackagesTree"></xref>.</para>
- <para>If you choose this installation class, then the related screen will offer
+workstation. You will probably use this option combined with the "Individual
+package selection" option mentioned above, to fine-tune your installation,
+see <xref linkend="choosePackagesTree"></xref>.</para>
+ <para>If you choose this installation class, then the related screen will offer
you a few useful extras to install, such as documentation and X.</para>
+ <para>If selected, "With X" will also include IceWM as lightweight desktop
+environment.</para>
+ <para>The basic documentation is provided in the form of man and info pages. It
+contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
-<mediaobject>
+ <mediaobject>
<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
</imageobject></mediaobject>
diff --git a/docs/installer/sl/setupBootloader.xml b/docs/installer/sl/setupBootloader.xml
index 628a3fb1..09ba3a1c 100644
--- a/docs/installer/sl/setupBootloader.xml
+++ b/docs/installer/sl/setupBootloader.xml
@@ -10,8 +10,13 @@
2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1" format="PNG"
-/> </imageobject></mediaobject>
+fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
+format="PNG"/> </imageobject></mediaobject>
+
+ <para><note>
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader (first drop down list) since only one is available</para>
+ </note></para>
<para xml:id="setupBootloader-pa1" revision="4">If you prefer different bootloader settings to those chosen automatically by
the installer, you can change them here.</para>
diff --git a/docs/installer/sl/setupBootloaderAddEntry.xml b/docs/installer/sl/setupBootloaderAddEntry.xml
index cf393cfc..bc7ddef7 100644
--- a/docs/installer/sl/setupBootloaderAddEntry.xml
+++ b/docs/installer/sl/setupBootloaderAddEntry.xml
@@ -13,10 +13,10 @@ relevant button in the <emphasis>Bootloader Configuration</emphasis> screen
and editing the screen that pops up on top of it.</para>
<note>
- <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
-this tool to edit entries at this step, press 'Next'. You need to manually
-edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
-instead.</para>
+ <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
+UEFI systems, you cannot use this tool to edit entries at this step, press
+'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
+<code>grub-customizer</code> instead.</para>
</note>
<mediaobject>
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-18 19:16:21 +0000