Fix XML translations

72 files changed, 250 insertions, 126 deletions

diff --git a/docs/docs/stable/bootiso/ca/netInstall-intro.xml b/docs/docs/stable/bootiso/ca/netInstall-intro.xml
index 6138ba42..48f965eb 100644
--- a/docs/docs/stable/bootiso/ca/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/ca/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/ca/netInstall-stage1.xml b/docs/docs/stable/bootiso/ca/netInstall-stage1.xml
index 66bed270..788a3944 100644
--- a/docs/docs/stable/bootiso/ca/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/ca/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/ca/netInstall-stage2.xml b/docs/docs/stable/bootiso/ca/netInstall-stage2.xml
index f603ef66..7cc3d9a1 100644
--- a/docs/docs/stable/bootiso/ca/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/ca/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/cs/netInstall-intro.xml b/docs/docs/stable/bootiso/cs/netInstall-intro.xml
index a7a81f9d..63a634c8 100644
--- a/docs/docs/stable/bootiso/cs/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/cs/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/cs/netInstall-stage1.xml b/docs/docs/stable/bootiso/cs/netInstall-stage1.xml
index dddbe5c1..5e6a2e97 100644
--- a/docs/docs/stable/bootiso/cs/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/cs/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/cs/netInstall-stage2.xml b/docs/docs/stable/bootiso/cs/netInstall-stage2.xml
index fce7a4a3..18bc3539 100644
--- a/docs/docs/stable/bootiso/cs/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/cs/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/de/netInstall-intro.xml b/docs/docs/stable/bootiso/de/netInstall-intro.xml
index b2c2f2a0..db853107 100644
--- a/docs/docs/stable/bootiso/de/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/de/netInstall-intro.xml
@@ -63,7 +63,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/de/netInstall-stage1.xml b/docs/docs/stable/bootiso/de/netInstall-stage1.xml
index 00ffc78f..f2ad11a7 100644
--- a/docs/docs/stable/bootiso/de/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/de/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -249,8 +252,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/de/netInstall-stage2.xml b/docs/docs/stable/bootiso/de/netInstall-stage2.xml
index 7da3a2ee..4f230217 100644
--- a/docs/docs/stable/bootiso/de/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/de/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Bisher wurde noch nichts auf Ihre Festplatte geschrieben. Falls Sie sich
@@ -41,7 +44,7 @@ und doch mit der Installation fortzufahren möchten).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/el/netInstall-intro.xml b/docs/docs/stable/bootiso/el/netInstall-intro.xml
index 8f29db2c..b2f34758 100644
--- a/docs/docs/stable/bootiso/el/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/el/netInstall-intro.xml
@@ -62,7 +62,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/el/netInstall-stage1.xml b/docs/docs/stable/bootiso/el/netInstall-stage1.xml
index 695b58b9..dfa19694 100644
--- a/docs/docs/stable/bootiso/el/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/el/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/el/netInstall-stage2.xml b/docs/docs/stable/bootiso/el/netInstall-stage2.xml
index 668e4ee6..9a187de6 100644
--- a/docs/docs/stable/bootiso/el/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/el/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/eo/netInstall-intro.xml b/docs/docs/stable/bootiso/eo/netInstall-intro.xml
index 787b8b73..9f76405e 100644
--- a/docs/docs/stable/bootiso/eo/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/eo/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/eo/netInstall-stage1.xml b/docs/docs/stable/bootiso/eo/netInstall-stage1.xml
index 8d9b7f0c..422482db 100644
--- a/docs/docs/stable/bootiso/eo/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/eo/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/eo/netInstall-stage2.xml b/docs/docs/stable/bootiso/eo/netInstall-stage2.xml
index ac3ab250..91f49d20 100644
--- a/docs/docs/stable/bootiso/eo/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/eo/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/es/netInstall-intro.xml b/docs/docs/stable/bootiso/es/netInstall-intro.xml
index fcc2fb6c..3124cd49 100644
--- a/docs/docs/stable/bootiso/es/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/es/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/es/netInstall-stage1.xml b/docs/docs/stable/bootiso/es/netInstall-stage1.xml
index 581bcd7b..6b24e9e1 100644
--- a/docs/docs/stable/bootiso/es/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/es/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-bienvenido2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/es/netInstall-stage2.xml b/docs/docs/stable/bootiso/es/netInstall-stage2.xml
index ffe587ec..2c213683 100644
--- a/docs/docs/stable/bootiso/es/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/es/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/et/netInstall-intro.xml b/docs/docs/stable/bootiso/et/netInstall-intro.xml
index 2238ecea..38ece9b4 100644
--- a/docs/docs/stable/bootiso/et/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/et/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/et/netInstall-stage1.xml b/docs/docs/stable/bootiso/et/netInstall-stage1.xml
index 111c1cba..a61d9b4c 100644
--- a/docs/docs/stable/bootiso/et/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/et/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/et/netInstall-stage2.xml b/docs/docs/stable/bootiso/et/netInstall-stage2.xml
index cdd1dc8c..0be31b3a 100644
--- a/docs/docs/stable/bootiso/et/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/et/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/eu/netInstall-intro.xml b/docs/docs/stable/bootiso/eu/netInstall-intro.xml
index dcf901e7..fb4fa87f 100644
--- a/docs/docs/stable/bootiso/eu/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/eu/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/eu/netInstall-stage1.xml b/docs/docs/stable/bootiso/eu/netInstall-stage1.xml
index 23024fde..20d49f23 100644
--- a/docs/docs/stable/bootiso/eu/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/eu/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/eu/netInstall-stage2.xml b/docs/docs/stable/bootiso/eu/netInstall-stage2.xml
index 9e2a94fe..eb0ea16c 100644
--- a/docs/docs/stable/bootiso/eu/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/eu/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/fr/netInstall-intro.xml b/docs/docs/stable/bootiso/fr/netInstall-intro.xml
index cf5b0e7b..db0b371f 100644
--- a/docs/docs/stable/bootiso/fr/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/fr/netInstall-intro.xml
@@ -62,9 +62,9 @@ réseau, contrôleur de disque, etc.</para>
         </listitem>
       </itemizedlist>
 
