summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/2012-November/020141.html
blob: 94298ec49b6d53ea50b292e69ca0b773d00d5a43 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-dev] Not very important require about mail checker.
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Not%20very%20important%20require%20about%20mail%20checker.&In-Reply-To=%3C50AD2535.4050003%40googlemail.com%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="020128.html">
   <LINK REL="Next"  HREF="020146.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-dev] Not very important require about mail checker.</H1>
    <B>Anne Wilson</B> 
    <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Not%20very%20important%20require%20about%20mail%20checker.&In-Reply-To=%3C50AD2535.4050003%40googlemail.com%3E"
       TITLE="[Mageia-dev] Not very important require about mail checker.">cannewilson at googlemail.com
       </A><BR>
    <I>Wed Nov 21 20:02:13 CET 2012</I>
    <P><UL>
        <LI>Previous message: <A HREF="020128.html">[Mageia-dev] Not very important require about mail checker.
</A></li>
        <LI>Next message: <A HREF="020146.html">[Mageia-dev] Not very important require about mail checker.
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#20141">[ date ]</a>
              <a href="thread.html#20141">[ thread ]</a>
              <a href="subject.html#20141">[ subject ]</a>
              <a href="author.html#20141">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 21/11/2012 10:29, Andr&#233; Sala&#252;n wrote:
&gt;<i> Hello !
</I>&gt;<i> 
</I>&gt;<i> Is it possible to reintroduce gnubiff in Mageia 3. All mail 
</I>&gt;<i> checkers (in mga 2) depend on a wm. In kde they don't check the 
</I>&gt;<i> mail spooler, only kmail, gmail, thunderbird etc. Gnubiff is more 
</I>&gt;<i> versatile.
</I>&gt;<i> 
</I>&gt;<i> If I am wrong excuse me ;-) (but tell me which mail checker is 
</I>&gt;<i> running under every wm and able to check /var/spool/mail or 
</I>&gt;<i> $HOME/xxxx in a mbox format).
</I>&gt;<i> 
</I>&gt;<i> Anyway  thank you for your job : Mageia 2 seems to be very stable.
</I>&gt;<i> 
</I>&gt;<i> 
</I>KMail can certainly check /var/spool/mail, but you do have to tell it
to.  Create a new resource, of the type mbox, and point it to
/var/spool/mail.

Anne
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (MingW32)
Comment: Using GnuPG with undefined - <A HREF="http://www.enigmail.net/">http://www.enigmail.net/</A>

iEYEARECAAYFAlCtJS0ACgkQj93fyh4cnBd0QwCfaEdP5Yljf69MS5AYBAZjaZP6
IPUAnjpMCYTRfqHH25luoMbD0lR5JlJj
=j1ww
-----END PGP SIGNATURE-----
</PRE>

















<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="020128.html">[Mageia-dev] Not very important require about mail checker.
</A></li>
	<LI>Next message: <A HREF="020146.html">[Mageia-dev] Not very important require about mail checker.
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#20141">[ date ]</a>
              <a href="thread.html#20141">[ thread ]</a>
              <a href="subject.html#20141">[ subject ]</a>
              <a href="author.html#20141">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
