aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/en/SelectAndUseISOs2.xml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer/en/SelectAndUseISOs2.xml')
-rw-r--r--docs/installer/en/SelectAndUseISOs2.xml70
1 files changed, 15 insertions, 55 deletions
diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index 12a8c2e6..dca3b62f 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -1,5 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="Select-and-use-ISOs" version="5.0">
- <!-- Made by Lebarhon 2014 03 26 -->
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="Select-and-use-ISOs">
+ <!-- Made by Lebarhon 2014 03 26
+
+Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
<info>
<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
@@ -89,30 +91,6 @@
</listitem>
</itemizedlist>
</section>
-
- <section>
- <title>DVD dual arch</title>
-
- <itemizedlist>
- <listitem>
- <para>Both architectures are present on the same medium, the
- choice is made automatically according to the detected CPU.</para>
- </listitem>
-
- <listitem>
- <para>Uses Xfce desktop only.</para>
- </listitem>
-
- <listitem>
- <para>Not all languages are available. (be, bg, ca, de, en, es,
- fr, it, mk, pl, pt, ru, sv, uk) TO BE CHECKED!</para>
- </listitem>
-
- <listitem>
- <para>It contains non free software.</para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section>
@@ -128,8 +106,8 @@
</listitem>
<listitem>
- <para>Each ISO contains only one desktop environment (KDE or
- GNOME).</para>
+ <para>Each ISO contains only one desktop environment (KDE, GNOME
+ or Xfce).</para>
</listitem>
<listitem>
@@ -149,25 +127,25 @@
</section>
<section>
- <title>Live CD KDE</title>
+ <title>Live DVD Plasma</title>
<itemizedlist>
<listitem>
- <para>KDE desktop environment only.</para>
+ <para>Plasma desktop environment only.</para>
</listitem>
<listitem>
- <para>English language only.</para>
+ <para>All languages are present.</para>
</listitem>
<listitem>
- <para>32 bit only.</para>
+ <para>Different media for 32 or 64 bit architectures.</para>
</listitem>
</itemizedlist>
</section>
<section>
- <title>Live CD GNOME</title>
+ <title>Live DVD GNOME</title>
<itemizedlist>
<listitem>
@@ -175,24 +153,6 @@
</listitem>
<listitem>
- <para>English language only.</para>
- </listitem>
-
- <listitem>
- <para>32 bit only.</para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section>
- <title>Live DVD KDE</title>
-
- <itemizedlist>
- <listitem>
- <para>KDE desktop environment only.</para>
- </listitem>
-
- <listitem>
<para>All languages are present.</para>
</listitem>
@@ -203,11 +163,11 @@
</section>
<section>
- <title>Live DVD GNOME</title>
+ <title>Live DVD Xfce</title>
<itemizedlist>
<listitem>
- <para>GNOME desktop environment only.</para>
+ <para>Xfce desktop environment only.</para>
</listitem>
<listitem>
@@ -255,7 +215,7 @@
</section>
<section>
- <title>boot.iso</title>
+ <title>netinstall.iso</title>
<itemizedlist>
<listitem>
@@ -266,7 +226,7 @@
</section>
<section>
- <title>boot-nonfree.iso</title>
+ <title>netinstall-nonfree.iso</title>
<itemizedlist>
<listitem>