-      <para>Les deux versions sont disponibles pour les architectures 32-bit et
-64-bit. Voir ici : <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/downloads/</link></para>
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/fr/netInstall-stage1.xml b/docs/docs/stable/bootiso/fr/netInstall-stage1.xml
index 66963346..47a1d990 100644
--- a/docs/docs/stable/bootiso/fr/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/fr/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Étape 1 (Étape pré-installation)</title>
 
   <section>
@@ -40,7 +43,7 @@ les paramètres par défaut.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -252,9 +255,9 @@ répertoire qui contient la distribution Mageia :</para>
         </imageobject>
       </mediaobject>
 
-      <para>Après avoir indiqué les détails NFS, <emphasis><xref
-linkend="netStageTwo"/></emphasis> vous continuerez automatiquement vers
-<emphasis><xref linkend="netStageTwo"/></emphasis>(l'étape d'installation)</para>
+      <para>After entering the NFS details, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
     </section>
   </section>
 
diff --git a/docs/docs/stable/bootiso/fr/netInstall-stage2.xml b/docs/docs/stable/bootiso/fr/netInstall-stage2.xml
index 35978b5b..81cac64d 100644
--- a/docs/docs/stable/bootiso/fr/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/fr/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Étape 2 (Étape d'installation)</title>
 
   <para>À ce stade, rien n'a été écrit sur votre disque dur. Si vous décidez
@@ -39,7 +42,7 @@ pour revenir si vous changez d'avis).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/hr/netInstall-intro.xml b/docs/docs/stable/bootiso/hr/netInstall-intro.xml
index 92c2eebb..0e55422e 100644
--- a/docs/docs/stable/bootiso/hr/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/hr/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/hr/netInstall-stage1.xml b/docs/docs/stable/bootiso/hr/netInstall-stage1.xml
index e7275e5a..4b22e2d4 100644
--- a/docs/docs/stable/bootiso/hr/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/hr/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/hr/netInstall-stage2.xml b/docs/docs/stable/bootiso/hr/netInstall-stage2.xml
index ec8cc0c9..562843a3 100644
--- a/docs/docs/stable/bootiso/hr/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/hr/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/hu/netInstall-intro.xml b/docs/docs/stable/bootiso/hu/netInstall-intro.xml
index db71fb60..c655199e 100644
--- a/docs/docs/stable/bootiso/hu/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/hu/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/hu/netInstall-stage1.xml b/docs/docs/stable/bootiso/hu/netInstall-stage1.xml
index d1b82808..77632ed1 100644
--- a/docs/docs/stable/bootiso/hu/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/hu/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/hu/netInstall-stage2.xml b/docs/docs/stable/bootiso/hu/netInstall-stage2.xml
index 617a3b55..15e0ade5 100644
--- a/docs/docs/stable/bootiso/hu/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/hu/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/ja/netInstall-stage1.xml b/docs/docs/stable/bootiso/ja/netInstall-stage1.xml
index 4703e26c..282d6649 100644
--- a/docs/docs/stable/bootiso/ja/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/ja/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (インストール前の段階)</title>
 
   <section>
@@ -37,7 +40,7 @@
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -231,8 +234,7 @@ linkend="netStageTwo"/></emphasis> (実際のインストール段階) に進み
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/ja/netInstall-stage2.xml b/docs/docs/stable/bootiso/ja/netInstall-stage2.xml
index 5a870bd8..57f4927c 100644
--- a/docs/docs/stable/bootiso/ja/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/ja/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (インストール段階)</title>
 
   <para>この時点ではお使いのハード
@@ -37,7 +40,7 @@
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/nb/netInstall-intro.xml b/docs/docs/stable/bootiso/nb/netInstall-intro.xml
index b2a1bdfd..fa35f388 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-intro.xml
@@ -62,7 +62,7 @@ nettverksenheten, diskkontrolleren etc.</para>
 
       <para>Begge versjonene er tilgjengelige i form av separate 32-biters og 64-bits
 ISO-er. Se her: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/no/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/nb/netInstall-stage1.xml b/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
index ee677b58..0a85655a 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Trinn 1 (Pre-installasjonsfase)</title>
 
   <section>
@@ -40,7 +43,7 @@ med standard insstillinger</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -246,9 +249,9 @@ inneholder Mageia-distribusjonen:</para>
         </imageobject>
       </mediaobject>
 
-      <para>Når du har skrevet inn NFS-detaljene, <emphasis><xref
-linkend="netStageTwo"/></emphasis>tas du automatisk til <emphasis><xref
-linkend="netStageTwo"/></emphasis>(den faktiske installasjonsfasen).</para>
+      <para>After entering the NFS details, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
     </section>
   </section>
 
diff --git a/docs/docs/stable/bootiso/nb/netInstall-stage2.xml b/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
index 86f521aa..240cb5da 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Trinn 2 (Installasjon)</title>
 
   <para>Ingenting ha blitt skrevet på harddisken din på dette tidspunktet. Derfor,
@@ -38,7 +41,7 @@ agrer deg).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/nl/netInstall-intro.xml b/docs/docs/stable/bootiso/nl/netInstall-intro.xml
index 278ca151..dd715961 100644
--- a/docs/docs/stable/bootiso/nl/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/nl/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/nl/netInstall-stage1.xml b/docs/docs/stable/bootiso/nl/netInstall-stage1.xml
index d54b56ff..28f8a45f 100644
--- a/docs/docs/stable/bootiso/nl/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/nl/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/nl/netInstall-stage2.xml b/docs/docs/stable/bootiso/nl/netInstall-stage2.xml
index 24b612e2..30bac793 100644
--- a/docs/docs/stable/bootiso/nl/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/nl/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/pt/netInstall-intro.xml b/docs/docs/stable/bootiso/pt/netInstall-intro.xml
index 21b77e65..31a907c2 100644
--- a/docs/docs/stable/bootiso/pt/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/pt/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/pt/netInstall-stage1.xml b/docs/docs/stable/bootiso/pt/netInstall-stage1.xml
index 314bb0b5..53dca019 100644
--- a/docs/docs/stable/bootiso/pt/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/pt/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/pt/netInstall-stage2.xml b/docs/docs/stable/bootiso/pt/netInstall-stage2.xml
index 0d46b843..35ba9210 100644
--- a/docs/docs/stable/bootiso/pt/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/pt/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/pt_BR/netInstall-intro.xml b/docs/docs/stable/bootiso/pt_BR/netInstall-intro.xml
index b44aeb3c..e4ac3ee2 100644
--- a/docs/docs/stable/bootiso/pt_BR/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/pt_BR/netInstall-intro.xml
@@ -60,9 +60,9 @@ necessários para o seu dispositivo de rede, controlador de disco, etc.</para>
         </listitem>
       </itemizedlist>
 