58b2434e78f49bff8b63796767b82'>docs/docs/stable/installer/ca/doPartitionDisks.xml50
-rw-r--r--docs/docs/stable/installer/ca/firewall.xml32
-rw-r--r--docs/docs/stable/installer/ca/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/ca/installer.xml3
-rw-r--r--docs/docs/stable/installer/ca/setupBootloader.xml246
-rw-r--r--docs/docs/stable/installer/cs/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/cs/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/cs/setupBootloader.xml154
-rw-r--r--docs/docs/stable/installer/eo/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/eo/SelectAndUseISOs2.xml2
-rw-r--r--docs/docs/stable/installer/eo/addUser.xml33
-rw-r--r--docs/docs/stable/installer/eo/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/eo/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/eo/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/eo/configureX_monitor.xml29
-rw-r--r--docs/docs/stable/installer/eo/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/eo/diskdrake.xml13
-rw-r--r--docs/docs/stable/installer/eo/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/eo/firewall.xml34
-rw-r--r--docs/docs/stable/installer/eo/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/eo/installer.xml3
-rw-r--r--docs/docs/stable/installer/eo/reboot.xml2
-rw-r--r--docs/docs/stable/installer/eo/setupBootloader.xml250
-rw-r--r--docs/docs/stable/installer/eo/soundConfig.xml2
-rw-r--r--docs/docs/stable/installer/es/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/es/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/es/setupBootloader.xml170
-rw-r--r--docs/docs/stable/installer/eu/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/eu/SelectAndUseISOs2.xml12
-rw-r--r--docs/docs/stable/installer/eu/addUser.xml35
-rw-r--r--docs/docs/stable/installer/eu/bestTime.xml2
-rw-r--r--docs/docs/stable/installer/eu/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/eu/choosePackageGroups.xml6
-rw-r--r--docs/docs/stable/installer/eu/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/eu/configureX_chooser.xml21
-rw-r--r--docs/docs/stable/installer/eu/configureX_monitor.xml33
-rw-r--r--docs/docs/stable/installer/eu/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/eu/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/eu/doPartitionDisks.xml51
-rw-r--r--docs/docs/stable/installer/eu/firewall.xml32
-rw-r--r--docs/docs/stable/installer/eu/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/eu/installer.xml5
-rw-r--r--docs/docs/stable/installer/eu/misc-params.xml6
-rw-r--r--docs/docs/stable/installer/eu/securityLevel.xml2
-rw-r--r--docs/docs/stable/installer/eu/selectKeyboardLive.xml2
-rw-r--r--docs/docs/stable/installer/eu/setupBootloader.xml258
-rw-r--r--docs/docs/stable/installer/eu/software.xml2
-rw-r--r--docs/docs/stable/installer/fr/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/fr/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/fr/setupBootloader.xml165
-rw-r--r--docs/docs/stable/installer/hr/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/hr/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/hr/setupBootloader.xml154
-rw-r--r--docs/docs/stable/installer/hu/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/hu/addUser.xml33
-rw-r--r--docs/docs/stable/installer/hu/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/hu/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/hu/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/hu/configureX_monitor.xml31
-rw-r--r--docs/docs/stable/installer/hu/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/hu/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/hu/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/hu/firewall.xml32
-rw-r--r--docs/docs/stable/installer/hu/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/hu/installer.xml3
-rw-r--r--docs/docs/stable/installer/hu/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/hu/software.xml2
-rw-r--r--docs/docs/stable/installer/id/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/id/addUser.xml33
-rw-r--r--docs/docs/stable/installer/id/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/id/configureX_card_list.xml8
-rw-r--r--docs/docs/stable/installer/id/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/id/configureX_monitor.xml28
-rw-r--r--docs/docs/stable/installer/id/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/id/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/id/doPartitionDisks.xml48
-rw-r--r--docs/docs/stable/installer/id/firewall.xml32
-rw-r--r--docs/docs/stable/installer/id/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/id/installer.xml3
-rw-r--r--docs/docs/stable/installer/id/setupBootloader.xml250
-rw-r--r--docs/docs/stable/installer/id/software.xml2
-rw-r--r--docs/docs/stable/installer/it/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/it/addUser.xml33
-rw-r--r--docs/docs/stable/installer/it/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/it/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/it/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/it/configureX_monitor.xml27
-rw-r--r--docs/docs/stable/installer/it/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/it/diskdrake.xml13
-rw-r--r--docs/docs/stable/installer/it/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/it/firewall.xml32
-rw-r--r--docs/docs/stable/installer/it/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/it/installer.xml3
-rw-r--r--docs/docs/stable/installer/it/setupBootloader.xml250
-rw-r--r--docs/docs/stable/installer/it/software.xml2
-rw-r--r--docs/docs/stable/installer/nb/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/nb/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/nb/setupBootloader.xml164
-rw-r--r--docs/docs/stable/installer/nl/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/nl/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/nl/setupBootloader.xml154
-rw-r--r--docs/docs/stable/installer/pl/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/pl/addUser.xml33
-rw-r--r--docs/docs/stable/installer/pl/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/pl/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/pl/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/pl/configureX_monitor.xml27
-rw-r--r--docs/docs/stable/installer/pl/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/pl/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/pl/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/pl/firewall.xml34
-rw-r--r--docs/docs/stable/installer/pl/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/pl/installer.xml3
-rw-r--r--docs/docs/stable/installer/pl/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/pl/software.xml2
-rw-r--r--docs/docs/stable/installer/pt/DrakLive-cover.xml6
-rw-r--r--docs/docs/stable/installer/pt/DrakLive.xml13
-rw-r--r--docs/docs/stable/installer/pt/DrakX-cover.xml6
-rw-r--r--docs/docs/stable/installer/pt/DrakX-inline.xml6
-rw-r--r--docs/docs/stable/installer/pt/DrakX.xml6
-rw-r--r--docs/docs/stable/installer/pt/addUser.xml33
-rw-r--r--docs/docs/stable/installer/pt/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/pt/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/pt/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/pt/configureX_monitor.xml31
-rw-r--r--docs/docs/stable/installer/pt/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/pt/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/pt/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/pt/firewall.xml32
-rw-r--r--docs/docs/stable/installer/pt/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/pt/installer.xml3
-rw-r--r--docs/docs/stable/installer/pt/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/pt/software.xml2
-rw-r--r--docs/docs/stable/installer/pt_BR/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/pt_BR/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/pt_BR/setupBootloader.xml165
-rw-r--r--docs/docs/stable/installer/ro/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/ro/addUser.xml33
-rw-r--r--docs/docs/stable/installer/ro/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/ro/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/ro/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/ro/configureX_monitor.xml28
-rw-r--r--docs/docs/stable/installer/ro/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/ro/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/ro/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/ro/firewall.xml34
-rw-r--r--docs/docs/stable/installer/ro/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/ro/installer.xml3
-rw-r--r--docs/docs/stable/installer/ro/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/ro/software.xml2
-rw-r--r--docs/docs/stable/installer/ru/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/ru/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/ru/setupBootloader.xml165
-rw-r--r--docs/docs/stable/installer/sk/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/sk/addUser.xml33
-rw-r--r--docs/docs/stable/installer/sk/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/sk/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/sk/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/sk/configureX_monitor.xml29
-rw-r--r--docs/docs/stable/installer/sk/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/sk/diskdrake.xml13
-rw-r--r--docs/docs/stable/installer/sk/doPartitionDisks.xml48
-rw-r--r--docs/docs/stable/installer/sk/firewall.xml32
-rw-r--r--docs/docs/stable/installer/sk/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/sk/installer.xml3
-rw-r--r--docs/docs/stable/installer/sk/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/sk/software.xml2
-rw-r--r--docs/docs/stable/installer/sl/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/sl/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/sl/setupBootloader.xml154
-rw-r--r--docs/docs/stable/installer/sq/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/sq/addUser.xml76
-rw-r--r--docs/docs/stable/installer/sq/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/sq/configureX_card_list.xml8
-rw-r--r--docs/docs/stable/installer/sq/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/sq/configureX_monitor.xml26
-rw-r--r--docs/docs/stable/installer/sq/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/sq/doPartitionDisks.xml61
-rw-r--r--docs/docs/stable/installer/sq/firewall.xml34
-rw-r--r--docs/docs/stable/installer/sq/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/sq/installer.xml3
-rw-r--r--docs/docs/stable/installer/sq/setupBootloader.xml269
-rw-r--r--docs/docs/stable/installer/sr/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/sr/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/sr/setupBootloader.xml164
-rw-r--r--docs/docs/stable/installer/sv/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/sv/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/sv/setupBootloader.xml154
-rw-r--r--docs/docs/stable/installer/tg/DrakLive-cover.xml30
-rw-r--r--docs/docs/stable/installer/tg/DrakLive.xml25
-rw-r--r--docs/docs/stable/installer/tg/DrakX-cover.xml30
-rw-r--r--docs/docs/stable/installer/tg/DrakX-inline.xml26
-rw-r--r--docs/docs/stable/installer/tg/DrakX.xml26
-rw-r--r--docs/docs/stable/installer/tg/addUser.xml33
-rw-r--r--docs/docs/stable/installer/tg/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/tg/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/tg/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/tg/configureX_monitor.xml29
-rw-r--r--docs/docs/stable/installer/tg/diskPartitioning.xml4
-rw-r--r--docs/docs/stable/installer/tg/diskdrake.xml13
-rw-r--r--docs/docs/stable/installer/tg/doPartitionDisks.xml49
-rw-r--r--docs/docs/stable/installer/tg/firewall.xml32
-rw-r--r--docs/docs/stable/installer/tg/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/tg/installer.xml3
-rw-r--r--docs/docs/stable/installer/tg/setupBootloader.xml250
-rw-r--r--docs/docs/stable/installer/tg/software.xml2
-rw-r--r--docs/docs/stable/installer/tr/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/tr/addUser.xml71
-rw-r--r--docs/docs/stable/installer/tr/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/tr/configureX_card_list.xml8
-rw-r--r--docs/docs/stable/installer/tr/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/tr/configureX_monitor.xml26
-rw-r--r--docs/docs/stable/installer/tr/diskdrake.xml13
-rw-r--r--docs/docs/stable/installer/tr/doPartitionDisks.xml48
-rw-r--r--docs/docs/stable/installer/tr/firewall.xml34
-rw-r--r--docs/docs/stable/installer/tr/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/tr/installer.xml3
-rw-r--r--docs/docs/stable/installer/tr/setupBootloader.xml246
-rw-r--r--docs/docs/stable/installer/uk.po139
-rw-r--r--docs/docs/stable/installer/zh_CN/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/zh_CN/addUser.xml33
-rw-r--r--docs/docs/stable/installer/zh_CN/bootLive.xml56
-rw-r--r--docs/docs/stable/installer/zh_CN/configureX_card_list.xml10
-rw-r--r--docs/docs/stable/installer/zh_CN/configureX_chooser.xml19
-rw-r--r--docs/docs/stable/installer/zh_CN/configureX_monitor.xml30
-rw-r--r--docs/docs/stable/installer/zh_CN/diskPartitioning.xml2
-rw-r--r--docs/docs/stable/installer/zh_CN/diskdrake.xml15
-rw-r--r--docs/docs/stable/installer/zh_CN/doPartitionDisks.xml45
-rw-r--r--docs/docs/stable/installer/zh_CN/firewall.xml34
-rw-r--r--docs/docs/stable/installer/zh_CN/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/zh_CN/installer.xml3
-rw-r--r--docs/docs/stable/installer/zh_CN/setupBootloader.xml252
-rw-r--r--docs/docs/stable/installer/zh_CN/software.xml2
-rw-r--r--docs/docs/stable/installer/zh_TW/DrakLive.xml7
-rw-r--r--docs/docs/stable/installer/zh_TW/installUpdates.xml27
-rw-r--r--docs/docs/stable/installer/zh_TW/setupBootloader.xml154
259 files changed, 5586 insertions, 5409 deletions
diff --git a/docs/docs/stable/installer/ast/DrakLive.xml b/docs/docs/stable/installer/ast/DrakLive.xml
index ba43133c..4314b913 100644
--- a/docs/docs/stable/installer/ast/DrakLive.xml
+++ b/docs/docs/stable/installer/ast/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Installation from LIVE medium</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/ast/installUpdates.xml b/docs/docs/stable/installer/ast/installUpdates.xml
index dc77bfff..4c3e3cc2 100644
--- a/docs/docs/stable/installer/ast/installUpdates.xml
+++ b/docs/docs/stable/installer/ast/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ast">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ast" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Updates</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ast/setupBootloader.xml b/docs/docs/stable/installer/ast/setupBootloader.xml
index 7307e843..a1797029 100644
--- a/docs/docs/stable/installer/ast/setupBootloader.xml
+++ b/docs/docs/stable/installer/ast/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ast" xreflabel="Bootloader" xml:id="setupBootloader"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ast" xml:id="setupBootloader">
+
-
-
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -39,40 +22,32 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Bootloader</title>
</info>
-
<section>
<title>Available Bootloaders</title>
-
<section>
<title>Grub2</title>
-
<itemizedlist>
<para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
-
<listitem>
<para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
</listitem>
</itemizedlist>
-
<itemizedlist>
<para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
-
<listitem>
<para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
<para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
created by Windows and add grub2-efi to it. If no ESP exists, then one will
@@ -81,19 +56,15 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>rEFInd</title>
-
<itemizedlist>
<para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
-
<listitem>
<para>rEFInd has a nice graphical set of options, and can auto-detect installed
EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
</listitem>
</itemizedlist>
-
<note>
<para>Please note that in order to be able to use the <literal>rEFInd</literal>
option, an installed EFI System Partition must match your system
@@ -103,212 +74,180 @@ to you.</para>
</note>
</section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Bootloader main options</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
<itemizedlist>
<listitem>
<para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
<literal>UEFI</literal> systems.</para>
</listitem>
-
<listitem>
<para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
option solely for use with <literal>UEFI</literal> systems.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
<warning>
<para>Don't change this unless you really know what you are doing.</para>
</warning>
-
<note>
<para>There is no option to write GRUB to the boot sector of a partition (e.g:
<filename>sda1</filename>), as this method is considered unreliable.</para>
</note>
-
<para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Enable ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Bootloader Configuration</title>
-
<para>If, in the previous section you selected <literal>rEFInd</literal> as the
bootloader to use, you would then be presented with the options shown in the
screenshot directly below. Otherwise, please instead move on to the
subsequent screenshot for your options.</para>
-
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+ <para>Your rEFInd configuration options:</para>
<itemizedlist>
- <para>Your rEFInd configuration options:</para>
-
<listitem>
- <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
</listitem>
-
<listitem>
- <para><guimenuitem>Install in EFI/Boot partition (workaround for some
-BIOS's).</guimenuitem></para>
-
- <para>With some BIOS's, the newly written bootloader for Mageia at end of the
-installation will not be recognized. In that case, you can use this option
-as a workaround for the issue.</para>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para>If you did not select rEFInd as the bootloader to use in the previous
-section, then your bootloader configurations are shown below:</para>
-
+section, then your bootloader configuration options are shown below:</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
</listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
understand the implications, and wish to proceed.</para>
-
<warning>
<para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
supported by Mageia as it is likely to fail when attempting to boot this
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
</warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Other Options</title>
-
<section>
<title>Using an existing bootloader</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
<xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/DrakLive.xml b/docs/docs/stable/installer/bg/DrakLive.xml
index 7e1277de..e8c59aea 100644
--- a/docs/docs/stable/installer/bg/DrakLive.xml
+++ b/docs/docs/stable/installer/bg/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Инсталиране от ЖИВ образ</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/bg/addUser.xml b/docs/docs/stable/installer/bg/addUser.xml
index 38124cd4..3a23c69a 100644
--- a/docs/docs/stable/installer/bg/addUser.xml
+++ b/docs/docs/stable/installer/bg/addUser.xml
@@ -19,6 +19,10 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
<!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
<!--2018/02/24 apb: Changed list style.-->
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<para>It is advisable for all Mageia installations to set a
<literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a 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 underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
<note xml:id="givePassword">
+ <para>As you type a password into the top box a 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.</para>
+
<para>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.</para>
</note>
@@ -78,14 +86,19 @@ computer for.</para>
<para>Enter the user login name or let DrakX use a version of the user's real
name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
+ <caution condition="live">
+ <simpara>The login entered here should be different to any login currently in use for
+your <filename>/home</filename> directory. Some user parameters will be
+written in the user space, and some can overwrite actual data such as
+Firefox, Thunderbird or Kmail data...</simpara>
+ </caution>
</listitem>
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
- <para>Type in the user password. There is a shield at the end of the text box that
-indicates the strength of the password. (See also <xref
-linkend="givePassword"/>)</para>
+ <para>Type in the user password (remembering the advice in the Note above).</para>
<para><emphasis role="bold">Password (again):</emphasis> Retype the user
password. DrakX will check that you have not mistyped the password.</para>
diff --git a/docs/docs/stable/installer/bg/bootLive.xml b/docs/docs/stable/installer/bg/bootLive.xml
index 6d968203..99a2fd47 100644
--- a/docs/docs/stable/installer/bg/bootLive.xml
+++ b/docs/docs/stable/installer/bg/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="bg">
-
-
-
-
-
-
-
<info>
<!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -30,20 +17,16 @@
DVD.-->
<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
</info>
-
<section xml:id="bootLive-1">
<info>
<title xml:id="bootLive1-ti1">Booting the medium</title>
</info>
-
<para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
the USB device in or place the DVD in the drive and restart the computer.</para>
-
<para>If the computer does not automatically boot from the USB or DVD you may need
to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
accessing the boot device menu to select a device from which the computer
will boot.</para>
-
<tip>
<para>To access the BIOS or boot menu when the computer is starting, you can try
pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
boot device menu. These (fairly common) keys are just a selection of
possible options though.</para>
</tip>
-
<note>
<para>The actual screen that you will first see when booting from the Live media
will depend on whether your computer motherboard is of the Legacy (BIOS) or
UEFI type.</para>
</note>
</section>
-
<section xml:id="biosmode">
<info>
<title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
</info>
-
<mediaobject>
- <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+ <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
</imageobject>
-
<caption>
<para>First screen while booting in BIOS mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS).</para>
-
<para>Once the boot is done, you can proceed to the installation.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Boot the Mageia Live system using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Install Mageia using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Memory Test</emphasis></para>
-
<para>Test the installed RAM by performing multiple read and write
operations. Reboot to end the test.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
</section>
-
<section xml:id="uefimode">
<info>
<title xml:id="uefimode-ti1">In UEFI mode</title>
</info>
-
<mediaobject condition="live">
- <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+ <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
<caption>
<para>First screen while booting in UEFI mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS). Once the
boot is done, you can proceed to the installation</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
-
<note>
<para>If you booted from a USB stick, you will see the above menu options
duplicated, and in this case, you should choose from the menu pair that will
be suffixed with "USB".</para>
</note>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/configureX_card_list.xml b/docs/docs/stable/installer/bg/configureX_card_list.xml
index 0de1accc..9a20916d 100644
--- a/docs/docs/stable/installer/bg/configureX_card_list.xml
+++ b/docs/docs/stable/installer/bg/configureX_card_list.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_card_list"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg"
+ xreflabel="Choose an X Server (Configure your Graphic Card)"
+ xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
+
+
<info>
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -28,6 +31,7 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
</info>
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
<para>If the installer has not correctly detected your graphic card and you know
which one you have, you can select it from the tree by: <itemizedlist>
<listitem>
- <para>Vendor</para>
+ <para>Производител</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/bg/configureX_chooser.xml b/docs/docs/stable/installer/bg/configureX_chooser.xml
index 5279e24a..a77996b9 100644
--- a/docs/docs/stable/installer/bg/configureX_chooser.xml
+++ b/docs/docs/stable/installer/bg/configureX_chooser.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_chooser"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg" xreflabel="Graphics Card and Monitor Configuration"
+ xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
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">
- <info>
- <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title>
- </info>
+
@@ -21,12 +19,17 @@
- <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+ <info>
+ <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
<!--2018/02/15 apb: Some text and typography.-->
<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
<!--2018/02/23 apb: Typo.-->
<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+ </info>
+
+ <mediaobject>
<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
<para>If you need to, you can select a specific card from this expandable
list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/bg/configureX_monitor.xml b/docs/docs/stable/installer/bg/configureX_monitor.xml
index 31d5747f..7f7eb36d 100644
--- a/docs/docs/stable/installer/bg/configureX_monitor.xml
+++ b/docs/docs/stable/installer/bg/configureX_monitor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="configureX_monitor"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="bg" xreflabel="Choosing your Monitor"
+ xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
+
+
+
+
<info>
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -25,6 +29,8 @@
<!---->
<!--2018/02/12 apb: Text and typography-->
<!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
<title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
</info>
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+ <term revision="1" xml:id="configureX_monitor-pa2">Позволи на отделни потребители</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -60,7 +66,7 @@ consult your monitor documentation.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+ <term revision="1" xml:id="configureX_monitor-pa5">Plug & Play</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -69,11 +75,11 @@ type from the monitor database.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+ <term revision="1" xml:id="configureX_monitor-pa7">Производител</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting:</para>
+one you have, you can choose it from the options by selecting:</para>
</listitem>
</varlistentry>
</variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+ <term revision="1" xml:id="configureX_monitor-pa9">Общ</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically. Once again it
-may be wise to be conservative in your selections.</para>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docs/stable/installer/bg/diskPartitioning.xml b/docs/docs/stable/installer/bg/diskPartitioning.xml
index ac4e29b5..677c101e 100644
--- a/docs/docs/stable/installer/bg/diskPartitioning.xml
+++ b/docs/docs/stable/installer/bg/diskPartitioning.xml
@@ -2,7 +2,7 @@
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Управление на дискови дялове</title>
<xi:include href="doPartitionDisks.xml"/>
diff --git a/docs/docs/stable/installer/bg/diskdrake.xml b/docs/docs/stable/installer/bg/diskdrake.xml
index 19eb5f05..332e7c69 100644
--- a/docs/docs/stable/installer/bg/diskdrake.xml
+++ b/docs/docs/stable/installer/bg/diskdrake.xml
@@ -13,8 +13,10 @@
-
-
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
@@ -41,8 +44,8 @@ before you start.</para>
<listitem>
<para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/bg/doPartitionDisks.xml b/docs/docs/stable/installer/bg/doPartitionDisks.xml
index b2caf84a..0aa395ef 100644
--- a/docs/docs/stable/installer/bg/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/bg/doPartitionDisks.xml
@@ -20,6 +20,10 @@
+
+
+
+
<info>
<!--lebarhon 20161216 updated for Mageia 6
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
<!--2018/02/21 apb: Changed list styles.-->
<!--2018/02/24 apb: Changed list styles.-->
<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
@@ -68,14 +74,30 @@ your new Mageia installation.</para>
<para revision="1" xml:id="suggestedPartitioning-pa9">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!</para>
+installation but see the warning below.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the proposed Mageia partition in dark blue with their
intended sizes just underneath. You have the option to modify these sizes by
clicking and dragging the gap between both partitions. See the following
-screenshot:</para>
+screenshot:<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para>
+
+ <warning>
+ <para>This involves shrinking the size of the Windows partition, and therefore is
+a risky operation, so you should make sure you have backed up all important
+files before proceeding.</para>
+ </warning>
+
+ <important>
+ <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "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 for Mageia.</para>
+ </important>
</listitem>
<listitem>
@@ -88,15 +110,6 @@ screenshot:</para>
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.</para>
</warning>
-
- <important>
- <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
-partition must be "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. It is highly recommended to
-back up your personal files.</para>
- </important>
</listitem>
<listitem>
@@ -107,12 +120,6 @@ hard drive(s).</para>
</listitem>
</itemizedlist>
- <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
-
<para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
option, then the installer will allocate the available space according to
the following rules:</para>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
<important>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/bg/firewall.xml b/docs/docs/stable/installer/bg/firewall.xml
index 321e8298..086167dd 100644
--- a/docs/docs/stable/installer/bg/firewall.xml
+++ b/docs/docs/stable/installer/bg/firewall.xml
@@ -1,4 +1,13 @@
-<?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="firewall" version="5.0" xml:lang="bg" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xreflabel="Firewall" xml:id="firewall"
+ 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">
+
+
@@ -6,14 +15,19 @@
<info>
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/25 apb: Added xreflabel for this section.-->
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
<title xml:id="firewall-ti1">Защитна стена</title>
</info>
- <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+ <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they
determine which type of message from the Internet will be accepted by the
target system. This, in turn, allows the corresponding services on the
system to be accessible from the Internet.</para>
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
<para>In the default setting (no button is checked), no service of the system is
accessible from the network. The <emphasis>Everything (no
firewall)</emphasis> option enables access to all services of the machine -
@@ -33,15 +47,15 @@ from the network.</para>
a series of services by typing a list of <quote>couples</quote> (blank
separated)</para>
- <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+ <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
<simplelist>
- <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
-the service you want to enable (e.g. 873 for the RSYNC service) as defined
-in <emphasis>RFC-433</emphasis>;</member>
+ <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned
+to the service you want to enable (e.g. 873 for the RSYNC service) as
+defined in <emphasis>RFC-433</emphasis>;</member>
- <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+ <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis>
+or <emphasis>UDP</emphasis> - the internet protocol that is used by the
service.</member>
</simplelist>
@@ -50,4 +64,4 @@ is <emphasis>873/tcp</emphasis>.</para>
<para>In case a service is implemented to use both protocols, you specify 2
couples for the same port.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/installUpdates.xml b/docs/docs/stable/installer/bg/installUpdates.xml
index d97faf9d..e53a3a52 100644
--- a/docs/docs/stable/installer/bg/installUpdates.xml
+++ b/docs/docs/stable/installer/bg/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Обновявания</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/installer.xml b/docs/docs/stable/installer/bg/installer.xml
index 17f127ab..50bc5985 100644
--- a/docs/docs/stable/installer/bg/installer.xml
+++ b/docs/docs/stable/installer/bg/installer.xml
@@ -26,6 +26,8 @@
+
+
<info>
<!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
@@ -39,6 +41,7 @@
<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
<title xml:id="installer-ti1">DrakX, инсталатора на Mageia</title>
</info>
diff --git a/docs/docs/stable/installer/bg/setupBootloader.xml b/docs/docs/stable/installer/bg/setupBootloader.xml
index b4f035b8..6044f476 100644
--- a/docs/docs/stable/installer/bg/setupBootloader.xml
+++ b/docs/docs/stable/installer/bg/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xreflabel="Bootloader" xml:id="setupBootloader"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="bg" xml:id="setupBootloader">
+
+
+
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
<!--2019/01/06 apb: Typo.-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Програма за начално зареждане</title>
</info>
-
<section>
- <title>Grub2</title>
-
- <itemizedlist>
- <title>Grub2 on Legacy MBR/GPT systems</title>
-
- <listitem>
- <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+ <title>Available Bootloaders</title>
+ <section>
+ <title>Grub2</title>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
+ <listitem>
+ <para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader will be written into either the MBR (Master
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Grub2-efi on UEFI systems</title>
-
- <listitem>
- <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
+ <listitem>
+ <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
- <para>If there are already UEFI-based operating systems installed on your computer
+ <para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
-created by Windows and add grub2-efi to it. If no ESP exists, then one will
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
be created. Although it is possible to have several ESPs, only one is
required, whatever the number of operating systems you have.</para>
- </listitem>
- </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>rEFInd</title>
+ <itemizedlist>
+ <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+ <listitem>
+ <para>rEFInd has a nice graphical set of options, and can auto-detect installed
+EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>Please note that in order to be able to use the <literal>rEFInd</literal>
+option, an installed EFI System Partition must match your system
+architecture: if you have a 32bit EFI System Partition installed on a 64bit
+machine for instance, then the rEFInd option will not be displayed/available
+to you.</para>
+ </note>
+ </section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Опции на програмата за начално зареждане</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
- <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
-systems will not see this option here.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
+can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
+<literal>UEFI</literal> systems.</para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
+option solely for use with <literal>UEFI</literal> systems.</para>
+ </listitem>
+ </itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
- <para>Don't change this unless you really know what you are doing</para>
+ <warning>
+ <para>Don't change this unless you really know what you are doing.</para>
+ </warning>
+ <note>
+ <para>There is no option to write GRUB to the boot sector of a partition (e.g:
+<filename>sda1</filename>), as this method is considered unreliable.</para>
+ </note>
+ <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
+listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Enable ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
- <title>Bootloader Configuration</title>
-
+ <title>Конфигуриране на програмата за начално зареждане</title>
+ <para>If, in the previous section you selected <literal>rEFInd</literal> as the
+bootloader to use, you would then be presented with the options shown in the
+screenshot directly below. Otherwise, please instead move on to the
+subsequent screenshot for your options.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+ <para>Your rEFInd configuration options:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
+ </itemizedlist>
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
-then untick the Probe Foreign OS option.</para>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
-missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
-implications, and wish to proceed.</para>
+missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+understand the implications, and wish to proceed.</para>
+ <warning>
+ <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
+supported by Mageia as it is likely to fail when attempting to boot this
+resulting installation of Mageia. If you use anything other than GRUB2 or
+rEFInd for this purpose, then you do so at your own risk!</para>
+ </warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
- <title>Other Options</title>
-
+ <title>Други параметри</title>
<section>
<title>Using an existing bootloader</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
- <xi:include href="setupBootloaderAddEntry.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/DrakLive.xml b/docs/docs/stable/installer/ca/DrakLive.xml
index 9fd4fc16..02d0b699 100644
--- a/docs/docs/stable/installer/ca/DrakLive.xml
+++ b/docs/docs/stable/installer/ca/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Instal·lació des d'un mitjà AUTÒNOM</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/ca/addUser.xml b/docs/docs/stable/installer/ca/addUser.xml
index c0d96256..e4c538f4 100644
--- a/docs/docs/stable/installer/ca/addUser.xml
+++ b/docs/docs/stable/installer/ca/addUser.xml
@@ -1,12 +1,28 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ca" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="addUser" 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">
<info>
<title xml:id="addUser-ti1">User Management</title>
</info>
+
+
+
+
+
+
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
<!--2018/02/12 apb: Text and Typography.-->
@@ -14,47 +30,63 @@
<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
<!--2018/02/24 apb: Changed list style.-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
<section xml:id="root-password">
<info>
<title xml:id="root-password-ti2">Estableix la contrasenya d'administrador (root):</title>
</info>
+
<para>It is advisable for all Mageia installations to set a
<literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a 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 underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
+
<note xml:id="givePassword">
+ <para>As you type a password into the top box a 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.</para>
+
<para>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.</para>
</note>
</section>
+
<section xml:id="enterUser">
<info>
<title xml:id="enterUser-ti3">Introduïu un usuari</title>
</info>
+
<para>Add a User here. A regular user has fewer privileges than the
<literal>superuser</literal> (root), but enough to use the Internet, office
applications or play games and anything else the average user might use a
computer for.</para>
+
<itemizedlist>
<listitem>
<para><emphasis role="bold">Icona</emphasis></para>
+
<para>Feu clic a aquest botó si voleu canviar la icona de l'usuari</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Real Name</emphasis></para>
+
<para>Insert the user's real name into this text box</para>
</listitem>
+
<listitem>
<para><emphasis role="bold">Login Name</emphasis></para>
+
<para>Enter the user login name or let DrakX use a version of the user's real
name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
<caution condition="live">
<simpara>The login entered here should be different to any login currently in use for
your <filename>/home</filename> directory. Some user parameters will be
@@ -62,45 +94,54 @@ written in the user space, and some can overwrite actual data such as
Firefox, Thunderbird or Kmail data...</simpara>
</caution>
</listitem>
+
<listitem>
<para><emphasis role="bold">Contrasenya</emphasis></para>
- <para>Type in the user password. There is a shield at the end of the text box that
-indicates the strength of the password. (See also <xref
-linkend="givePassword"/>)</para>
+
+ <para>Type in the user password (remembering the advice in the Note above).</para>
+
<para><emphasis role="bold">Password (again):</emphasis> Retype the user
password. DrakX will check that you have not mistyped the password.</para>
</listitem>
</itemizedlist>
+
<note>
<para>Any users added while installing Mageia, will have a home directory that is
both read and write protected (umask=0027)</para>
+
<para>You can add any extra needed users in the <emphasis>Configuration -
Summary</emphasis> step during the install. Choose <emphasis>User
management</emphasis>.</para>
+
<para>Els permisos d'accés també es poden modificar després de la instal·lació.</para>
</note>
</section>
- <section xml:id="addUserAdvanced" condition="classical">
+
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
</info>
+
<para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
for the user you are adding.</para>
+
<itemizedlist>
<listitem>
<para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
shell available to any user you added in the previous screen. Options are
<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
</listitem>
+
<listitem>
<para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
added in the previous screen. If you are unsure what the purpose of this is,
then leave it blank.</para>
</listitem>
+
<listitem>
<para><emphasis>Group ID</emphasis>: This lets you set the group ID. Again, if
unsure, leave it blank.</para>
</listitem>
</itemizedlist>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/bootLive.xml b/docs/docs/stable/installer/ca/bootLive.xml
index a32017a4..d72ae170 100644
--- a/docs/docs/stable/installer/ca/bootLive.xml
+++ b/docs/docs/stable/installer/ca/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ca">
-
-
-
-
-
-
-
<info>
<!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -30,20 +17,16 @@
DVD.-->
<title xml:id="bootLive-ti1">Arrencada de Mageia com a sistema autònom</title>
</info>
-
<section xml:id="bootLive-1">
<info>
<title xml:id="bootLive1-ti1">Arrencada del mitjà</title>
</info>
-
<para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
the USB device in or place the DVD in the drive and restart the computer.</para>
-
<para>If the computer does not automatically boot from the USB or DVD you may need
to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
accessing the boot device menu to select a device from which the computer
will boot.</para>
-
<tip>
<para>To access the BIOS or boot menu when the computer is starting, you can try
pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
boot device menu. These (fairly common) keys are just a selection of
possible options though.</para>
</tip>
-
<note>
<para>The actual screen that you will first see when booting from the Live media
will depend on whether your computer motherboard is of the Legacy (BIOS) or
UEFI type.</para>
</note>
</section>
-
<section xml:id="biosmode">
<info>
<title xml:id="biosmode-ti1">En mode BIOS/CSM/Legacy</title>
</info>
-
<mediaobject>
- <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+ <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
</imageobject>
-
<caption>
<para>La primera pantalla de l'arrencada en mode BIOS</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menú</title>
-
<listitem>
<para><emphasis role="bold">Arrenca Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS).</para>
-
<para>Once the boot is done, you can proceed to the installation.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Boot the Mageia Live system using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Instal·la Mageia</emphasis></para>
-
<para>Aquesta opció instal·larà Mageia a un disc dur.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Install Mageia using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Memory Test</emphasis></para>
-
<para>Test the installed RAM by performing multiple read and write
operations. Reboot to end the test.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
</section>
-
<section xml:id="uefimode">
<info>
<title xml:id="uefimode-ti1">En mode UEFI</title>
</info>
-
<mediaobject condition="live">
- <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+ <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
<caption>
<para>First screen while booting in UEFI mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menú</title>
-
<listitem>
<para><emphasis role="bold">Arrenca Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS). Once the
boot is done, you can proceed to the installation</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Instal·la Mageia</emphasis></para>
-
<para>Aquesta opció instal·larà Mageia a un disc dur.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
-
<note>
<para>If you booted from a USB stick, you will see the above menu options
duplicated, and in this case, you should choose from the menu pair that will
be suffixed with "USB".</para>
</note>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/configureX_card_list.xml b/docs/docs/stable/installer/ca/configureX_card_list.xml
index cd70945a..7e1c1328 100644
--- a/docs/docs/stable/installer/ca/configureX_card_list.xml
+++ b/docs/docs/stable/installer/ca/configureX_card_list.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_card_list"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca"
+ xreflabel="Choose an X Server (Configure your Graphic Card)"
+ xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
+
+
<info>
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -28,6 +31,7 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
<title xml:id="configureX_card_list-ti1">Tria del servidor de les X (configura la targeta gràfica)</title>
</info>
diff --git a/docs/docs/stable/installer/ca/configureX_chooser.xml b/docs/docs/stable/installer/ca/configureX_chooser.xml
index 201c958f..b1e47162 100644
--- a/docs/docs/stable/installer/ca/configureX_chooser.xml
+++ b/docs/docs/stable/installer/ca/configureX_chooser.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_chooser"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca" xreflabel="Graphics Card and Monitor Configuration"
+ xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
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">
- <info>
- <title xml:id="configureX_chooser-ti1">Configuració de targeta gràfica i monitor</title>
- </info>
+
@@ -21,12 +19,17 @@
- <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+ <info>
+ <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
<!--2018/02/15 apb: Some text and typography.-->
<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
<!--2018/02/23 apb: Typo.-->
<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+ </info>
+
+ <mediaobject>
<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
<para>If you need to, you can select a specific card from this expandable
list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/ca/configureX_monitor.xml b/docs/docs/stable/installer/ca/configureX_monitor.xml
index 58ce21ad..2f9daff0 100644
--- a/docs/docs/stable/installer/ca/configureX_monitor.xml
+++ b/docs/docs/stable/installer/ca/configureX_monitor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="configureX_monitor"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="ca" xreflabel="Choosing your Monitor"
+ xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
+
+
+
+
<info>
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -25,6 +29,8 @@
<!---->
<!--2018/02/12 apb: Text and typography-->
<!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
<title xml:id="configureX_monitor-ti1">Tria del monitor</title>
</info>
@@ -72,8 +78,8 @@ type from the monitor database.</para>
<term revision="1" xml:id="configureX_monitor-pa7">Fabricant</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa8">Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el
-podeu seleccionar de l'arbre:</para>
+ <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can choose it from the options by selecting:</para>
</listitem>
</varlistentry>
</variablelist>
@@ -93,11 +99,12 @@ podeu seleccionar de l'arbre:</para>
<term revision="1" xml:id="configureX_monitor-pa9">Genèric</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically. Once again it
-may be wise to be conservative in your selections.</para>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docs/stable/installer/ca/diskdrake.xml b/docs/docs/stable/installer/ca/diskdrake.xml
index 497a139f..9af5c4a1 100644
--- a/docs/docs/stable/installer/ca/diskdrake.xml
+++ b/docs/docs/stable/installer/ca/diskdrake.xml
@@ -13,8 +13,10 @@
-
-
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
@@ -41,8 +44,8 @@ before you start.</para>
<listitem>
<para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/ca/doPartitionDisks.xml b/docs/docs/stable/installer/ca/doPartitionDisks.xml
index d05e4814..ecea41d7 100644
--- a/docs/docs/stable/installer/ca/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/ca/doPartitionDisks.xml
@@ -20,6 +20,10 @@
+
+
+
+
<info>
<!--lebarhon 20161216 updated for Mageia 6
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
<!--2018/02/21 apb: Changed list styles.-->
<!--2018/02/24 apb: Changed list styles.-->
<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
@@ -68,14 +74,30 @@ instal·lació de Mageia.</para>
<para revision="1" xml:id="suggestedPartitioning-pa9">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!</para>
+installation but see the warning below.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the proposed Mageia partition in dark blue with their
intended sizes just underneath. You have the option to modify these sizes by
clicking and dragging the gap between both partitions. See the following
-screenshot:</para>
+screenshot:<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para>
+
+ <warning>
+ <para>This involves shrinking the size of the Windows partition, and therefore is
+a risky operation, so you should make sure you have backed up all important
+files before proceeding.</para>
+ </warning>
+
+ <important>
+ <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "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 for Mageia.</para>
+ </important>
</listitem>
<listitem>
@@ -88,16 +110,6 @@ screenshot:</para>
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.</para>
</warning>
-
- <important>
- <para revision="3" xml:id="doPartitionDisks-pa11">Tingueu present que això implica encongir la partició de Windows. La
-partició ha d'estar «neta», és a dir, Windows s'ha d'haver tancat
-correctament la darrera vegada que es va fer servir. També cal que hagi
-estat desfragmentada, tot i que això no és garantia que els fitxers de la
-partició hagin estat desplaçats fora de la regió que s'està a punt de fer
-servir. És altament recomanable fer una còpia de seguretat dels fitxers
-personals.</para>
- </important>
</listitem>
<listitem>
@@ -108,12 +120,6 @@ al(s) disc(s) dur(s).</para>
</listitem>
</itemizedlist>
- <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
-
<para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
option, then the installer will allocate the available space according to
the following rules:</para>
@@ -186,8 +192,10 @@ condition="live"> <imagedata align="center"
fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
<important>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/ca/firewall.xml b/docs/docs/stable/installer/ca/firewall.xml
index f6c60729..2c827bbf 100644
--- a/docs/docs/stable/installer/ca/firewall.xml
+++ b/docs/docs/stable/installer/ca/firewall.xml
@@ -1,4 +1,13 @@
-<?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="firewall" version="5.0" xml:lang="ca" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xreflabel="Firewall" xml:id="firewall"
+ 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">
+
+
@@ -6,14 +15,19 @@
<info>
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/25 apb: Added xreflabel for this section.-->
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
<title xml:id="firewall-ti1">Tallafoc</title>
</info>
- <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+ <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they
determine which type of message from the Internet will be accepted by the
target system. This, in turn, allows the corresponding services on the
system to be accessible from the Internet.</para>
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
<para>In the default setting (no button is checked), no service of the system is
accessible from the network. The <emphasis>Everything (no
firewall)</emphasis> option enables access to all services of the machine -
@@ -33,15 +47,15 @@ from the network.</para>
a series of services by typing a list of <quote>couples</quote> (blank
separated)</para>
- <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+ <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
<simplelist>
- <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
-the service you want to enable (e.g. 873 for the RSYNC service) as defined
-in <emphasis>RFC-433</emphasis>;</member>
+ <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned
+to the service you want to enable (e.g. 873 for the RSYNC service) as
+defined in <emphasis>RFC-433</emphasis>;</member>
- <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+ <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis>
+or <emphasis>UDP</emphasis> - the internet protocol that is used by the
service.</member>
</simplelist>
@@ -50,4 +64,4 @@ is <emphasis>873/tcp</emphasis>.</para>
<para>In case a service is implemented to use both protocols, you specify 2
couples for the same port.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/installUpdates.xml b/docs/docs/stable/installer/ca/installUpdates.xml
index 6c9d0d4a..43bdd868 100644
--- a/docs/docs/stable/installer/ca/installUpdates.xml
+++ b/docs/docs/stable/installer/ca/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Actualitzacions</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/installer.xml b/docs/docs/stable/installer/ca/installer.xml
index bfebff38..9cea8252 100644
--- a/docs/docs/stable/installer/ca/installer.xml
+++ b/docs/docs/stable/installer/ca/installer.xml
@@ -26,6 +26,8 @@
+
+
<info>
<!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
@@ -39,6 +41,7 @@
<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
<title xml:id="installer-ti1">DrakX, l'instal·lador de Mageia</title>
</info>
diff --git a/docs/docs/stable/installer/ca/setupBootloader.xml b/docs/docs/stable/installer/ca/setupBootloader.xml
index 60625113..80f9afe8 100644
--- a/docs/docs/stable/installer/ca/setupBootloader.xml
+++ b/docs/docs/stable/installer/ca/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xreflabel="Bootloader" xml:id="setupBootloader"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="ca" xml:id="setupBootloader">
+
+
+
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
<!--2019/01/06 apb: Typo.-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
+<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Gestor d'arrencada</title>
</info>
-
<section>
- <title>Grub2</title>
-
- <itemizedlist>
- <title>Grub2 on Legacy MBR/GPT systems</title>
-
- <listitem>
- <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+ <title>Available Bootloaders</title>
+ <section>
+ <title>Grub2</title>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
+ <listitem>
+ <para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader will be written into either the MBR (Master
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Grub2-efi on UEFI systems</title>
-
- <listitem>
- <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
+ <listitem>
+ <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
- <para>If there are already UEFI-based operating systems installed on your computer
+ <para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
-created by Windows and add grub2-efi to it. If no ESP exists, then one will
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
be created. Although it is possible to have several ESPs, only one is
required, whatever the number of operating systems you have.</para>
- </listitem>
- </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>rEFInd</title>
+ <itemizedlist>
+ <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+ <listitem>
+ <para>rEFInd has a nice graphical set of options, and can auto-detect installed
+EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>Please note that in order to be able to use the <literal>rEFInd</literal>
+option, an installed EFI System Partition must match your system
+architecture: if you have a 32bit EFI System Partition installed on a 64bit
+machine for instance, then the rEFInd option will not be displayed/available
+to you.</para>
+ </note>
+ </section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Opcions principals del menú d'arrencada</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
- <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
-systems will not see this option here.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
+can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
+<literal>UEFI</literal> systems.</para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
+option solely for use with <literal>UEFI</literal> systems.</para>
+ </listitem>
+ </itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
- <para>Don't change this unless you really know what you are doing</para>
+ <warning>
+ <para>Don't change this unless you really know what you are doing.</para>
+ </warning>
+ <note>
+ <para>There is no option to write GRUB to the boot sector of a partition (e.g:
+<filename>sda1</filename>), as this method is considered unreliable.</para>
+ </note>
+ <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
+listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Contrasenya</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Enable ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Configuració del gestor d'arrencada</title>
-
+ <para>If, in the previous section you selected <literal>rEFInd</literal> as the
+bootloader to use, you would then be presented with the options shown in the
+screenshot directly below. Otherwise, please instead move on to the
+subsequent screenshot for your options.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+ <para>Your rEFInd configuration options:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
+ </itemizedlist>
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
-then untick the Probe Foreign OS option.</para>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
-missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
-implications, and wish to proceed.</para>
+missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+understand the implications, and wish to proceed.</para>
+ <warning>
+ <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
+supported by Mageia as it is likely to fail when attempting to boot this
+resulting installation of Mageia. If you use anything other than GRUB2 or
+rEFInd for this purpose, then you do so at your own risk!</para>
+ </warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Altres opcions</title>
-
<section>
<title>Ús d'un gestor d'arrencada existent</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
- <xi:include href="setupBootloaderAddEntry.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/DrakLive.xml b/docs/docs/stable/installer/cs/DrakLive.xml
index e3546975..c0499c31 100644
--- a/docs/docs/stable/installer/cs/DrakLive.xml
+++ b/docs/docs/stable/installer/cs/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Instalace ze ŽIVÉHO datového nosiče</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/cs/installUpdates.xml b/docs/docs/stable/installer/cs/installUpdates.xml
index d773f1b1..498e6f4f 100644
--- a/docs/docs/stable/installer/cs/installUpdates.xml
+++ b/docs/docs/stable/installer/cs/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="cs">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Aktualizace</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/setupBootloader.xml b/docs/docs/stable/installer/cs/setupBootloader.xml
index e1de2617..c3444e91 100644
--- a/docs/docs/stable/installer/cs/setupBootloader.xml
+++ b/docs/docs/stable/installer/cs/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" xreflabel="Bootloader" xml:id="setupBootloader"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="cs" xml:id="setupBootloader">
+
-
-
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -39,40 +22,32 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Zaváděcí program</title>
</info>
-
<section>
<title>Available Bootloaders</title>
-
<section>
<title>Grub2</title>
-
<itemizedlist>
<para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
-
<listitem>
<para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
</listitem>
</itemizedlist>
-
<itemizedlist>
<para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
-
<listitem>
<para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
<para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
created by Windows and add grub2-efi to it. If no ESP exists, then one will
@@ -81,19 +56,15 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>rEFInd</title>
-
<itemizedlist>
<para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
-
<listitem>
<para>rEFInd has a nice graphical set of options, and can auto-detect installed
EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
</listitem>
</itemizedlist>
-
<note>
<para>Please note that in order to be able to use the <literal>rEFInd</literal>
option, an installed EFI System Partition must match your system
@@ -103,212 +74,180 @@ to you.</para>
</note>
</section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Základní nastavení zaváděcího programu</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
<itemizedlist>
<listitem>
<para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
<literal>UEFI</literal> systems.</para>
</listitem>
-
<listitem>
<para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
option solely for use with <literal>UEFI</literal> systems.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
<warning>
<para>Don't change this unless you really know what you are doing.</para>
</warning>
-
<note>
<para>There is no option to write GRUB to the boot sector of a partition (e.g:
<filename>sda1</filename>), as this method is considered unreliable.</para>
</note>
-
<para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Zabezpečení</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Heslo</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Heslo (znovu)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Povolit ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Povolit SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Povolit APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Povolit lokální APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Nastavení zaváděcího programu</title>
-
<para>If, in the previous section you selected <literal>rEFInd</literal> as the
bootloader to use, you would then be presented with the options shown in the
screenshot directly below. Otherwise, please instead move on to the
subsequent screenshot for your options.</para>
-
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+ <para>Your rEFInd configuration options:</para>
<itemizedlist>
- <para>Your rEFInd configuration options:</para>
-
<listitem>
- <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
</listitem>
-
<listitem>
- <para><guimenuitem>Install in EFI/Boot partition (workaround for some
-BIOS's).</guimenuitem></para>
-
- <para>With some BIOS's, the newly written bootloader for Mageia at end of the
-installation will not be recognized. In that case, you can use this option
-as a workaround for the issue.</para>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para>If you did not select rEFInd as the bootloader to use in the previous
-section, then your bootloader configurations are shown below:</para>
-
+section, then your bootloader configuration options are shown below:</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Výchozí</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
</listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video režim</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Neměnit ESP nebo MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
understand the implications, and wish to proceed.</para>
-
<warning>
<para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
supported by Mageia as it is likely to fail when attempting to boot this
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
</warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Další volby</title>
-
<section>
<title>Použití už existujícího zavaděče</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
<xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/DrakLive.xml b/docs/docs/stable/installer/eo/DrakLive.xml
index 54ae3f45..8bcb3071 100644
--- a/docs/docs/stable/installer/eo/DrakLive.xml
+++ b/docs/docs/stable/installer/eo/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Installation from LIVE medium</title>
<cover>
@@ -75,7 +78,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
index 1e71f1c6..efb5c285 100644
--- a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
@@ -22,7 +22,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
</info>
<section>
- <title>Introduction</title>
+ <title>Enkonduko</title>
<para>Mageia is distributed via ISO images. This page will help you to choose
which image best suits your needs.</para>
<para>There are three types of installation media:</para>
diff --git a/docs/docs/stable/installer/eo/addUser.xml b/docs/docs/stable/installer/eo/addUser.xml
index cbf45996..83edfc08 100644
--- a/docs/docs/stable/installer/eo/addUser.xml
+++ b/docs/docs/stable/installer/eo/addUser.xml
@@ -19,6 +19,10 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
<!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
<!--2018/02/24 apb: Changed list style.-->
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<para>It is advisable for all Mageia installations to set a
<literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a 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 underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
<note xml:id="givePassword">
+ <para>As you type a password into the top box a 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.</para>
+
<para>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.</para>
</note>
@@ -78,14 +86,19 @@ computer for.</para>
<para>Enter the user login name or let DrakX use a version of the user's real
name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
+ <caution condition="live">
+ <simpara>The login entered here should be different to any login currently in use for
+your <filename>/home</filename> directory. Some user parameters will be
+written in the user space, and some can overwrite actual data such as
+Firefox, Thunderbird or Kmail data...</simpara>
+ </caution>
</listitem>
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
- <para>Type in the user password. There is a shield at the end of the text box that
-indicates the strength of the password. (See also <xref
-linkend="givePassword"/>)</para>
+ <para>Type in the user password (remembering the advice in the Note above).</para>
<para><emphasis role="bold">Password (again):</emphasis> Retype the user
password. DrakX will check that you have not mistyped the password.</para>
diff --git a/docs/docs/stable/installer/eo/bootLive.xml b/docs/docs/stable/installer/eo/bootLive.xml
index 544dcea9..707de9ef 100644
--- a/docs/docs/stable/installer/eo/bootLive.xml
+++ b/docs/docs/stable/installer/eo/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eo">
-
-
-
-
-
-
-
<info>
<!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -30,20 +17,16 @@
DVD.-->
<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
</info>
-
<section xml:id="bootLive-1">
<info>
<title xml:id="bootLive1-ti1">Booting the medium</title>
</info>
-
<para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
the USB device in or place the DVD in the drive and restart the computer.</para>
-
<para>If the computer does not automatically boot from the USB or DVD you may need
to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
accessing the boot device menu to select a device from which the computer
will boot.</para>
-
<tip>
<para>To access the BIOS or boot menu when the computer is starting, you can try
pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
boot device menu. These (fairly common) keys are just a selection of
possible options though.</para>
</tip>
-
<note>
<para>The actual screen that you will first see when booting from the Live media
will depend on whether your computer motherboard is of the Legacy (BIOS) or
UEFI type.</para>
</note>
</section>
-
<section xml:id="biosmode">
<info>
<title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
</info>
-
<mediaobject>
- <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+ <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
</imageobject>
-
<caption>
<para>First screen while booting in BIOS mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS).</para>
-
<para>Once the boot is done, you can proceed to the installation.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Boot the Mageia Live system using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Install Mageia using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Memory Test</emphasis></para>
-
<para>Test the installed RAM by performing multiple read and write
operations. Reboot to end the test.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
</section>
-
<section xml:id="uefimode">
<info>
<title xml:id="uefimode-ti1">In UEFI mode</title>
</info>
-
<mediaobject condition="live">
- <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+ <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
<caption>
<para>First screen while booting in UEFI mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS). Once the
boot is done, you can proceed to the installation</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
-
<note>
<para>If you booted from a USB stick, you will see the above menu options
duplicated, and in this case, you should choose from the menu pair that will
be suffixed with "USB".</para>
</note>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/configureX_card_list.xml b/docs/docs/stable/installer/eo/configureX_card_list.xml
index e7f485d6..c0b036f7 100644
--- a/docs/docs/stable/installer/eo/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eo/configureX_card_list.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_card_list"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo"
+ xreflabel="Choose an X Server (Configure your Graphic Card)"
+ xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
+
+
<info>
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -28,6 +31,7 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
</info>
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
<para>If the installer has not correctly detected your graphic card and you know
which one you have, you can select it from the tree by: <itemizedlist>
<listitem>
- <para>Vendor</para>
+ <para>Vendinto</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/eo/configureX_chooser.xml b/docs/docs/stable/installer/eo/configureX_chooser.xml
index 2964adb2..8e377ad6 100644
--- a/docs/docs/stable/installer/eo/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eo/configureX_chooser.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_chooser"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo" xreflabel="Graphics Card and Monitor Configuration"
+ xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
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">
- <info>
- <title xml:id="configureX_chooser-ti1">Konfiguri X, grafik-karton kaj monitoron</title>
- </info>
+
@@ -21,12 +19,17 @@
- <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+ <info>
+ <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
<!--2018/02/15 apb: Some text and typography.-->
<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
<!--2018/02/23 apb: Typo.-->
<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+ </info>
+
+ <mediaobject>
<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
<para>If you need to, you can select a specific card from this expandable
list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/eo/configureX_monitor.xml b/docs/docs/stable/installer/eo/configureX_monitor.xml
index a16a2d78..06f7620a 100644
--- a/docs/docs/stable/installer/eo/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eo/configureX_monitor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="configureX_monitor"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eo" xreflabel="Choosing your Monitor"
+ xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
+
+
+
+
<info>
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -25,6 +29,8 @@
<!---->
<!--2018/02/12 apb: Text and typography-->
<!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
<title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
</info>
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa2">Subdiskigo</term>
+ <term revision="1" xml:id="configureX_monitor-pa2">Akomodata</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -69,11 +75,11 @@ type from the monitor database.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+ <term revision="1" xml:id="configureX_monitor-pa7">Vendinto</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting:</para>
+one you have, you can choose it from the options by selecting:</para>
</listitem>
</varlistentry>
</variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+ <term revision="1" xml:id="configureX_monitor-pa9">Genera</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically. Once again it
-may be wise to be conservative in your selections.</para>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docs/stable/installer/eo/diskPartitioning.xml b/docs/docs/stable/installer/eo/diskPartitioning.xml
index 77bcd2fe..de9fdc1c 100644
--- a/docs/docs/stable/installer/eo/diskPartitioning.xml
+++ b/docs/docs/stable/installer/eo/diskPartitioning.xml
@@ -2,7 +2,7 @@
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Subdiskigante</title>
<xi:include href="doPartitionDisks.xml"/>
diff --git a/docs/docs/stable/installer/eo/diskdrake.xml b/docs/docs/stable/installer/eo/diskdrake.xml
index ad59994b..31023ce6 100644
--- a/docs/docs/stable/installer/eo/diskdrake.xml
+++ b/docs/docs/stable/installer/eo/diskdrake.xml
@@ -13,8 +13,10 @@
-
-
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
@@ -41,8 +44,8 @@ before you start.</para>
<listitem>
<para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/eo/doPartitionDisks.xml b/docs/docs/stable/installer/eo/doPartitionDisks.xml
index a465f50d..72a45196 100644
--- a/docs/docs/stable/installer/eo/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eo/doPartitionDisks.xml
@@ -20,6 +20,10 @@
+
+
+
+
<info>
<!--lebarhon 20161216 updated for Mageia 6
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
<!--2018/02/21 apb: Changed list styles.-->
<!--2018/02/24 apb: Changed list styles.-->
<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
@@ -68,14 +74,30 @@ nova Mageja instalo.</para>
<para revision="1" xml:id="suggestedPartitioning-pa9">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!</para>
+installation but see the warning below.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the proposed Mageia partition in dark blue with their
intended sizes just underneath. You have the option to modify these sizes by
clicking and dragging the gap between both partitions. See the following
-screenshot:</para>
+screenshot:<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para>
+
+ <warning>
+ <para>This involves shrinking the size of the Windows partition, and therefore is
+a risky operation, so you should make sure you have backed up all important
+files before proceeding.</para>
+ </warning>
+
+ <important>
+ <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "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 for Mageia.</para>
+ </important>
</listitem>
<listitem>
@@ -88,15 +110,6 @@ screenshot:</para>
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.</para>
</warning>
-
- <important>
- <para revision="3" xml:id="doPartitionDisks-pa11">Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko
-devas esti "pura", tio estas Vindozo devis fermiĝi senprobleme la lastan
-fojon kiam ĝi estis uzita. Ĝi ankaŭ devas esti malfragmentiĝita kvankam tio
-ne estas garantio pri tio ke ĉiuj dosieroj en la subdisko estis movitaj el
-la areo uzota. Estas ege rekomendinde realigi sekurec-kopion de viaj
-personaj dosieroj.</para>
- </important>
</listitem>
<listitem>
@@ -107,12 +120,6 @@ fiksita(j) disko(j).</para>
</listitem>
</itemizedlist>
- <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
-
<para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
option, then the installer will allocate the available space according to
the following rules:</para>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
<important>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/eo/firewall.xml b/docs/docs/stable/installer/eo/firewall.xml
index 000b3001..7bbeef89 100644
--- a/docs/docs/stable/installer/eo/firewall.xml
+++ b/docs/docs/stable/installer/eo/firewall.xml
@@ -1,4 +1,13 @@
-<?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="firewall" version="5.0" xml:lang="eo" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xreflabel="Firewall" xml:id="firewall"
+ 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">
+
+
@@ -6,14 +15,19 @@
<info>
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/25 apb: Added xreflabel for this section.-->
-<title xml:id="firewall-ti1">Firewall</title>
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
+<title xml:id="firewall-ti1">Fajromuro (Firewall)</title>
</info>
- <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+ <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they
determine which type of message from the Internet will be accepted by the
target system. This, in turn, allows the corresponding services on the
system to be accessible from the Internet.</para>
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
<para>In the default setting (no button is checked), no service of the system is
accessible from the network. The <emphasis>Everything (no
firewall)</emphasis> option enables access to all services of the machine -
@@ -33,15 +47,15 @@ from the network.</para>
a series of services by typing a list of <quote>couples</quote> (blank
separated)</para>
- <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+ <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
<simplelist>
- <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
-the service you want to enable (e.g. 873 for the RSYNC service) as defined
-in <emphasis>RFC-433</emphasis>;</member>
+ <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned
+to the service you want to enable (e.g. 873 for the RSYNC service) as
+defined in <emphasis>RFC-433</emphasis>;</member>
- <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+ <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis>
+or <emphasis>UDP</emphasis> - the internet protocol that is used by the
service.</member>
</simplelist>
@@ -50,4 +64,4 @@ is <emphasis>873/tcp</emphasis>.</para>
<para>In case a service is implemented to use both protocols, you specify 2
couples for the same port.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/installUpdates.xml b/docs/docs/stable/installer/eo/installUpdates.xml
index a96fb4d2..a4bf3deb 100644
--- a/docs/docs/stable/installer/eo/installUpdates.xml
+++ b/docs/docs/stable/installer/eo/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eo">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Ĝisdatigoj</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/installer.xml b/docs/docs/stable/installer/eo/installer.xml
index e7dc4af6..3ce7d27b 100644
--- a/docs/docs/stable/installer/eo/installer.xml
+++ b/docs/docs/stable/installer/eo/installer.xml
@@ -26,6 +26,8 @@
+
+
<info>
<!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
@@ -39,6 +41,7 @@
<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
<title xml:id="installer-ti1">DrakX, la instalilo de Magejo</title>
</info>
diff --git a/docs/docs/stable/installer/eo/reboot.xml b/docs/docs/stable/installer/eo/reboot.xml
index 8015ff6c..c21a8202 100644
--- a/docs/docs/stable/installer/eo/reboot.xml
+++ b/docs/docs/stable/installer/eo/reboot.xml
@@ -2,7 +2,7 @@
<!--Lebarhon 20170210 updated for Mageia6-->
<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
<info>
- <title xml:id="reboot-ti1">Reboot</title>
+ <title xml:id="reboot-ti1">Restarto</title>
</info>
diff --git a/docs/docs/stable/installer/eo/setupBootloader.xml b/docs/docs/stable/installer/eo/setupBootloader.xml
index 961314c8..22c8cbe3 100644
--- a/docs/docs/stable/installer/eo/setupBootloader.xml
+++ b/docs/docs/stable/installer/eo/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xreflabel="Bootloader" xml:id="setupBootloader"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="eo" xml:id="setupBootloader">
+
+
+
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
<!--2019/01/06 apb: Typo.-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Startŝargilo</title>
</info>
-
<section>
- <title>Grub2</title>
-
- <itemizedlist>
- <title>Grub2 on Legacy MBR/GPT systems</title>
-
- <listitem>
- <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+ <title>Available Bootloaders</title>
+ <section>
+ <title>Grub2</title>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
+ <listitem>
+ <para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader will be written into either the MBR (Master
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Grub2-efi on UEFI systems</title>
-
- <listitem>
- <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
+ <listitem>
+ <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
- <para>If there are already UEFI-based operating systems installed on your computer
+ <para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
-created by Windows and add grub2-efi to it. If no ESP exists, then one will
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
be created. Although it is possible to have several ESPs, only one is
required, whatever the number of operating systems you have.</para>
- </listitem>
- </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>rEFInd</title>
+ <itemizedlist>
+ <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+ <listitem>
+ <para>rEFInd has a nice graphical set of options, and can auto-detect installed
+EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>Please note that in order to be able to use the <literal>rEFInd</literal>
+option, an installed EFI System Partition must match your system
+architecture: if you have a 32bit EFI System Partition installed on a 64bit
+machine for instance, then the rEFInd option will not be displayed/available
+to you.</para>
+ </note>
+ </section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Lanĉilaj ĉefaj elektoj</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
- <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
-systems will not see this option here.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
+can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
+<literal>UEFI</literal> systems.</para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
+option solely for use with <literal>UEFI</literal> systems.</para>
+ </listitem>
+ </itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
- <para>Don't change this unless you really know what you are doing</para>
+ <warning>
+ <para>Don't change this unless you really know what you are doing.</para>
+ </warning>
+ <note>
+ <para>There is no option to write GRUB to the boot sector of a partition (e.g:
+<filename>sda1</filename>), as this method is considered unreliable.</para>
+ </note>
+ <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
+listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Enable ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Bootloader Configuration</title>
-
+ <para>If, in the previous section you selected <literal>rEFInd</literal> as the
+bootloader to use, you would then be presented with the options shown in the
+screenshot directly below. Otherwise, please instead move on to the
+subsequent screenshot for your options.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+ <para>Your rEFInd configuration options:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
+ </itemizedlist>
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
-then untick the Probe Foreign OS option.</para>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
-missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
-implications, and wish to proceed.</para>
+missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+understand the implications, and wish to proceed.</para>
+ <warning>
+ <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
+supported by Mageia as it is likely to fail when attempting to boot this
+resulting installation of Mageia. If you use anything other than GRUB2 or
+rEFInd for this purpose, then you do so at your own risk!</para>
+ </warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
- <title>Other Options</title>
-
+ <title>Aliaj opcioj</title>
<section>
<title>Uzi ekzistantan lanĉilon</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
- <xi:include href="setupBootloaderAddEntry.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/soundConfig.xml b/docs/docs/stable/installer/eo/soundConfig.xml
index e22567ca..c172100d 100644
--- a/docs/docs/stable/installer/eo/soundConfig.xml
+++ b/docs/docs/stable/installer/eo/soundConfig.xml
@@ -7,7 +7,7 @@
xmlns:ns2="http://www.w3.org/1999/xlink"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="soundConfig-ti1">Sound Configuration</title>
+ <title xml:id="soundConfig-ti1">Sonoagordo</title>
</info>
diff --git a/docs/docs/stable/installer/es/DrakLive.xml b/docs/docs/stable/installer/es/DrakLive.xml
index ee313ac9..1ffde448 100644
--- a/docs/docs/stable/installer/es/DrakLive.xml
+++ b/docs/docs/stable/installer/es/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Instalación desde un medio LIVE</title>
<cover>
@@ -76,7 +79,9 @@ documentación</link> si quiere ayudar a mejorar este manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/es/installUpdates.xml b/docs/docs/stable/installer/es/installUpdates.xml
index 83ce77f5..c7f1468b 100644
--- a/docs/docs/stable/installer/es/installUpdates.xml
+++ b/docs/docs/stable/installer/es/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Actualizaciones</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Desde que se lanzó esta versión de Mageia, algunos paquetes se habrán
+ <para revision="1" xml:id="installUpdates-pa1">Desde que se lanzó esta versión de Mageia, algunos paquetes se habrán
actualizado o mejorado.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Seleccione "Sí" si desea descargarlos e instalarlos.</para>
+ <para revision="1" xml:id="installUpdates-pa2">Seleccione "Sí" si desea descargarlos e instalarlos.</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ está conectado a Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Pulse <emphasis>Siguiente</emphasis> para continuar</para>
+ <para revision="1" xml:id="installUpdates-pa3">Pulse <emphasis>Siguiente</emphasis> para continuar</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/setupBootloader.xml b/docs/docs/stable/installer/es/setupBootloader.xml
index d77e0ed0..1e6b2d1a 100644
--- a/docs/docs/stable/installer/es/setupBootloader.xml
+++ b/docs/docs/stable/installer/es/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="es" xreflabel="Bootloader" xml:id="setupBootloader"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="es" xml:id="setupBootloader">
+
-
-
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -39,42 +22,34 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Cargador de arranque</title>
</info>
-
<section>
<title>Cargadores de arranque disponibles</title>
-
<section>
<title>Grub2</title>
-
<itemizedlist>
<para><emphasis role="bold">Grub2 en sistemas MBR / GPT antiguos</emphasis></para>
-
<listitem>
<para>GRUB2 (con o sin menú gráfico) se utilizará exclusivamente como cargador de
arranque para un sistema Legacy/MBR o Legacy/GPT.</para>
</listitem>
-
<listitem>
<para>De forma predeterminada, se escribirá un nuevo cargador de arranque en el
MBR (Registro de arranque maestro) de su primer disco duro o en la partición
de arranque del BIOS.</para>
</listitem>
</itemizedlist>
-
<itemizedlist>
<para><emphasis role="bold">Grub2-efi en sistemas UEFI</emphasis></para>
-
<listitem>
<para>GRUB2-efi o rEFInd puede usarse como gestor de arranque para un sistema
UEFI.</para>
</listitem>
-
<listitem>
<para>De forma predeterminada, un nuevo cargador de arranque (Grub2-efi) se
escribirá en el ESP (partición del sistema EFI).</para>
-
<para>Si ya hay instalados sistemas operativos basados en UEFI en su computadora
(Windows 8, por ejemplo), el instalador de Mageia detectará el ESP existente
creado por Windows y le agregará grub2-efi. Si no existe ESP, se creará
@@ -83,20 +58,16 @@ independientemente de la cantidad de sistemas operativos que tenga.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>rEFInd</title>
-
<itemizedlist>
<para><emphasis role="bold">rEFInd en sistemas UEFI</emphasis></para>
-
<listitem>
<para>rEFInd tiene un buen conjunto gráfico de opciones y puede detectar
automáticamente los cargadores de arranque EFI instalados. Véase:
http://www.rodsbooks.com/refind/</para>
</listitem>
</itemizedlist>
-
<note>
<para>Tenga en cuenta que para poder utilizar la opción <literal>rEFInd</literal>,
una partición del sistema EFI instalada debe coincidir con la arquitectura
@@ -106,67 +77,53 @@ estará disponible para usted.</para>
</note>
</section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Configuración del cargador de arranque.</title>
</info>
-
<section>
<title>Opciones principales del cargador de arranque</title>
-
<mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader.png"/></imageobject><imageobject
-condition="live"><imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Cargador de arranque a usar</emphasis></para>
-
<itemizedlist>
<listitem>
<para><guimenuitem>GRUB2</guimenuitem>(con un menú gráfico o de texto), se puede
elegir para tanto sistemas <literal>MBR/BIOS antiguos</literal> como
sistemas <literal>UEFI</literal>.</para>
</listitem>
-
<listitem>
<para><guimenuitem>rEFInd</guimenuitem> (con un menú gráfico) es una opción
alternativa únicamente para usar en sistemas <literal>UEFI</literal>.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Dispositivo de arranque</emphasis></para>
-
<warning>
<para>No cambie esto a menos que realmente sepa lo que está haciendo.</para>
</warning>
-
<note>
<para>No hay opción para escribir GRUB en el sector de arranque de una partición
(ej: <filename>sda1</filename>), ya que este método se considera poco
fiable.</para>
</note>
-
<para>Cuando se utiliza el modo UEFI, el <guilabel>dispositivo de
arranque</guilabel> aparecerá como <guimenuitem>Partición de Sistema
EFI</guimenuitem>.</para>
</listitem>
-
<listitem>
<para>1</para>
-
<para>Este cuadro de texto le permite establecer un retraso, en segundos, antes de
que se inicie el sistema operativo predeterminado.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Seguridad</emphasis></para>
-
<para>Esto le permite establecer una contraseña para el cargador de arranque. Esto
significa que se requerirá un nombre de usuario y una contraseña al iniciar
para poder seleccionar una entrada de inicio o cambiar la
@@ -174,27 +131,20 @@ configuración. Esto es opcional, y es probable que la mayoría de las
personas no lo necesiten. El nombre de usuario es root y la contraseña es la
que se elige a continuación.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Contraseña</emphasis></para>
-
<para>Elija una contraseña para el cargador de arranque (opcional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Contraseña (otra vez)</emphasis></para>
-
<para>Vuelva a escribir la contraseña y DrakX verificará que coincida con la
establecida arriba</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Avanzado</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Habilitar ACPI</emphasis></para>
-
<para>ACPI (Configuración avanzada e interfaz de energía) es un estándar para la
administración de energía. Puede ahorrar energía al detener los dispositivos
no utilizados. Deseleccionarlo podría ser útil si, por ejemplo, su equipo no
@@ -202,122 +152,110 @@ es compatible con ACPI o si cree que la implementación de ACPI podría causar
algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del
sistema).</para>
</listitem>
-
<listitem>
<para><emphasis>Activar SMP</emphasis></para>
-
<para>Esta opción habilita/deshabilita el multiprocesamiento simétrico para
procesadores multi-core</para>
</listitem>
-
<listitem>
<para><emphasis>Activar APIC</emphasis></para>
-
<para>Al habilitar esto, el sistema operativo tiene acceso al controlador de
interrupción programable avanzado. Los dispositivos APIC permiten modelos de
prioridad más complejos, y administración avanzada de IRQ (solicitud de
interrupción).</para>
</listitem>
-
<listitem>
<para><emphasis>Habilitar APIC local</emphasis></para>
-
<para>Aquí puede establecer Local APIC, que administra todas las interrupciones
externas para un procesador específico en un sistema SMP</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Configuración del cargador de arranque</title>
-
<para>Si, en la sección anterior, seleccionó<literal>rEFInd</literal> como el
gestor de arranque, se le presentarán las opciones que se muestran en la
captura de pantalla directamente debajo. De lo contrario, pase a la
siguiente captura de pantalla para ver sus opciones.</para>
-
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+ <para>Sus opciones de configuración de rEFInd:</para>
<itemizedlist>
- <para>Sus opciones de configuración de rEFInd:</para>
-
<listitem>
- <para><guimenuitem>Instalar o actualizar rEFInd en la partición del sistema
-EFI.</guimenuitem></para>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
</listitem>
-
<listitem>
- <para><guimenuitem>Instalar en la partición EFI / Boot (solución para algunas
-BIOS) .1</guimenuitem></para>
-
- <para>Con algunas BIOS, no se reconocerá el gestor de arranque recién escrito para
-Mageia al final de la instalación. En ese caso, puede usar esta opción como
-solución del problema.</para>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
- <para>Si no seleccionó rEFInd como el gestor de arranque para usar en la sección
-anterior, las configuraciones de su gestor de arranque se muestran a
-continuación:</para>
-
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
<mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader3.png"/></imageobject><imageobject
-condition="live"><imagedata align="center"
-fileref="live-setupBootloader3.png"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Por defecto</emphasis></para>
-
<para>El sistema operativo se inicia de forma predeterminada.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Adjuntar</emphasis></para>
-
<para>Esta opción le permite pasar información al kernel o decirle al kernel que
le brinde más información mientras arranca.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Sondeo SO distinto</emphasis></para>
-
<para>Si ya tiene otros sistemas operativos instalados, Mageia intenta agregarlos
a su nuevo menú de inicio de Mageia. Si no desea este comportamiento,
desmarque la opción <guimenuitem>Listar otros OS</guimenuitem>.</para>
</listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
</itemizedlist>
-
<para><emphasis>Avanzado</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"><imagedata align="center"
-fileref="dx2-setupBootloader4.png"/></imageobject><imageobject
-condition="live"><imagedata align="center"
-fileref="live-setupBootloader4.png"/></imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para>Modo de vídeo</para>
-
<para>Esto establece el tamaño de la pantalla y la profundidad del color que se
utilizará en el menú de inicio. Si hace clic en el triángulo hacia abajo, se
le ofrecerán otras opciones de tamaño y profundidad de color.</para>
</listitem>
-
<listitem>
<para><emphasis>No toque ni ESP ni MBR</emphasis></para>
-
<para>Seleccione esta opción si no desea un Mageia de arranque, sino que prefiere
cargarlo en cadena desde otro sistema operativo. Recibirá una advertencia de
que falta el gestor de arranque. Haga clic en <guimenuitem>Ok </guimenuitem>
solo si está seguro de comprender las implicaciones y desea continuar.</para>
-
<warning>
<para>Mageia ya no admite la carga en cadena a través de cargadores de arranque
antiguos (GRUB Legacy y LiLo), ya que es probable que falle al intentar
@@ -326,36 +264,28 @@ GRUB2 o rEFInd para este propósito, ¡es bajo su propia responsibilidad!</para>
</warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject><imagedata align="center"
-fileref="live-setupBootloader5.png"/></imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Otras opciones</title>
-
<section>
<title>Usando un cargador de arranque existente</title>
-
- <para>El procedimiento exacto para agregar Mageia a un cargardor de arranque
-existente está fuera del alcance de esta documentación. Sin embargo, en la
-mayoría de los casos implicará ejecutar el programa de instalación del
-cargador de arranque correspondiente, que debería detectar Mageia y agregar
-automáticamente una entrada para él en el menú del cargador de
-arranque. Consulte la documentación del sistema operativo correspondiente.</para>
+ <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Instalación sin un cargador de arranque</title>
-
<para>Si bien puede optar por instalar Mageia sin un cargador de arranque
(consulte la sección 2.1 Avanzado), esto no se recomienda a menos que sepa
absolutamente lo que está haciendo, ya que sin algún tipo de cargador de
arranque su sistema operativo no podrá iniciar.</para>
</section>
-
<xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/DrakLive.xml b/docs/docs/stable/installer/eu/DrakLive.xml
index 4a066be9..18b803aa 100644
--- a/docs/docs/stable/installer/eu/DrakLive.xml
+++ b/docs/docs/stable/installer/eu/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>LIVE euskarriko instalazioa</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
index 23f01df2..9e571f0b 100644
--- a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
@@ -68,8 +68,8 @@ DVD drive or is unable to boot from a USB stick.</para>
<para>Here, a medium (plural: media) is an ISO image file that allows you to
install and/or update Mageia and, by extension, any physical medium (DVD,
USB stick, ...) the ISO file is copied to.</para>
- <para>You can find Mageia ISO's <link
-ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+ <para>Mageia-ren ISO-ak <link
+ns4:href="http://www.mageia.org/en/downloads/">hemen</link> aurki ditzakezu.</para>
</section>
<section>
<title>Instalazioa Klasiko baliabidea</title>
@@ -167,7 +167,7 @@ it</para>
</section>
</section>
<section>
- <title>Net install media</title>
+ <title>Sare instalatze hedabidea</title>
<section>
<title>Ezaugarri komunak</title>
<itemizedlist>
@@ -247,7 +247,7 @@ path/to/the/image/file.iso</command></para>
path/to/the/image/file.iso</command></para>
</listitem>
</itemizedlist>
- <para>Example:</para>
+ <para>Adibidea:</para>
<mediaobject>
<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
</imageobject></mediaobject>
@@ -300,8 +300,8 @@ bezalako tresna grafiko bat erabil dezakezu</para>
"ISO image" option</para>
</listitem>
<listitem>
- <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
-Imager</link></para>
+ <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disko
+Irudi bat</link></para>
</listitem>
</itemizedlist>
</section>
diff --git a/docs/docs/stable/installer/eu/addUser.xml b/docs/docs/stable/installer/eu/addUser.xml
index 72d76741..9fd20b5f 100644
--- a/docs/docs/stable/installer/eu/addUser.xml
+++ b/docs/docs/stable/installer/eu/addUser.xml
@@ -19,6 +19,10 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
<!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
<!--2018/02/24 apb: Changed list style.-->
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<para>It is advisable for all Mageia installations to set a
<literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a 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 underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
<note xml:id="givePassword">
+ <para>As you type a password into the top box a 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.</para>
+
<para>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.</para>
</note>
@@ -68,7 +76,7 @@ computer for.</para>
</listitem>
<listitem>
- <para><emphasis role="bold">Real Name</emphasis></para>
+ <para><emphasis role="bold">Benetako Izena</emphasis></para>
<para>Insert the user's real name into this text box</para>
</listitem>
@@ -78,14 +86,19 @@ computer for.</para>
<para>Enter the user login name or let DrakX use a version of the user's real
name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
+ <caution condition="live">
+ <simpara>The login entered here should be different to any login currently in use for
+your <filename>/home</filename> directory. Some user parameters will be
+written in the user space, and some can overwrite actual data such as
+Firefox, Thunderbird or Kmail data...</simpara>
+ </caution>
</listitem>
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
- <para>Type in the user password. There is a shield at the end of the text box that
-indicates the strength of the password. (See also <xref
-linkend="givePassword"/>)</para>
+ <para>Type in the user password (remembering the advice in the Note above).</para>
<para><emphasis role="bold">Password (again):</emphasis> Retype the user
password. DrakX will check that you have not mistyped the password.</para>
diff --git a/docs/docs/stable/installer/eu/bestTime.xml b/docs/docs/stable/installer/eu/bestTime.xml
index 2b052f32..e28848b4 100644
--- a/docs/docs/stable/installer/eu/bestTime.xml
+++ b/docs/docs/stable/installer/eu/bestTime.xml
@@ -4,7 +4,7 @@
<info>
<!--2018/03/01 apb: Slight adjustment to text-->
<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
-<title xml:id="bestTime-ti1">Clock Settings</title>
+<title xml:id="bestTime-ti1">Erloju Ezarpenak</title>
</info>
<mediaobject condition="live">
<imageobject> <imagedata format="PNG" align="center"
diff --git a/docs/docs/stable/installer/eu/bootLive.xml b/docs/docs/stable/installer/eu/bootLive.xml
index 5646d9f2..1ea5278b 100644
--- a/docs/docs/stable/installer/eu/bootLive.xml
+++ b/docs/docs/stable/installer/eu/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eu">
-
-
-
-
-
-
-
<info>
<!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -30,20 +17,16 @@
DVD.-->
<title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title>
</info>
-
<section xml:id="bootLive-1">
<info>
<title xml:id="bootLive1-ti1">Euskarria abiarazten</title>
</info>
-
<para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
the USB device in or place the DVD in the drive and restart the computer.</para>
-
<para>If the computer does not automatically boot from the USB or DVD you may need
to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
accessing the boot device menu to select a device from which the computer
will boot.</para>
-
<tip>
<para>To access the BIOS or boot menu when the computer is starting, you can try
pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
boot device menu. These (fairly common) keys are just a selection of
possible options though.</para>
</tip>
-
<note>
<para>The actual screen that you will first see when booting from the Live media
will depend on whether your computer motherboard is of the Legacy (BIOS) or
UEFI type.</para>
</note>
</section>
-
<section xml:id="biosmode">
<info>
<title xml:id="biosmode-ti1">BIOS/CSM/Legacy moduan</title>
</info>
-
<mediaobject>
- <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+ <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
</imageobject>
-
<caption>
<para>Lehen pantaila BIOS moduan abiarazten den bitartean</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS).</para>
-
<para>Once the boot is done, you can proceed to the installation.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Boot the Mageia Live system using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Install Mageia using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Memory Test</emphasis></para>
-
<para>Test the installed RAM by performing multiple read and write
operations. Reboot to end the test.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
</section>
-
<section xml:id="uefimode">
<info>
<title xml:id="uefimode-ti1">UEFI moduan</title>
</info>
-
<mediaobject condition="live">
- <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+ <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
<caption>
<para>First screen while booting in UEFI mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS). Once the
boot is done, you can proceed to the installation</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
-
<note>
<para>If you booted from a USB stick, you will see the above menu options
duplicated, and in this case, you should choose from the menu pair that will
be suffixed with "USB".</para>
</note>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/choosePackageGroups.xml b/docs/docs/stable/installer/eu/choosePackageGroups.xml
index cf6d95da..c6d317d1 100644
--- a/docs/docs/stable/installer/eu/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/eu/choosePackageGroups.xml
@@ -20,15 +20,15 @@ become visible as the mouse is hovered over them.</para>
<itemizedlist>
<listitem>
- <para><emphasis role="bold">Workstation</emphasis></para>
+ <para><emphasis role="bold">Lanpostua</emphasis></para>
</listitem>
<listitem>
- <para><emphasis role="bold">Server</emphasis></para>
+ <para><emphasis role="bold">Zerbitzaria</emphasis></para>
</listitem>
<listitem>
- <para><emphasis role="bold">Graphical Environment</emphasis></para>
+ <para><emphasis role="bold">Ingurune Grafikoa</emphasis></para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_card_list.xml b/docs/docs/stable/installer/eu/configureX_card_list.xml
index 42ba318e..e2a9fa64 100644
--- a/docs/docs/stable/installer/eu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eu/configureX_card_list.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_card_list"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu"
+ xreflabel="Choose an X Server (Configure your Graphic Card)"
+ xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
+
+
<info>
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -28,6 +31,7 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
<title xml:id="configureX_card_list-ti1">Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)</title>
</info>
@@ -42,7 +46,7 @@ behar bezala identifikatuko du.</para>
<para>Instalatzaileak ez du behar bezala zure txartel grafikoa detektatu, eta zein
duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean: <itemizedlist>
<listitem>
- <para>Vendor</para>
+ <para>Hornitzailea</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_chooser.xml b/docs/docs/stable/installer/eu/configureX_chooser.xml
index c4799d65..89cd994d 100644
--- a/docs/docs/stable/installer/eu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eu/configureX_chooser.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_chooser"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu" xreflabel="Graphics Card and Monitor Configuration"
+ xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
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">
- <info>
- <title xml:id="configureX_chooser-ti1">Txartel Grafikoa eta Pantaila Konfigurazioa</title>
- </info>
+
@@ -21,12 +19,17 @@
- <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+ <info>
+ <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
<!--2018/02/15 apb: Some text and typography.-->
<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
<!--2018/02/23 apb: Typo.-->
<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+ </info>
+
+ <mediaobject>
<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
<para>If you need to, you can select a specific card from this expandable
list. See <xref linkend="configureX_card_list"/>.</para>
@@ -77,7 +80,7 @@ settings are on the safe side.</para>
</listitem>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Aukerak</emphasis></para>
<para>Here you can choose to enable or disable various options.</para>
</listitem>
diff --git a/docs/docs/stable/installer/eu/configureX_monitor.xml b/docs/docs/stable/installer/eu/configureX_monitor.xml
index 3f3a45aa..0d3f915d 100644
--- a/docs/docs/stable/installer/eu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eu/configureX_monitor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="configureX_monitor"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="eu" xreflabel="Choosing your Monitor"
+ xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
+
+
+
+
<info>
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -25,6 +29,8 @@
<!---->
<!--2018/02/12 apb: Text and typography-->
<!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
<title xml:id="configureX_monitor-ti1">Aukeratu zure Pantaila</title>
</info>
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+ <term revision="1" xml:id="configureX_monitor-pa2">Pertsonalizatua</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -69,18 +75,18 @@ type from the monitor database.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+ <term revision="1" xml:id="configureX_monitor-pa7">Hornitzailea</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa8">Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun
-baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:</para>
+ <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can choose it from the options by selecting:</para>
</listitem>
</varlistentry>
</variablelist>
<itemizedlist>
<listitem>
- <para>Manufacturer</para>
+ <para>Fabrikatzailea</para>
</listitem>
<listitem>
@@ -90,14 +96,15 @@ baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:</para>
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+ <term revision="1" xml:id="configureX_monitor-pa9">Generikoa</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically. Once again it
-may be wise to be conservative in your selections.</para>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docs/stable/installer/eu/diskPartitioning.xml b/docs/docs/stable/installer/eu/diskPartitioning.xml
index 93a9565f..788028d3 100644
--- a/docs/docs/stable/installer/eu/diskPartitioning.xml
+++ b/docs/docs/stable/installer/eu/diskPartitioning.xml
@@ -2,7 +2,7 @@
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partizioa egiten</title>
<xi:include href="doPartitionDisks.xml"/>
diff --git a/docs/docs/stable/installer/eu/diskdrake.xml b/docs/docs/stable/installer/eu/diskdrake.xml
index a801dad4..42a92e98 100644
--- a/docs/docs/stable/installer/eu/diskdrake.xml
+++ b/docs/docs/stable/installer/eu/diskdrake.xml
@@ -13,8 +13,10 @@
-
-
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
@@ -41,8 +44,8 @@ before you start.</para>
<listitem>
<para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
</listitem>
<listitem>
@@ -90,7 +93,7 @@ partition is present and of the correct type. See Figure 2 below.</para>
</important>
<figure>
- <title>EFI System Partition</title>
+ <title>EFI sistema partizioa</title>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
diff --git a/docs/docs/stable/installer/eu/doPartitionDisks.xml b/docs/docs/stable/installer/eu/doPartitionDisks.xml
index 6b36684f..96902e28 100644
--- a/docs/docs/stable/installer/eu/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eu/doPartitionDisks.xml
@@ -20,6 +20,10 @@
+
+
+
+
<info>
<!--lebarhon 20161216 updated for Mageia 6
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
<!--2018/02/21 apb: Changed list styles.-->
<!--2018/02/24 apb: Changed list styles.-->
<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
</info>
@@ -50,7 +56,7 @@ fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
<title>Main Options</title>
<listitem>
- <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+ <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Erabili Dauden Partizioak</emphasis></para>
<para revision="1" xml:id="doPartitionDisks-pa5">Aukera hori eskuragarri badago, orduan Linux partizioak bateragarria aurkitu
egin dira eta instalazioa erabili ahal izango du.</para>
@@ -68,14 +74,30 @@ erabiliko da zure Mageia instalazio berriarentzat.</para>
<para revision="1" xml:id="suggestedPartitioning-pa9">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!</para>
+installation but see the warning below.</para>
<para>With this option, the installer displays the remaining Windows partition in
light blue and the proposed Mageia partition in dark blue with their
intended sizes just underneath. You have the option to modify these sizes by
clicking and dragging the gap between both partitions. See the following
-screenshot:</para>
+screenshot:<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para>
+
+ <warning>
+ <para>This involves shrinking the size of the Windows partition, and therefore is
+a risky operation, so you should make sure you have backed up all important
+files before proceeding.</para>
+ </warning>
+
+ <important>
+ <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "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 for Mageia.</para>
+ </important>
</listitem>
<listitem>
@@ -88,15 +110,6 @@ screenshot:</para>
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.</para>
</warning>
-
- <important>
- <para revision="3" xml:id="doPartitionDisks-pa11">Kontutan prozedura hori dakar Windows partizioaren tamaina
-murrizteko. Partizio honek "garbi " egon beharko du, hau da, Windows azken
-aldiz erabili denean ondo itxita egon behar du. Halaber desfragmentatuta
-egon behar du, baina horrek ez du bermatzen partizioko fitxategi guztiak
-mugitu egin direla erabiliko den eremutik kanpo. Hori dela eta, Guztiz
-gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea.</para>
- </important>
</listitem>
<listitem>
@@ -107,12 +120,6 @@ gogorrean.</para>
</listitem>
</itemizedlist>
- <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
-
<para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
option, then the installer will allocate the available space according to
the following rules:</para>
@@ -185,8 +192,10 @@ condition="live"> <imagedata align="center"
fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
<important>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/eu/firewall.xml b/docs/docs/stable/installer/eu/firewall.xml
index 4bd68a74..c67f850b 100644
--- a/docs/docs/stable/installer/eu/firewall.xml
+++ b/docs/docs/stable/installer/eu/firewall.xml
@@ -1,4 +1,13 @@
-<?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="firewall" version="5.0" xml:lang="eu" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xreflabel="Firewall" xml:id="firewall"
+ 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">
+
+
@@ -6,14 +15,19 @@
<info>
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/25 apb: Added xreflabel for this section.-->
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
<title xml:id="firewall-ti1">Suhesia</title>
</info>
- <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+ <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they
determine which type of message from the Internet will be accepted by the
target system. This, in turn, allows the corresponding services on the
system to be accessible from the Internet.</para>
+ <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
<para>In the default setting (no button is checked), no service of the system is
accessible from the network. The <emphasis>Everything (no
firewall)</emphasis> option enables access to all services of the machine -
@@ -33,15 +47,15 @@ from the network.</para>
a series of services by typing a list of <quote>couples</quote> (blank
separated)</para>
- <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+ <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
<simplelist>
- <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
-the service you want to enable (e.g. 873 for the RSYNC service) as defined
-in <emphasis>RFC-433</emphasis>;</member>
+ <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned
+to the service you want to enable (e.g. 873 for the RSYNC service) as
+defined in <emphasis>RFC-433</emphasis>;</member>
- <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+ <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis>
+or <emphasis>UDP</emphasis> - the internet protocol that is used by the
service.</member>
</simplelist>
@@ -50,4 +64,4 @@ service.</member>
<para>Bi protokoloak erabiltzeko zerbitzu bat martxan jartzen denean, 2 bikote
zehazten dira portu bererako.</para>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/installUpdates.xml b/docs/docs/stable/installer/eu/installUpdates.xml
index 74d77a66..3d0f4c06 100644
--- a/docs/docs/stable/installer/eu/installUpdates.xml
+++ b/docs/docs/stable/installer/eu/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Eguneraketak</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/installer.xml b/docs/docs/stable/installer/eu/installer.xml
index c7fd4add..4a3a9e9f 100644
--- a/docs/docs/stable/installer/eu/installer.xml
+++ b/docs/docs/stable/installer/eu/installer.xml
@@ -26,6 +26,8 @@
+
+
<info>
<!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
@@ -39,6 +41,7 @@
<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
<title xml:id="installer-ti1">DrakX, Mageia Instalatzilea</title>
</info>
@@ -124,7 +127,7 @@ operations. Reboot to end the test.</para>
</listitem>
<listitem>
- <para><emphasis role="bold">F2: Language</emphasis></para>
+ <para><emphasis role="bold">F2: Hizkuntza</emphasis></para>
<para>Press F2 for alternative languages.</para>
</listitem>
diff --git a/docs/docs/stable/installer/eu/misc-params.xml b/docs/docs/stable/installer/eu/misc-params.xml
index 4cd24a6d..8b6fc5b9 100644
--- a/docs/docs/stable/installer/eu/misc-params.xml
+++ b/docs/docs/stable/installer/eu/misc-params.xml
@@ -136,7 +136,7 @@ can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
+ <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Interfaze grafikoak</emphasis></para>
<para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
more information, see <xref linkend="configureX_chooser"/></para>
@@ -172,7 +172,7 @@ that interface as well.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
+ <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxiak</emphasis></para>
<para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
Internet. This section allows you to configure your computer to utilize a
@@ -199,7 +199,7 @@ your usage.</para>
</listitem>
<listitem>
- <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+ <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Suebaki</emphasis></para>
<para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
your computer. The safe and secure default is to allow ZERO inbound
diff --git a/docs/docs/stable/installer/eu/securityLevel.xml b/docs/docs/stable/installer/eu/securityLevel.xml
index d81ed7fc..81a624d5 100644
--- a/docs/docs/stable/installer/eu/securityLevel.xml
+++ b/docs/docs/stable/installer/eu/securityLevel.xml
@@ -31,7 +31,7 @@ the average user.</para>
<para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
instance if the system is to be used as a public server.</para>
- <para><emphasis role="bold">Security Administrator</emphasis></para>
+ <para><emphasis role="bold">Segurtasun administratzailea</emphasis></para>
<para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
send <emphasis>security alert messages</emphasis> when it detects situations
diff --git a/docs/docs/stable/installer/eu/selectKeyboardLive.xml b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
index fa4641e4..ae393e4e 100644
--- a/docs/docs/stable/installer/eu/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
@@ -13,7 +13,7 @@
<info>
<!--2018/03/01 apb: Slight adjustment to text-->
<!--2018/03/20 apb: Adjustment to text-->
-<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
+<title xml:id="selectKeyboardLive-ti1">Aukeratu Teklatua</title>
</info>
<mediaobject>
diff --git a/docs/docs/stable/installer/eu/setupBootloader.xml b/docs/docs/stable/installer/eu/setupBootloader.xml
index 74750809..37559187 100644
--- a/docs/docs/stable/installer/eu/setupBootloader.xml
+++ b/docs/docs/stable/installer/eu/setupBootloader.xml
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xreflabel="Bootloader" xml:id="setupBootloader"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="eu" xml:id="setupBootloader">
+
+
+
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -32,230 +20,264 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
<!--2019/01/06 apb: Typo.-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
-<title xml:id="setupBootloader-ti1">Bootloader</title>
+<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
+<title xml:id="setupBootloader-ti1">Abio zamatzailea</title>
</info>
-
<section>
- <title>Grub2</title>
-
- <itemizedlist>
- <title>Grub2 on Legacy MBR/GPT systems</title>
-
- <listitem>
- <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+ <title>Available Bootloaders</title>
+ <section>
+ <title>Grub2</title>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
+ <listitem>
+ <para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader will be written into either the MBR (Master
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
- </listitem>
- </itemizedlist>
-
- <itemizedlist>
- <title>Grub2-efi on UEFI systems</title>
-
- <listitem>
- <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
- </listitem>
-
- <listitem>
- <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
+ <listitem>
+ <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
+ </listitem>
+ <listitem>
+ <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
- <para>If there are already UEFI-based operating systems installed on your computer
+ <para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
-created by Windows and add grub2-efi to it. If no ESP exists, then one will
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
be created. Although it is possible to have several ESPs, only one is
required, whatever the number of operating systems you have.</para>
- </listitem>
- </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section>
+ <title>rEFInd</title>
+ <itemizedlist>
+ <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+ <listitem>
+ <para>rEFInd has a nice graphical set of options, and can auto-detect installed
+EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>Please note that in order to be able to use the <literal>rEFInd</literal>
+option, an installed EFI System Partition must match your system
+architecture: if you have a 32bit EFI System Partition installed on a 64bit
+machine for instance, then the rEFInd option will not be displayed/available
+to you.</para>
+ </note>
+ </section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Abio kargatzailearen aukera nagusiak</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
- <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
-systems will not see this option here.</para>
+ <itemizedlist>
+ <listitem>
+ <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
+can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
+<literal>UEFI</literal> systems.</para>
+ </listitem>
+ <listitem>
+ <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
+option solely for use with <literal>UEFI</literal> systems.</para>
+ </listitem>
+ </itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
- <para>Don't change this unless you really know what you are doing</para>
+ <warning>
+ <para>Don't change this unless you really know what you are doing.</para>
+ </warning>
+ <note>
+ <para>There is no option to write GRUB to the boot sector of a partition (e.g:
+<filename>sda1</filename>), as this method is considered unreliable.</para>
+ </note>
+ <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
+listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
- <para><emphasis>Advanced</emphasis></para>
-
+ <para><emphasis>Aurreratuak</emphasis></para>
<itemizedlist>
<listitem>
- <para><emphasis>Enable ACPI</emphasis></para>
-
+ <para><emphasis>Gaitu ACPI</emphasis></para>
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
- <title>Bootloader Configuration</title>
-
+ <title>Abio zamatzailearen konfiguraketa</title>
+ <para>If, in the previous section you selected <literal>rEFInd</literal> as the
+bootloader to use, you would then be presented with the options shown in the
+screenshot directly below. Otherwise, please instead move on to the
+subsequent screenshot for your options.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+ <para>Your rEFInd configuration options:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
+ </itemizedlist>
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
-then untick the Probe Foreign OS option.</para>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
- <para><emphasis>Advanced</emphasis></para>
-
+ <para><emphasis>Aurreratuak</emphasis></para>
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
-missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
-implications, and wish to proceed.</para>
+missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+understand the implications, and wish to proceed.</para>
+ <warning>
+ <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
+supported by Mageia as it is likely to fail when attempting to boot this
+resulting installation of Mageia. If you use anything other than GRUB2 or
+rEFInd for this purpose, then you do so at your own risk!</para>
+ </warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
- <title>Other Options</title>
-
+ <title>Beste aukera batzuk</title>
<section>
<title>Existitzen den abio kargatzaile bat erabiliz</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
- <xi:include href="setupBootloaderAddEntry.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/software.xml b/docs/docs/stable/installer/eu/software.xml
index 6137a4a8..26acf331 100644
--- a/docs/docs/stable/installer/eu/software.xml
+++ b/docs/docs/stable/installer/eu/software.xml
@@ -5,7 +5,7 @@
<title>Software</title>
<section>
- <title>Media Selection</title>
+ <title>Euskarri hautaketa</title>
<xi:include href="add_supplemental_media.xml"/>
diff --git a/docs/docs/stable/installer/fr/DrakLive.xml b/docs/docs/stable/installer/fr/DrakLive.xml
index 7cd63bae..e6b4395b 100644
--- a/docs/docs/stable/installer/fr/DrakLive.xml
+++ b/docs/docs/stable/installer/fr/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Installation à partir du médium LIVE</title>
<cover>
@@ -77,7 +80,9 @@ documentation</link>.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/fr/installUpdates.xml b/docs/docs/stable/installer/fr/installUpdates.xml
index 1292aea2..ba0bda20 100644
--- a/docs/docs/stable/installer/fr/installUpdates.xml
+++ b/docs/docs/stable/installer/fr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Mises à jour</title>
</info>
<mediaobject>
-<imageobject><imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/></imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Depuis la publication de cette version de Mageia, un certain nombre de
+ <para revision="1" xml:id="installUpdates-pa1">Depuis la publication de cette version de Mageia, un certain nombre de
paquets ont été mis à jour ou améliorés.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Sélectionnez <emphasis>Oui</emphasis> si vous voulez les télécharger et les
+ <para revision="1" xml:id="installUpdates-pa2">Sélectionnez <emphasis>Oui</emphasis> si vous voulez les télécharger et les
installer</para>
</listitem>
@@ -41,7 +54,7 @@ n'êtes pas connecté à Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Appuyez sur <emphasis>Suivant</emphasis> pour continuer</para>
+ <para revision="1" xml:id="installUpdates-pa3">Appuyez sur <emphasis>Suivant</emphasis> pour continuer</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/setupBootloader.xml b/docs/docs/stable/installer/fr/setupBootloader.xml
index 17e3d4ce..204223b7 100644
--- a/docs/docs/stable/installer/fr/setupBootloader.xml
+++ b/docs/docs/stable/installer/fr/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="fr" xreflabel="Bootloader" xml:id="setupBootloader"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="fr" xml:id="setupBootloader">
+
-
-
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -39,42 +22,34 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Programme d'amorçage</title>
</info>
-
<section>
<title>Programmes d'amorçage disponibles</title>
-
<section>
<title>Grub2</title>
-
<itemizedlist>
<para><emphasis role="bold">Grub2 pour systèmes Legacy MBR/GPT</emphasis></para>
-
<listitem>
<para>GRUB2 (avec ou sans menu graphique) sera utilisé pour un système MBR/Legacy
ou GPT/Legacy</para>
</listitem>
-
<listitem>
<para>Par défaut, un nouveau programme d'amorçage sera écrit soit dans le MBR
(Master Boot Record) de votre disque dur, soit dans la partition BIOS
d'amorçage.</para>
</listitem>
</itemizedlist>
-
<itemizedlist>
<para><emphasis role="bold">Grub2-efi pour systèmes UEFI</emphasis></para>
-
<listitem>
<para>Grub2-efi ou rEFInd peuvent être utilisés comme gestionnaire d'amorçage pour
un système UEFI.</para>
</listitem>
-
<listitem>
<para>Par défaut, un nouveau programme d'amorçage (Grub2-efi) sera écrit dans
l'ESP (Partition de système EFI).</para>
-
<para>S'il y a déjà des systèmes d'exploitation UEFI installés sur votre
ordinateur (Windows 8 par exemple), l'installeur Mageia détecte l'ESP
existante créée par Windows et ajoute grub2-efi. Bien qu'il soit possible
@@ -83,20 +58,16 @@ systèmes d'exploitation installés.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>rEFInd</title>
-
<itemizedlist>
<para><emphasis role="bold">rEFInd pour systèmes UEFI</emphasis></para>
-
<listitem>
<para>rEFInd dispose d'une belle collection d'options graphiques, et peut détecter
seul des programmes d'amorçage EFI déjà installés. Voir
http://www.rodsbooks.com/refind/</para>
</listitem>
</itemizedlist>
-
<note>
<para>Veuillez noter que pour utiliser l'option <literal>rEFInd</literal>, la
partition EFI doit avoir la même architecture que votre système : par
@@ -105,68 +76,54 @@ exemple, si vous avez une partition EFI 32bits installée sur une machine
</note>
</section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Configuration du programme d'amorçage</title>
</info>
-
<section>
<title>Principales options du chargeur de démarrage</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Gestionnaire d'amorçage à utiliser</emphasis></para>
-
<itemizedlist>
<listitem>
<para><guimenuitem>GRUB2</guimenuitem> (en mode graphique ou texte) peut être
choisi aussi bien pour des systèmes avec <literal>Legacy MBR/BIOS</literal>
que sur des systèmes <literal>UEFI</literal>.</para>
</listitem>
-
<listitem>
<para><guimenuitem>rEFInd</guimenuitem> (avec un menu graphique) est une option
qui ne peut être utilisée que sur des systèmes <literal>UEFI</literal>.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Périphérique d'amorçage</emphasis></para>
-
<warning>
<para>Ne modifiez rien ici, à moins que vous ne sachiez réellement ce que vous
faites.</para>
</warning>
-
<note>
<para>Il est impossible d'écrire GRUB sur le secteur de démarrage d'une partition
(par ex. <filename>sda1</filename>), car cette méthode n'est pas considérée
comme fiable.</para>
</note>
-
<para>En mode UEFI, le <guilabel>périphérique de démarrage</guilabel> apparaitra
dans la liste en tant que <guimenuitem>Partition système EFI</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Délai avant le démarrage sur le système par
défaut</emphasis></para>
-
<para>Cette boîte de dialogue vous permet de définir le délai, en seconde, avant
le démarrage du système d'exploitation par défaut.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Sécurité</emphasis></para>
-
<para>Il est possible ici d'établir un mot de passe pour le programme
d'amorçage. Dans ce cas, un nom d'utilisateur et un mot de passe seront
demandés au démarrage pour sélectionner une entrée ou modifier sa
@@ -174,27 +131,20 @@ configuration. Ceci est optionnel, et la plupart des utilisateurs n'en aura
probablement pas besoin. Le nom d'utilisateur est <literal>root</literal> et
le mot de passe est celui défini ci-après.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Mot de passe</emphasis></para>
-
<para>Choisissez un mot de passe pour le programme d'amorçage (optionnel)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Mot de passe (vérification)</emphasis></para>
-
<para>Entrez à nouveau le mot de passe et DrakX va vérifier qu'il est bien
identique au précédent. </para>
</listitem>
</itemizedlist>
-
<para><emphasis>Avancé</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Activer ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) est un standard de gestion
de l'énergie. Il permet d'économiser de l'énergie en arrêtant des
périphériques inutilisés. Décocher cette case peut être utile si, par
@@ -202,123 +152,112 @@ exemple, votre matériel n'est pas compatible ACPI ou si vous pensez que
l'ACPI peut être source de problèmes (comme des redémarrages aléatoires ou
des blocages).</para>
</listitem>
-
<listitem>
<para><emphasis>Activer SMP</emphasis></para>
-
<para>Cette option active/désactive le multi-processing symétrique pour les
processeurs multi-cœurs.</para>
</listitem>
-
<listitem>
<para><emphasis>Activer APIC</emphasis></para>
-
<para>Cela donne au système d'exploitation l'accès au Contrôleur Programmable
Avancé des Interruptions (Advanced Programmable Interrupt Controller). Les
périphériques APIC autorisent des modèles prioritaires plus complexes et la
gestion des IRQ (Interrupt Request, Requête d'interruption).</para>
</listitem>
-
<listitem>
<para><emphasis>Activer APIC local</emphasis></para>
-
<para>Il est possible ici d'établir l'APIC local, qui gère toutes les
interruptions externes pour un processeur spécifique d'un système SMP.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Configuration du programme d'amorçage</title>
-
<para>Si, dans la partie précédente, vous avez sélectionné le programme d'amorçage
<literal>rEFInd</literal>, vous accèderez alors aux options visibles dans la
capture d'écran ci-dessous. Sinon, continuez jusqu'à la capture suivante qui
montre vos options.</para>
-
<mediaobject>
<imageobject condition="classical"><imagedata align="center"
fileref="rEFIndLoaderConfig.png"/></imageobject><imageobject
condition="live"><imagedata align="center"
fileref="live-rEFIndLoaderConfig.png"/></imageobject></mediaobject>
-
+ <para>Vos options de configuration de rEFInd :</para>
<itemizedlist>
- <para>Vos options de configuration de rEFInd :</para>
-
<listitem>
- <para><guimenuitem>Installer ou mettre à jour rEFInd dans la partition
-EFI.</guimenuitem></para>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
</listitem>
-
<listitem>
- <para><guimenuitem>Installer dans /EFI/BOOT (contournement pour certains
-BIOS).</guimenuitem></para>
-
- <para>Avec certains BIOS, le programme d'amorçage écrit pour Mageia à la fin de
-l'installation ne sera pas reconnu. Dans ce cas, vous pouvez utiliser cette
-option pour contourner le problème.</para>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
- <para>Si vous n'avez pas choisi rEFInd comme programme d'amorçage dans la partie
-précédente, alors les paramètres de ce dernier se présenteront ainsi :</para>
-
+ <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configuration options are shown below:</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Choix par défaut</emphasis></para>
-
<para>Système d'exploitation démarré par défaut.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Ajouter des options</emphasis></para>
-
<para>Cela permet de passer des informations au noyau ou de lui demander plus
d'informations lors du démarrage.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Détecter d'autres OS</emphasis></para>
-
<para>Si vous avez d'autres systèmes d'exploitation installés, Mageia tente de les
ajouter à votre nouveau menu de démarrage. Si vous ne le souhaitez pas,
décochez la case <guimenuitem>Détecter d'autres OS</guimenuitem>.</para>
</listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
</itemizedlist>
-
<para><emphasis>Avancé</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Mode Vidéo</emphasis></para>
-
<para>Définir ici la taille de l'écran et la profondeur de couleurs qui seront
utilisés par le menu de démarrage. Si vous cliquez sur le triangle, des
options supplémentaires de taille d'écran et de profondeur de couleurs vous
seront proposées.</para>
</listitem>
-
<listitem>
<para><emphasis>Ne pas toucher à l'ESP ou au MBR</emphasis></para>
-
<para>Choisissez cette option si vous ne voulez pas démarrer sur Mageia, mais
préférez le démarrer à partir d'un autre système d'exploitation. Un message
d'erreur vous indiquera que le programme d'amorçage est absent. Cliquez sur
<guimenuitem>Ok</guimenuitem> si vous êtes sûr de comprendre les
implications et souhaitez quand-même continuer.</para>
-
<warning>
<para>Démarrer via des programmes d'amorçage anciens (GRUB Legacy et LiLo) n'est
plus supporté par Mageia, car le démarrage échouera probablement en fin
@@ -327,36 +266,28 @@ faites-le à vos risques et périls !</para>
</warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Autres options</title>
-
<section>
<title>Utiliser un chargeur de démarrage existant. </title>
-
- <para>La procédure correcte pour ajouter votre système Mageia dans un programme de
-démarrage existant dépasse le cadre de cette documentation, néanmoins, dans
-la plupart des cas, cela impliquera d'exécuter le programme d'installation
-du chargeur de démarrage concerné, qui devrait le détecter et l'ajouter
-automatiquement. Voir la documentation du système d'exploitation en
-question.</para>
+ <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However, in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installer sans programme d'amorçage</title>
-
<para>Bien que vous puissiez choisir d'installer Mageia sans programme d'amorçage
(voir la partie 2.1 Avancé), cela n'est pas recommandé à moins que vous
sachiez parfaitement ce que vous faites, car sans aucun programme
d'amorçage, votre système d'exploitation ne pourra démarrer.</para>
</section>
-
<xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/DrakLive.xml b/docs/docs/stable/installer/hr/DrakLive.xml
index a9a478c2..71899948 100644
--- a/docs/docs/stable/installer/hr/DrakLive.xml
+++ b/docs/docs/stable/installer/hr/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Installation from LIVE medium</title>
<cover>
@@ -77,7 +80,9 @@ tim</link>, ako želite pomoći u poboljšanju ovog priručnika.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/hr/installUpdates.xml b/docs/docs/stable/installer/hr/installUpdates.xml
index d5086cd4..37336daf 100644
--- a/docs/docs/stable/installer/hr/installUpdates.xml
+++ b/docs/docs/stable/installer/hr/installUpdates.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="installUpdates"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
+
+
@@ -19,19 +28,23 @@
<!-- marja, 2012-04-24 added screenshot -->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/25 apb: Added bullets to some text.-->
+<!--2020/06/28 apb: Added live-installUpdates.png (this feature was added to the live installer by Martin Witaker 2020/06/27).-->
<title xml:id="installUpdates-ti1">Nadogradnje</title>
</info>
<mediaobject>
-<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
-align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-installUpdates.png" format="png" revision="1"
+xml:id="installUpdates-im1"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-installUpdates.png" format="png"/>
+</imageobject></mediaobject>
- <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+ <para revision="1" xml:id="installUpdates-pa1">Since this version of Mageia was released, some packages will have been
updated or improved.</para>
<itemizedlist>
<listitem>
- <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+ <para revision="1" xml:id="installUpdates-pa2">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
</listitem>
<listitem>
@@ -40,7 +53,7 @@ aren't connected to the Internet</para>
</listitem>
<listitem>
- <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+ <para revision="1" xml:id="installUpdates-pa3">Press <emphasis>Next</emphasis> to continue</para>
</listitem>
</itemizedlist>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/setupBootloader.xml b/docs/docs/stable/installer/hr/setupBootloader.xml
index f2b1a057..3a0e49e6 100644
--- a/docs/docs/stable/installer/hr/setupBootloader.xml
+++ b/docs/docs/stable/installer/hr/setupBootloader.xml
@@ -1,32 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xreflabel="Bootloader" xml:id="setupBootloader"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xreflabel="Bootloader" version="5.0" xml:lang="hr" xml:id="setupBootloader">
+
-
-
-
-
-
-
-
-
-
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
@@ -39,40 +22,32 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
+<!--2020/06/28 apb: 1.2.2 updated SC's to reflect changes to installer by Martin Whitaker (2020/06/27): Install to EFI/Boot. Adjust text to match.-->
<title xml:id="setupBootloader-ti1">Program za pokretanje sustava</title>
</info>
-
<section>
<title>Available Bootloaders</title>
-
<section>
<title>Grub2</title>
-
<itemizedlist>
<para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
-
<listitem>
<para>GRUB2 (with or without graphical menu) will be used exclusively as the
bootloader for a Legacy/MBR or Legacy/GPT system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader will be written into either the MBR (Master
Boot Record) of your first hard drive or in the BIOS boot partition.</para>
</listitem>
</itemizedlist>
-
<itemizedlist>
<para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
-
<listitem>
<para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
</listitem>
-
<listitem>
<para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
System Partition).</para>
-
<para>If there are already UEFI-based operating systems installed on your computer
(Windows 8 for example), the Mageia installer will detect the existing ESP
created by Windows and add grub2-efi to it. If no ESP exists, then one will
@@ -81,19 +56,15 @@ required, whatever the number of operating systems you have.</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>rEFInd</title>
-
<itemizedlist>
<para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
-
<listitem>
<para>rEFInd has a nice graphical set of options, and can auto-detect installed
EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
</listitem>
</itemizedlist>
-
<note>
<para>Please note that in order to be able to use the <literal>rEFInd</literal>
option, an installed EFI System Partition must match your system
@@ -103,212 +74,180 @@ to you.</para>
</note>
</section>
</section>
-
<section>
<info>
<title xml:id="setupBootloader-ti2">Bootloader Setup</title>
</info>
-
<section>
<title>Glavne postavke bootloadera</title>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader.png"
-xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
+fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Bootloader to use</emphasis></para>
-
<itemizedlist>
<listitem>
<para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
<literal>UEFI</literal> systems.</para>
</listitem>
-
<listitem>
<para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative
option solely for use with <literal>UEFI</literal> systems.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Boot device</emphasis></para>
-
<warning>
<para>Don't change this unless you really know what you are doing.</para>
</warning>
-
<note>
<para>There is no option to write GRUB to the boot sector of a partition (e.g:
<filename>sda1</filename>), as this method is considered unreliable.</para>
</note>
-
<para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Delay before booting the default image</emphasis></para>
-
<para>This text box lets you set a delay, in seconds, before the default operating
system is started up.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Security</emphasis></para>
-
<para>This allows you to set a password for the bootloader. This means a username
and password will be required when booting in order to select a booting
entry or change settings. This is optional, and most people are not likely
to have a need for it. The username is <literal>root</literal> and the
password is the one chosen hereafter.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Lozinka</emphasis></para>
-
<para>Choose a password for the bootloader (optional)</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Password (again)</emphasis></para>
-
<para>Retype the password and DrakX will check that it matches with the one set
above</para>
</listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<itemizedlist>
<listitem>
<para><emphasis>Enable ACPI</emphasis></para>
-
<para>ACPI (Advanced Configuration and Power Interface) is a standard for power
management. It can save energy by stopping unused devices. Deselecting 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).</para>
</listitem>
-
<listitem>
<para><emphasis>Enable SMP</emphasis></para>
-
<para>This option enables/disables symmetric multiprocessing for multi-core
processors</para>
</listitem>
-
<listitem>
<para><emphasis>Enable APIC</emphasis></para>
-
<para>Enabling 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.</para>
</listitem>
-
<listitem>
<para><emphasis>Enable Local APIC</emphasis></para>
-
<para>Here you can set Local APIC, which manages all external interrupts for a
specific processor in an SMP system</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Podešavanje bootloadera</title>
-
<para>If, in the previous section you selected <literal>rEFInd</literal> as the
bootloader to use, you would then be presented with the options shown in the
screenshot directly below. Otherwise, please instead move on to the
subsequent screenshot for your options.</para>
-
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
condition="live"> <imagedata align="center"
fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
-
+ <para>Your rEFInd configuration options:</para>
<itemizedlist>
- <para>Your rEFInd configuration options:</para>
-
<listitem>
- <para><guimenuitem>Install or update rEFInd in the EFI system
-partition.</guimenuitem></para>
+ <para><emphasis role="bold">Install or update rEFInd in the EFI system
+partition.</emphasis></para>
</listitem>
-
<listitem>
- <para><guimenuitem>Install in EFI/Boot partition (workaround for some
-BIOS's).</guimenuitem></para>
-
- <para>With some BIOS's, the newly written bootloader for Mageia at end of the
-installation will not be recognized. In that case, you can use this option
-as a workaround for the issue.</para>
+ <para><emphasis role="bold">Install in /EFI/BOOT.</emphasis></para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
</listitem>
</itemizedlist>
-
<para>If you did not select rEFInd as the bootloader to use in the previous
-section, then your bootloader configurations are shown below:</para>
-
+section, then your bootloader configuration options are shown below:</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
-
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis role="bold">Default</emphasis></para>
-
<para>The operating system to be started up by default.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Append</emphasis></para>
-
<para>This option lets you pass information to the kernel or tell the kernel to
give you more information as it boots.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Probe foreign OS</emphasis></para>
-
<para>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,
then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
</listitem>
+ <listitem>
+ <para><emphasis role="bold">Install in /EFI/BOOT. </emphasis>(Note: this menu
+option only becomes available where the installer detects that a machine is
+in UEFI mode).</para>
+ <para>This option installs the bootloader in the /EFI/BOOT directory of the ESP
+(EFI System Partition). This can be useful when:</para>
+ <para>(a) Installing onto a removable drive (e.g. a USB stick) that can be removed
+and plugged into a different machine. If the bootloader is stored in
+/EFI/BOOT, UEFI BIOS's will detect it and allow you to boot from that
+drive).</para>
+ <para>(b) As a workaround where, due to a buggy UEFI BIOS, the newly written
+bootloader for Mageia will not be recognized at end of the installation.</para>
+ </listitem>
</itemizedlist>
-
<para><emphasis>Advanced</emphasis></para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
<para><emphasis>Video mode</emphasis></para>
-
<para>This sets the screen size and colour depth to be used by the boot menu. If
you click the down-triangle you will be offered other size and colour depth
options.</para>
</listitem>
-
<listitem>
<para><emphasis>Do not touch ESP or MBR</emphasis></para>
-
<para>Select this option if you don't want a bootable Mageia, but would rather
chain-load it from another OS. You will get a warning that the bootloader is
missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
understand the implications, and wish to proceed.</para>
-
<warning>
<para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer
supported by Mageia as it is likely to fail when attempting to boot this
@@ -317,35 +256,28 @@ rEFInd for this purpose, then you do so at your own risk!</para>
</warning>
</listitem>
</itemizedlist>
-
<mediaobject>
-<imageobject> <imagedata align="center"
-fileref="live-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
</section>
</section>
-
<section>
<title>Ostali izbori</title>
-
<section>
<title>Using an existing bootloader</title>
-
<para>The exact procedure for adding Mageia to an existing bootloader is beyond
-the scope of this documentation. However in most cases it will involve
+the scope of this documentation. However, in most cases it will involve
running the relevant bootloader installation program, which should detect
Mageia and automatically add an entry for it in the bootloader menu. See the
documentation for the relevant operating system.</para>
</section>
-
<section>
<title>Installing Without a Bootloader</title>
-
<para>While you can opt to install Mageia without a bootloader (see section 2.1
Advanced), this is not recommended unless you absolutely know what you are
doing, as without some form of bootloader your operating system will be
unable to start.</para>
</section>
-
<xi:include href="setupBootloaderAddEntry.xml"/>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/DrakLive.xml b/docs/docs/stable/installer/hu/DrakLive.xml
index 0c428eac..3e33b51f 100644
--- a/docs/docs/stable/installer/hu/DrakLive.xml
+++ b/docs/docs/stable/installer/hu/DrakLive.xml
@@ -11,10 +11,13 @@
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
<title>Telepítés a LIVE médiumról</title>
<cover>
@@ -76,7 +79,9 @@ Team</link>, if you would like to help improve this manual.</para>
<!-- <xi:include href="setupBootloaderAddEntry.xml"/>
-->
-<xi:include href="reboot.xml"/>
+<xi:include href="installUpdates.xml"/>
+
+ <xi:include href="reboot.xml"/>
<xi:include href="addUser.xml"/>
diff --git a/docs/docs/stable/installer/hu/addUser.xml b/docs/docs/stable/installer/hu/addUser.xml
index 4a38add0..87d6e78e 100644
--- a/docs/docs/stable/installer/hu/addUser.xml
+++ b/docs/docs/stable/installer/hu/addUser.xml
@@ -19,6 +19,10 @@
+
+
+
+
<mediaobject>
<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
<!--2018/02/12 apb: Text and Typography.-->
@@ -26,10 +30,12 @@
<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
<!--2018/02/24 apb: Changed list style.-->
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-setRootPassword.png" format="PNG" revision="1"
-xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<section xml:id="root-password">
<info>
@@ -38,13 +44,15 @@ fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
<para>It is advisable for all Mageia installations to set a
<literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a 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 underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
<note xml:id="givePassword">
+ <para>As you type a password into the top box a 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.</para>
+
<para>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.</para>
</note>
@@ -78,14 +86,19 @@ computer for.</para>
<para>Enter the user login name or let DrakX use a version of the user's real
name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
+ <caution condition="live">
+ <simpara>The login entered here should be different to any login currently in use for
+your <filename>/home</filename> directory. Some user parameters will be
+written in the user space, and some can overwrite actual data such as
+Firefox, Thunderbird or Kmail data...</simpara>
+ </caution>
</listitem>
<listitem>
<para><emphasis role="bold">Password</emphasis></para>
- <para>Type in the user password. There is a shield at the end of the text box that
-indicates the strength of the password. (See also <xref
-linkend="givePassword"/>)</para>
+ <para>Type in the user password (remembering the advice in the Note above).</para>
<para><emphasis role="bold">Password (again):</emphasis> Retype the user
password. DrakX will check that you have not mistyped the password.</para>
diff --git a/docs/docs/stable/installer/hu/bootLive.xml b/docs/docs/stable/installer/hu/bootLive.xml
index c21b65f7..eece2dcb 100644
--- a/docs/docs/stable/installer/hu/bootLive.xml
+++ b/docs/docs/stable/installer/hu/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xmlns="http://docbook.org/ns/docbook"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1998/Math/MathML"
- xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hu">
-
-
-
-
-
-
-
<info>
<!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -30,20 +17,16 @@
DVD.-->
<title xml:id="bootLive-ti1">Mageia indítása mint Live rendszer</title>
</info>
-
<section xml:id="bootLive-1">
<info>
<title xml:id="bootLive1-ti1">Betöltés az adathordozóról</title>
</info>
-
<para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
the USB device in or place the DVD in the drive and restart the computer.</para>
-
<para>If the computer does not automatically boot from the USB or DVD you may need
to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
accessing the boot device menu to select a device from which the computer
will boot.</para>
-
<tip>
<para>To access the BIOS or boot menu when the computer is starting, you can try
pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
boot device menu. These (fairly common) keys are just a selection of
possible options though.</para>
</tip>
-
<note>
<para>The actual screen that you will first see when booting from the Live media
will depend on whether your computer motherboard is of the Legacy (BIOS) or
UEFI type.</para>
</note>
</section>
-
<section xml:id="biosmode">
<info>
<title xml:id="biosmode-ti1">BIOS/CSM/Legacy módban</title>
</info>
-
<mediaobject>
- <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+ <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
</imageobject>
-
<caption>
<para>Az első képernyő a BIOS módban történő indítás során</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS).</para>
-
<para>Once the boot is done, you can proceed to the installation.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Boot the Mageia Live system using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
-
<itemizedlist>
<listitem>
<para><emphasis role="bold">+ use non-free video drivers (slower to
boot)</emphasis></para>
-
<para>Install Mageia using non-free video drivers</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para><emphasis role="bold">Memory Test</emphasis></para>
-
<para>Test the installed RAM by performing multiple read and write
operations. Reboot to end the test.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
</section>
-
<section xml:id="uefimode">
<info>
<title xml:id="uefimode-ti1">UEFI módal</title>
</info>
-
<mediaobject condition="live">
- <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+ <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
<caption>
<para>First screen while booting in UEFI mode</para>
</caption>
</mediaobject>
-
<itemizedlist>
<title>Menu</title>
-
<listitem>
<para><emphasis role="bold">Boot Mageia</emphasis></para>
-
<para>This option will boot the Mageia Live system from the connected DVD/USB
media (expect a very slow system compared to an installed OS). Once the
boot is done, you can proceed to the installation</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Install Mageia</emphasis></para>
-
<para>This option will install Mageia to a hard disk.</para>
</listitem>
-
<listitem>
<para><emphasis role="bold"> F2 Language</emphasis></para>
-
<para>Press <keycap>F2</keycap> to have the installer use a specific language
during the installation. Use the arrow keys to select the language then
press <keycap>Enter</keycap>.</para>
</listitem>
</itemizedlist>
-
<note>
<para>If you booted from a USB stick, you will see the above menu options
duplicated, and in this case, you should choose from the menu pair that will
be suffixed with "USB".</para>
</note>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/configureX_card_list.xml b/docs/docs/stable/installer/hu/configureX_card_list.xml
index 6d4ecf3d..352f6a34 100644
--- a/docs/docs/stable/installer/hu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/hu/configureX_card_list.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_card_list"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu"
+ xreflabel="Choose an X Server (Configure your Graphic Card)"
+ xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
+
+
<info>
<!-- Initiated by Marja 2012-08-08 -->
<!-- Further text JohnR 2012-08-29 -->
@@ -28,6 +31,7 @@
<!-- Done corrections accordind to tmb remarks. Papoteur -->
<!--2018/02/15 apb: Text and typography.-->
<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
</info>
@@ -42,7 +46,7 @@ correctly identify your video device.</para>
<para>If the installer has not correctly detected your graphic card and you know
which one you have, you can select it from the tree by: <itemizedlist>
<listitem>
- <para>Vendor</para>
+ <para>Gyártó</para>
</listitem>
<listitem>
diff --git a/docs/docs/stable/installer/hu/configureX_chooser.xml b/docs/docs/stable/installer/hu/configureX_chooser.xml
index 4a71407d..d9f7d734 100644
--- a/docs/docs/stable/installer/hu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/hu/configureX_chooser.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_chooser"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu" xreflabel="Graphics Card and Monitor Configuration"
+ xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
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">
- <info>
- <title xml:id="configureX_chooser-ti1">Videó-kártya és Monitor beállítások</title>
- </info>
+
@@ -21,12 +19,17 @@
- <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+ <info>
+ <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
<!--2018/02/15 apb: Some text and typography.-->
<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
<!--2018/02/23 apb: Typo.-->
<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+ </info>
+
+ <mediaobject>
<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
<itemizedlist>
<listitem>
- <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+ <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
<para>If you need to, you can select a specific card from this expandable
list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/hu/configureX_monitor.xml b/docs/docs/stable/installer/hu/configureX_monitor.xml
index b4a9f398..5e7fbe36 100644
--- a/docs/docs/stable/installer/hu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/hu/configureX_monitor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="configureX_monitor"
- xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="hu" xreflabel="Choosing your Monitor"
+ xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/1998/Math/MathML"
xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
+
+
+
+
<info>
<!-- Initiated by Marga 2012-8-09 -->
<!-- Further text JohnR 2012-08-30 -->
@@ -25,6 +29,8 @@
<!---->
<!--2018/02/12 apb: Text and typography-->
<!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
<title xml:id="configureX_monitor-ti1">Monitor kiválasztása</title>
</info>
@@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+ <term revision="1" xml:id="configureX_monitor-pa2">Egyéni</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
@@ -60,7 +66,7 @@ consult your monitor documentation.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+ <term revision="1" xml:id="configureX_monitor-pa5">Plug and Play</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
@@ -69,11 +75,11 @@ type from the monitor database.</para>
</varlistentry>
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+ <term revision="1" xml:id="configureX_monitor-pa7">Gyártó</term>
<listitem>
<para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting:</para>
+one you have, you can choose it from the options by selecting:</para>
</listitem>
</varlistentry>
</variablelist>
@@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para>
<variablelist spacing="compact">
<varlistentry>
- <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+ <term revision="1" xml:id="configureX_monitor-pa9">Általános</term>
<listitem>
- <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically. Once again it
-may be wise to be conservative in your selections.</para>
+ <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docs/stable/installer/hu/diskPartitioning.xml b/docs/docs/stable/installer/hu/diskPartitioning.xml
index 62016ae3..2ec8d52f 100644
--- a/docs/docs/stable/installer/hu/diskPartitioning.xml
+++ b/docs/docs/stable/installer/hu/diskPartitioning.xml
@@ -2,7 +2,7 @@
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
-<title>Partitioning</title>
+<title>Partícionálás</title>
<xi:include href="doPartitionDisks.xml"/>
diff --git a/docs/docs/stable/installer/hu/diskdrake.xml b/docs/docs/stable/installer/hu/diskdrake.xml
index 042c8afd..6ba5ce7f 100644
--- a/docs/docs/stable/installer/hu/diskdrake.xml
+++ b/docs/docs/stable/installer/hu/diskdrake.xml
@@ -13,8 +13,10 @@
-
-
+
+
+
+
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
<!--2018/02/12 apb: Text and typography.-->
<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
</info>
@@ -41,8 +44,8 @@ before you start.</para>
<listitem>
<para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
</listitem>