aboutsummaryrefslogtreecommitdiffstats
path: root/docs/mcc-help/en
diff options
context:
space:
mode:
Diffstat (limited to 'docs/mcc-help/en')
-rw-r--r--docs/mcc-help/en/drakboot.xml90
-rw-r--r--docs/mcc-help/en/drakedm.xml21
-rw-r--r--docs/mcc-help/en/draksound.xml50
3 files changed, 51 insertions, 110 deletions
diff --git a/docs/mcc-help/en/drakboot.xml b/docs/mcc-help/en/drakboot.xml
index 04fe580f..75fe7085 100644
--- a/docs/mcc-help/en/drakboot.xml
+++ b/docs/mcc-help/en/drakboot.xml
@@ -1,40 +1,30 @@
-<?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" xml:id="drakboot" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xml:id="drakboot" version="5.0">
<info>
<title xml:id="drakboot-ti1">Set up boot system</title>
-
<subtitle>drakboot</subtitle>
</info>
-
<mediaobject>
<imageobject>
<imagedata format="PNG" xml:id="drakboot--boot-im1" align="center" fileref="drakboot--boot.png" revision="1"/>
</imageobject>
</mediaobject>
-
<para>If you are using a UEFI system instead of BIOS, the user interface is
- slightly different as you cannot choose the boot loader (first drop down
- list) since only one is available.</para>
-
+ slightly different as the boot device is obviously the EFI system Partition
+ (ESP).</para>
<mediaobject>
<imageobject>
<imagedata fileref="drakboot--boot2.png"/>
</imageobject>
</mediaobject>
-
- <para>This tool<footnote>
- <para>You can start this tool from the command line, by typing <emphasis role="bold">drakboot</emphasis> as root.</para>
- </footnote> allows you to configure the boot options (choice of the
+ <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">drakboot</emphasis> as root.</para></footnote> allows you to configure the boot options (choice of the
bootloader, set a password, the default boot, etc.)</para>
-
<para>It is found under the Boot tab in the Mageia Control Center labeled
"Set up boot system".</para>
-
<warning>
<para>Don't use this tool if you don't know exactly what you are doing.
Changing some settings may prevent your machine from booting again
!</para>
</warning>
-
<para>In the first part, called <guilabel>Bootloader</guilabel>, it is
possible if using BIOS, to choose which <guibutton>Bootloader to
use</guibutton>, Grub, Grub2 or Lilo, and with a graphical or a text menu.
@@ -42,44 +32,33 @@
also set the <guibutton>Boot device</guibutton>, don't change anything here
unless you are an expert. The boot device is where the bootloader is
installed and any modification can prevent your machine from booting.</para>
-
- <para>In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and
+ <para>In a UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and
is installed in /boot/EFI partition. This FAT32 formatted partition is
common to all operating systems installed.</para>
-
<para>In the second part, called <guilabel>Main options</guilabel>, you can
set the <guibutton>Delay before booting default image</guibutton>, in
seconds. During this delay, Grub or Lilo will display the list of available
operating systems, prompting you to make your choice. If no selection is
made, the bootloader will boot the default one once the delay
elapses.</para>
-
<para>In the third and last part, called <guibutton>Security</guibutton>, it
is possible to set a password.</para>
-
<para>The <guibutton>Advanced</guibutton> button gives some extra
options.</para>
-
<para><guibutton>Enable ACPI:</guibutton></para>
-
<para>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. Check this box if your hardware is ACPI
compatible.</para>
-
<para><guibutton>Enable SMP:</guibutton></para>
-
<para>SMP stands for Symmetric Multi Processors, it's an architecture for
multicore processors.</para>
-
<note>
<para>If you have a processor with HyperThreading, Mageia will see it as a
dual processor and enable SMP.</para>
</note>
-
<para><guibutton>Enable APIC</guibutton> and <guibutton>Enable Local
APIC:</guibutton></para>
-
<para>APIC stands for Advanced Programmable Interrupt Controller. There are
two components in the Intel APIC system, the local APIC (LAPIC) and the I/O
APIC. The latter one routes the interrupts it receives from peripheral buses
@@ -88,21 +67,15 @@
system which can cause freezes or incorrect device detection (error message
"spurious 8259A interrupt: IRQ7"). In this case, disable APIC and/or Local
APIC.</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="drakboot1.png"/>
</imageobject>
</mediaobject>
-
- <para>The <guibutton>Next</guibutton> screen differs depending on whether
- you have an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis>
- system.</para>
-
+ <para>The <guibutton>Next</guibutton> screen differs depending on which boot loader you chose.</para>
<itemizedlist>
<listitem>
- <para>You have a <emphasis>BIOS</emphasis> system:</para>
-
+ <para>You have Grub Legacy or Lilo:</para>
<para>In this case, you can see the list of all the available entries at
boot time. The default one is asterisked. To change the order of the
menu entries, click on the up or down arrows to move the selected item.
@@ -110,66 +83,67 @@
<guibutton>Modify</guibutton> buttons, a new window appears to add a new
entry in the bootloader menu or to modify an existing one. You need to
be familiar with Lilo or Grub to be able to use these tools.</para>
-
<mediaobject>
<imageobject>
<imagedata fileref="drakboot2.png"/>
</imageobject>
</mediaobject>
-
<para>The <guilabel>Label</guilabel> field is freeform, write here what
you want to be displayed in the menu. It matches the Grub command
"title". For example: Mageia3.</para>
-
<para>The <guilabel>Image</guilabel> field contains the kernel name. It
matches the Grub command "kernel". For example /boot/vmlinuz.</para>
-
<para>The <guilabel>Root</guilabel> field contains the device name where
the kernel is stored. It matches the Grub command "root". For example
(hd0,1).</para>
-
<para>The <guilabel>Append</guilabel> field contains the options to be
given to the kernel at boot time.</para>
-
<para>If the box <guilabel>Default</guilabel> is checked, Grub will boot
this entry by default.</para>
-
<para>In the extra screen called <guilabel>Advanced</guilabel>, it is
possible to choose the <guilabel>Video mode</guilabel>, an
<guilabel>initrd</guilabel> file and a <guilabel>network
profile</guilabel>, see <xref linkend="draknetprofile"/>, in the
drop-down lists.</para>
</listitem>
-
<listitem>
- <para>You have a <emphasis>UEFI</emphasis> system:</para>
-
- <para>In this case, the drop-down list displays all the available
- entries; click on the one wanted as the default one.</para>
-
+ <para>You have Grub2 or Grub2-efi (boot loaders used by default
+ respectively in Legacy mode and UEFI mode):</para>
+ <para>In this case, the drop-down list labelled
+ <guilabel>Default</guilabel> displays all the available entries; click
+ on the one wanted as the default one.</para>
<mediaobject>
<imageobject>
<imagedata fileref="drakboot3.png"/>
</imageobject>
</mediaobject>
-
<para>The <guilabel>Append</guilabel> field contains the options to be
given to the kernel at boot time.</para>
-
+ <para>If you have other operating systems installed, Mageia attempts to
+ add them to your Mageia boot menu. If you don't want this behaviour,
+ uncheck the box <guilabel>Probe Foreign OS</guilabel></para>
<para>In the extra screen called <guilabel>Advanced</guilabel>, it is
- possible to choose the <guilabel>Video mode</guilabel>.</para>
-
- <para>To set many other parameters, you can use <emphasis>Grub
- Customizer</emphasis>, available in the Mageia repositories (see
- below).</para>
-
+ possible to choose the <guilabel>Video mode</guilabel>. If you don't
+ want a bootable Mageia, but to chain load it from another OS, check the
+ box <guilabel>Do not touch ESP or MBR</guilabel> and accept the
+ warning.</para>
<mediaobject>
<imageobject>
- <imagedata xreflabel="titi" fileref="drakboot4.png"/>
+ <imagedata fileref="drakboot6.png"/>
+ </imageobject>
+ </mediaobject>
+ <warning>
+ <para>Not installing on ESP or MBR means that the installation is not
+ bootable unless chain loaded from another OS.</para>
+ </warning>
+ <para>To set many other parameters, you can use the tool named
+ <emphasis>Grub Customizer</emphasis>, available in the Mageia
+ repositories (see below).</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="drakboot4.png"/>
</imageobject>
</mediaobject>
</listitem>
</itemizedlist>
-
- <para/>
</section> \ No newline at end of file
diff --git a/docs/mcc-help/en/drakedm.xml b/docs/mcc-help/en/drakedm.xml
index 00dcea20..7c651760 100644
--- a/docs/mcc-help/en/drakedm.xml
+++ b/docs/mcc-help/en/drakedm.xml
@@ -1,28 +1,21 @@
-<?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" xml:id="drakedm" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:id="drakedm">
<info>
- <!--2012-09-03 marja: changed title to the title of this screen in MCC -->
-
+ <!--2012-09-03 marja: changed title to the title of this screen in MCC .  2017-04-10 simonnzg has looked and seems OK-->
<title xml:id="drakedm-ti1">Set up display manager</title>
-
<subtitle>drakedm</subtitle>
</info>
-
<mediaobject>
<imageobject>
- <imagedata xml:id="drakedm-im1" revision="1" align="center" format="PNG" fileref="drakedm.png"/>
+ <imagedata format="PNG" fileref="drakedm.png" align="center" xml:id="drakedm-im1" revision="1"/>
</imageobject>
</mediaobject>
-
- <para revision="1" xml:id="drakedm-pa1">Here<footnote>
- <para revision="1" xml:id="drakedm-pa3">You can start this tool from the
+ <para xml:id="drakedm-pa1" revision="1">Here<footnote><para xml:id="drakedm-pa3" revision="1">You can start this tool from the
command line, by typing <emphasis role="bold">drakedm</emphasis> as
- root.</para>
- </footnote> you can choose which display manager to use to log into your
+ root.</para></footnote> you can choose which display manager to use to log into your
desktop environment. Only the ones available on your system will be
shown.</para>
-
- <para revision="1" xml:id="drakedm-pa2">Most users will only notice that the
+ <para xml:id="drakedm-pa2" revision="1">Most users will only notice that the
provided login screens look different. However, there are differences in
- supported features, too. LXDM is a lightweight display manager, KDM and GDM
+ supported features, too. LXDM is a lightweight display manager, SDDM and GDM
have more extras.</para>
</section> \ No newline at end of file
diff --git a/docs/mcc-help/en/draksound.xml b/docs/mcc-help/en/draksound.xml
index 9bba4c80..7dcbb65e 100644
--- a/docs/mcc-help/en/draksound.xml
+++ b/docs/mcc-help/en/draksound.xml
@@ -1,60 +1,34 @@
-<?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" xml:id="draksound" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xml:id="draksound" version="5.0">
<info>
<title xml:id="draksound-ti1">Sound Configuration</title>
-
<subtitle>draksound</subtitle>
</info>
-
<mediaobject>
<imageobject>
- <imagedata revision="1" xml:id="draksound-im1" fileref="draksound.png" align="center" format="PNG"/>
+ <imagedata format="PNG" xml:id="draksound-im1" fileref="draksound.png" align="center" revision="1"/>
</imageobject>
</mediaobject>
-
- <para>This tool<footnote>
- <para>You can start this tool from the command line, by typing <emphasis role="bold">draksound</emphasis> as root.</para>
- </footnote> is present in the Mageia Control Center under the tab
+ <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">draksound</emphasis> as root.</para></footnote> is present in the Mageia Control Center under the tab
<emphasis role="bold">Hardware</emphasis>.</para>
-
- <para>Draksound deals with the sound configuration, including the driver
- choice, PulseAudio options and trouble shooting. It will help you if you
- experience sound problems or if you change the sound card.</para>
-
- <para>The drop down list called <guilabel>Driver</guilabel> allows you to
- select a driver from all the ones available on the computer that match the
- sound card.</para>
-
- <note>
- <para>Most of the time, it is possible to choose a driver using the OSS or
- ALSA API. OSS is the oldest and very basic, we recommend to choose ALSA
- when possible for its enhanced features.</para>
- </note>
-
+ <para>Draksound deals with the sound configuration, PulseAudio options and
+ troubleshooting. It will help you if you experience sound problems or if you
+ change the sound card.</para>
<para><guilabel>PulseAudio</guilabel> is a sound server. It receives all the
sound inputs, mixes them according to the user preferences and sends the
resulting sound to the output. See <guimenu>Menu ->Sound and video ->
PulseAudio volume control</guimenu> to set these preferences.</para>
-
<para>PulseAudio is the default sound server and it is recommended to leave
it enabled.</para>
-
<para><guilabel>Glitch-Free</guilabel> improves PulseAudio with some
programs. It is also recommended to leave it enabled.</para>
-
- <para>The button <guibutton>Advanced</guibutton> display a new window with
- two or three buttons:</para>
-
+ <para>The <guibutton>Troubleshooting</guibutton> button gives assistance
+ with fixing any problems you may have. You will find it helpful to try this
+ before asking the community for help.</para>
+ <para>The <guibutton>Advanced </guibutton>button<emphasis role="bold">
+ </emphasis>display a new window with an obvious button.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="Draksound1.png"/>
+ <imagedata fileref="draksound1.png"/>
</imageobject>
</mediaobject>
-
- <para>The first button gives total freedom of choice. You have to know what
- you are doing. This button is not available when the system has found a
- driver for your device.</para>
-
- <para>The second one is obvious and the last one gives assistance with
- fixing any problems you may have. You will find it helpful to try this
- before asking the community for help.</para>
</section> \ No newline at end of file