-      <para>Ambas as versões estão disponíveis sob a forma de ISO's separadas de 32 e 64
-bits. Veja aqui: <link
-xlink:href="https://www.mageia.org/pt/downloads/">https://www.mageia.org/pt/downloads/</link></para>
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/pt_BR/netInstall-stage1.xml b/docs/docs/stable/bootiso/pt_BR/netInstall-stage1.xml
index 082d304e..df479c24 100644
--- a/docs/docs/stable/bootiso/pt_BR/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/pt_BR/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Estágio 1 (estágio de pré-instalação)</title>
 
   <section>
@@ -40,7 +43,7 @@ configurações padrão.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ diretório que contém a distribuição Mageia:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/pt_BR/netInstall-stage2.xml b/docs/docs/stable/bootiso/pt_BR/netInstall-stage2.xml
index f53f98f8..c4e69c80 100644
--- a/docs/docs/stable/bootiso/pt_BR/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/pt_BR/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Estágio 2 (estágio de instalação)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/ru/netInstall-intro.xml b/docs/docs/stable/bootiso/ru/netInstall-intro.xml
index 292dba68..29dab0f4 100644
--- a/docs/docs/stable/bootiso/ru/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/ru/netInstall-intro.xml
@@ -66,7 +66,7 @@
 
       <para>Обоими версиями можно воспользоваться в формате отдельных образов ISO для
 32-битных и 64-битных систем. Подробнее об этом здесь <link
-xlink:href="https://www.mageia.org/uk/downloads/">https://www.mageia.org/ru/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/ru/netInstall-stage1.xml b/docs/docs/stable/bootiso/ru/netInstall-stage1.xml
index dbc8e7c9..2235e1f5 100644
--- a/docs/docs/stable/bootiso/ru/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/ru/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Этап 1 (этап действий до установки)</title>
 
   <section>
@@ -41,7 +44,7 @@
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -250,8 +253,9 @@ Static (статический адрес) или ADSL:</para>
         </imageobject>
       </mediaobject>
 
-      <para>После ввода параметров NFS, вы автоматически перейдёте к шагу, который
-описан в разделе <xref linkend="netStageTwo"/>(самого этапа установки).</para>
+      <para>After entering the NFS details, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
     </section>
   </section>
 
diff --git a/docs/docs/stable/bootiso/ru/netInstall-stage2.xml b/docs/docs/stable/bootiso/ru/netInstall-stage2.xml
index 5bdd66e4..a35ab398 100644
--- a/docs/docs/stable/bootiso/ru/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/ru/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Этап 2 (этап установки)</title>
 
   <para>К этому шагу на диск вашего компьютера ничего не будет
@@ -39,7 +42,7 @@
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/sl/netInstall-intro.xml b/docs/docs/stable/bootiso/sl/netInstall-intro.xml
index a9bd09e1..b9c57dc8 100644
--- a/docs/docs/stable/bootiso/sl/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/sl/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/sl/netInstall-stage1.xml b/docs/docs/stable/bootiso/sl/netInstall-stage1.xml
index 8d1adda4..96824c6e 100644
--- a/docs/docs/stable/bootiso/sl/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/sl/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/sl/netInstall-stage2.xml b/docs/docs/stable/bootiso/sl/netInstall-stage2.xml
index aa103112..1135a832 100644
--- a/docs/docs/stable/bootiso/sl/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/sl/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/sq/netInstall-intro.xml b/docs/docs/stable/bootiso/sq/netInstall-intro.xml
index 0916a63e..3b090fd6 100644
--- a/docs/docs/stable/bootiso/sq/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/sq/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/sq/netInstall-stage1.xml b/docs/docs/stable/bootiso/sq/netInstall-stage1.xml
index 097c0d32..9e4f2a0a 100644
--- a/docs/docs/stable/bootiso/sq/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/sq/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/sq/netInstall-stage2.xml b/docs/docs/stable/bootiso/sq/netInstall-stage2.xml
index e759a107..055b48c2 100644
--- a/docs/docs/stable/bootiso/sq/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/sq/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/sv/netInstall-intro.xml b/docs/docs/stable/bootiso/sv/netInstall-intro.xml
index ea520c35..d886fc4c 100644
--- a/docs/docs/stable/bootiso/sv/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/sv/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/sv/netInstall-stage1.xml b/docs/docs/stable/bootiso/sv/netInstall-stage1.xml
index 4d9a71bc..88812f67 100644
--- a/docs/docs/stable/bootiso/sv/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/sv/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/sv/netInstall-stage2.xml b/docs/docs/stable/bootiso/sv/netInstall-stage2.xml
index 795e86bf..11467aed 100644
--- a/docs/docs/stable/bootiso/sv/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/sv/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/tg/netInstall-intro.xml b/docs/docs/stable/bootiso/tg/netInstall-intro.xml
index a175d04b..975feac1 100644
--- a/docs/docs/stable/bootiso/tg/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/tg/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/tg/netInstall-stage1.xml b/docs/docs/stable/bootiso/tg/netInstall-stage1.xml
index d6d6c1e9..8938b2ad 100644
--- a/docs/docs/stable/bootiso/tg/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/tg/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/tg/netInstall-stage2.xml b/docs/docs/stable/bootiso/tg/netInstall-stage2.xml
index fc4990f1..080d3db0 100644
--- a/docs/docs/stable/bootiso/tg/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/tg/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/tr/netInstall-intro.xml b/docs/docs/stable/bootiso/tr/netInstall-intro.xml
index 60b33197..cbd5189b 100644
--- a/docs/docs/stable/bootiso/tr/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/tr/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/tr/netInstall-stage1.xml b/docs/docs/stable/bootiso/tr/netInstall-stage1.xml
index af3b8065..330937ee 100644
--- a/docs/docs/stable/bootiso/tr/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/tr/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/tr/netInstall-stage2.xml b/docs/docs/stable/bootiso/tr/netInstall-stage2.xml
index 4130e597..d192c81e 100644
--- a/docs/docs/stable/bootiso/tr/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/tr/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/uk/netInstall-intro.xml b/docs/docs/stable/bootiso/uk/netInstall-intro.xml
index d0afa9b7..344750f3 100644
--- a/docs/docs/stable/bootiso/uk/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/uk/netInstall-intro.xml
@@ -67,7 +67,7 @@
 
       <para>Обома версіями можна скористатися у форматі окремих образів ISO для
 32-бітових та 64-бітових систем. Докладніше про це <link
-xlink:href="https://www.mageia.org/uk/downloads/">тут</link></para>
+xlink:href="https://www.mageia.org/downloads/">тут</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml
index 63af82fd..93881f3a 100644
--- a/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml
index cad60191..dbff6498 100644
--- a/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml
index 1efdd828..3c0d6dbc 100644
--- a/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml
index 40672c65..75a8e897 100644
--- a/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml
@@ -61,7 +61,7 @@ your network device, disk controller, etc.</para>
 
       <para>Both versions are available in the form of separate 32-bit and 64-bit
 ISO's. See here: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
     </section>
 
     <section>
diff --git a/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml
index 4cc34b3c..e7d9b88d 100644
--- a/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml
@@ -10,8 +10,11 @@
 
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
 <!-- 2019/01/06 apb: typo 2.2.2) -->
+<!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
 <title>Stage 1 (Pre-installation Stage)</title>
 
   <section>
@@ -40,7 +43,7 @@ settings.</para>
 
 <mediaobject>
         <imageobject>
-          <imagedata align="center" fileref="../dx-welcome2.png"/>
+          <imagedata align="center" fileref="../net-welcome2.png"/>
         </imageobject>
       </mediaobject></figure>
 
@@ -247,8 +250,7 @@ directory containing the Mageia distribution:</para>
         </imageobject>
       </mediaobject>
 
-      <para>After entering the NFS details, <emphasis><xref
-linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <para>After entering the NFS details, you will automatically proceed to
 <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
 stage).</para>
     </section>
diff --git a/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml
index 0042f5ef..d6f7d530 100644
--- a/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml
@@ -10,7 +10,10 @@
          xmlns:db="http://docbook.org/ns/docbook">
   
 
+  
+
   <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
 <title>Stage 2 (Installation Stage)</title>
 
   <para>Nothing has been written to your hard disk at this point. Therefore, if you
@@ -38,7 +41,7 @@ change your mind).</para>
 
   <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   <xi:include href="setupBootloader.xml"/>