Update catalog

4 files changed, 1154 insertions, 7 deletions

diff --git a/docs/docs/stable/bootiso/bootiso.pot b/docs/docs/stable/bootiso/bootiso.pot
index 4afc2bd6..878d41ac 100644
--- a/docs/docs/stable/bootiso/bootiso.pot
+++ b/docs/docs/stable/bootiso/bootiso.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Boot ISO Help 6.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-06 12:21+0200\n"
+"POT-Creation-Date: 2019-01-08 22:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,8 +146,8 @@ msgstr ""
 msgid "The first screen to appear is this one"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/bootIso.xml:78
+#. type: Attribute 'fileref' of: <section><section><figure><mediaobject><imageobject><imagedata>
+#: en/bootIso.xml:78 en/netInstall-stage1.xml:27
 msgid "../dx-help.png"
 msgstr ""
 
@@ -164,8 +164,8 @@ msgstr ""
 msgid "Your computer boots in UEFI mode"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/bootIso.xml:92
+#. type: Attribute 'fileref' of: <section><section><figure><mediaobject><imageobject><imagedata>
+#: en/bootIso.xml:92 en/netInstall-stage1.xml:42
 msgid "../dx-welcome2.png"
 msgstr ""
 
@@ -395,8 +395,8 @@ msgstr ""
 msgid "Mageia n (selecting a mirror from the list)"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para><itemizedlist><listitem><para>
-#: en/bootIso.xml:215
+#. type: Content of: <section><section><section><para>
+#: en/bootIso.xml:215 en/netInstall-stage1.xml:325
 msgid ""
 "If you get a lot of missing dependency errors later in the install, reboot "
 "and try a different mirror."
@@ -582,6 +582,596 @@ msgstr ""
 msgid "Installing Mageia using a Tiny Boot Image"
 msgstr ""
 
+#. type: Content of: <section><title>
+#: en/netInstall-intro.xml:11
+msgid "Introduction"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-intro.xml:14
+msgid "NetInstall Media"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-intro.xml:17
+msgid "Description"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-intro.xml:19
+msgid "These minimal ISO's contain:"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:23
+msgid ""
+"less than 100 MB and are convenient if bandwidth is too low to download a "
+"full DVD, or if you have a PC without a DVD drive or unable to boot from a "
+"USB stick."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:29
+msgid ""
+"no more than that which is needed to a) start the <literal>DrakX</literal> "
+"installer and b) find <literal>DrakX-installer-stage2</literal> and other "
+"packages that are needed to continue and complete the install."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-intro.xml:36
+msgid ""
+"The required source packages may be on a PC hard disk, a local drive, a "
+"local network or on the Internet."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/netInstall-intro.xml:40
+msgid "Installation via encrypted wifi or bluetooth is not supported."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-intro.xml:46
+msgid "Availability"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-intro.xml:48
+msgid "There a two versions of the NetInstall media:"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:52
+msgid ""
+"<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
+"to use non-free software, this ISO contains only free software."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:58
+msgid ""
+"<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
+"additionally includes proprietary device drivers, which may be required for "
+"your network device, disk controller, etc."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-intro.xml:64
+msgid ""
+"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>"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-intro.xml:70
+msgid "Preparation"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-intro.xml:72
+msgid ""
+"After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
+"on a USB stick, follow the instructions here: <link "
+"xlink:href=\"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick\">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-intro.xml:79
+msgid "Installation Stages"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-intro.xml:81
+msgid "The installation is carried out in two stages:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:85
+msgid ""
+"<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
+"stage. You will need to provide the method and details for accessing the "
+"medium containing the files to be used for the installation. If the method "
+"involves a server, then the network connection will be activated."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/netInstall-intro.xml:93
+msgid ""
+"<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
+"stage, which will automatically commence once a connection to the installer "
+"files has been established."
+msgstr ""
+
+#. type: Content of: <section><section><note><para>
+#: en/netInstall-intro.xml:100
+msgid ""
+"During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
+"quit at any point during Stage 1 if you wish. You can do so by pressing "
+"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> "
+"</keycombo>."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/netInstall-intro.xml:112
+msgid ""
+"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
+"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> "
+"</keycombo> to return to the installer screen."
+msgstr ""
+
+#. type: Content of: <section><section><warning><para>
+#: en/netInstall-intro.xml:124
+msgid ""
+"Unlike when installing from DVD or LiveCD, during the first part of the "
+"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked "
+"to type things. During this stage, your keyboard will operate as per an "
+"<link "
+"xlink:href=\"https://en.wikipedia.org/wiki/Keyboard_layout#United_States\">American "
+"keyboard</link> layout. This can be very confusing when you need to type "
+"names and paths."
+msgstr ""
+
+#. type: Content of: <section><title>
+#: en/netInstall-stage1.xml:13
+msgid "Stage 1 (Pre-installation Stage)"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-stage1.xml:16
+msgid "Boot"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:18
+msgid ""
+"The particular <emphasis>Welcome Screen</emphasis> that you will see when "
+"booting with the NetInstall media depends on whether you are booting on a "
+"BIOS or UEFI system. See the following two screenshots:"
+msgstr ""
+
+#. type: Content of: <section><section><figure><title>
+#: en/netInstall-stage1.xml:23
+msgid "BIOS Welcome Screen"
+msgstr ""
+
+#. type: Content of: <section><section><figure>
+#: en/netInstall-stage1.xml:25 en/netInstall-stage1.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:32
+msgid ""
+"When booting up, you can choose to read the advanced help by pressing "
+"<keycap>F2</keycap> and return to the installer screen by pressing "
+"<keycap>F1</keycap>. Otherwise, the boot will continue with default "
+"settings."
+msgstr ""
+
+#. type: Content of: <section><section><figure><title>
+#: en/netInstall-stage1.xml:38
+msgid "UEFI Welcome Screen"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:49
+msgid ""
+"Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis> "
+"and then press <keycap>Enter</keycap>."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:54
+msgid ""
+"For both BIOS and UEFI systems, you will then see a pop-up notification "
+"saying that USB devices are being detected:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:59
+msgid "../netInstall-01.png"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-stage1.xml:65
+msgid "Installation Method"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:67
+msgid ""
+"You can now choose an installation method via CDROM/HDD or Server (NFS, FTP "
+"or HTTP)."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:70
+msgid "You also have the option to load third-party modules at this point."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:75
+msgid "../netInstall-02.png"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:81
+msgid ""
+"Move up or down the list using the arrow keys until the appropriate method "
+"of installation is highlighted."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:86
+msgid ""
+"Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is "
+"highlighted and then press <keycap>Enter</keycap>."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:92
+msgid "Server"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:96
+msgid ""
+"If you don't know what to choose for a Network Installation, choose "
+"<emphasis>FTP server</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:101
+msgid ""
+"On an enterprise network, FTP and rsync may be blocked, so using "
+"<emphasis>HTTP server</emphasis> is a good choice in this case."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:107
+msgid ""
+"After choosing any of the server options you will automatically proceed to "
+"the <emphasis><xref linkend=\"netConn\"/></emphasis> section."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:113
+msgid "CDROM/HDD"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:115
+msgid ""
+"If you choose to install from either a CDROM or hard disk (or USB stick), a "
+"scan for storage devices will be performed:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:120
+msgid "../netInstall-03.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:126
+msgid "First, select the relevant hard drive (or USB stick)"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:132
+msgid "../netInstall-04.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:138
+msgid "Followed by the relevant partition"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:144
+msgid "../netInstall-05.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:150
+msgid "Then specify the directory or the file name of the ISO"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:154
+msgid ""
+"Leaving this open, or using the directory is easier, because the installer "
+"then presents you with a list of directories and files from which you can "
+"make your selection using the up and down arrows, as seen in the second of "
+"the following images."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:161
+msgid "../netInstall-06.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:167
+msgid "../netInstall-07.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:171
+msgid ""
+"Once the information has been provided for the location of the ISO, either "
+"on CDROM or HDD, you will automatically proceed to <emphasis><xref "
+"linkend=\"netStageTwo\"/></emphasis> (the actual installation stage)."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:178
+msgid "Load Third-Party Modules"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:180
+msgid ""
+"If you wish to <emphasis>Load third-party modules</emphasis>, then you will "
+"be asked for the location of the directory containing the modules:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:186
+msgid "../netInstall-08.png"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-stage1.xml:193
+msgid "Network Connection"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:196
+msgid "Connection Device"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:198
+msgid ""
+"If you chose any of the server options at the <emphasis>Installation "
+"Method</emphasis> step, you will then be asked to choose a network device:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:204
+msgid "../netInstall-09.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:210
+msgid "Connection Type"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:212
+msgid ""
+"Now you need to choose whether the network device will use a DHCP, Static or "
+"ADSL connection:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:217
+msgid "../netInstall-10.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:221
+msgid ""
+"If you are unsure which option is suitable, then you should probably accept "
+"the default option (DHCP)."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:226
+msgid "Host/Domain Names"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:228
+msgid "If necessary, you can now supply your Host and Domain names:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:233
+msgid "../netInstall-11.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/netInstall-stage1.xml:239
+msgid ""
+"If you are unsure what this means then you can just leave the fields blank, "
+"highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to "
+"proceed. The network connection will now be activated."
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:246
+msgid ""
+"If you are using either FTP or HTTP, you will automatically proceed to the "
+"<emphasis><xref linkend=\"netMirrors\"/></emphasis> section"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:250
+msgid ""
+"If you are using NFS, you will be asked for the NFS server name and the "
+"directory containing the Mageia distribution:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:255
+msgid "../netInstall-12.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:259
+msgid ""
+"After entering the NFS details, <emphasis><xref "
+"linkend=\"netStageTwo\"/></emphasis> you will automatically proceed to "
+"<emphasis><xref linkend=\"netStageTwo\"/></emphasis> (the actual "
+"installation stage)."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/netInstall-stage1.xml:267
+msgid "Mirrors"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/netInstall-stage1.xml:269
+msgid ""
+"If using FTP or HTTP, you now have to specify a mirror to use. This can be "
+"done manually or by choosing from a list"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:274
+msgid "../netInstall-13.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:279
+msgid "Specify Manually"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:281
+msgid ""
+"You will find a list of all available mirrors here: <link "
+"xlink:href=\"http://mirrors.mageia.org/\">http://mirrors.mageia.org/</link>"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:284
+msgid ""
+"Whichever mirror you choose, it should use the same tree-like structure from "
+"\"mageia\" (or \"Mageia\") as used by the official Mageia mirrors. That "
+"means .../mageia/distrib/&lt;version&gt;/&lt;arch&gt;"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:289
+msgid ""
+"A correct entry (when using an official mirror) in the <emphasis>Mageia "
+"directory</emphasis> field below, could be:"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:292
+msgid "<filename>pub/linux/mageia/distrib/cauldron/i586</filename>"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:294
+msgid "Another example (for Mageia 6 x86_64) could be:"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:296
+msgid "<filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename>"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:298
+msgid ""
+"Other mirrors may have a different path structure and the screenshots below "
+"show such examples:"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:301
+msgid "If you are using an FTP server:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:305
+msgid "../netInstall-14.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:309
+msgid "If you are using an HTTP server:"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:313
+msgid "../netInstall-15.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:317 en/netInstall-stage1.xml:343
+msgid ""
+"Once this information has been provided, you will automatically proceed to "
+"<emphasis><xref linkend=\"netStageTwo\"/></emphasis> (the actual "
+"installation stage)."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/netInstall-stage1.xml:323
+msgid "Select From a List"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:330
+msgid "../netInstall-16.png"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/netInstall-stage1.xml:334
+msgid ""
+"After choosing an FTP server, you will see a screen where you can optionally "
+"add a login name and password if required."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
+#: en/netInstall-stage1.xml:339
+msgid "../netInstall-17.png"
+msgstr ""
+
+#. type: Content of: <section><title>
+#: en/netInstall-stage2.xml:13
+msgid "Stage 2 (Installation Stage)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/netInstall-stage2.xml:15
+msgid ""
+"Nothing has been written to your hard disk at this point. Therefore, if you "
+"decide not to proceed with the actual installation, then it is safe to "
+"reboot now: go to <literal>tty2</literal> with <keycombo> "
+"<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> "
+"and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> "
+"<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you "
+"change your mind)."
+msgstr ""
+
 #. type: Content of: <article><info><subtitle>
 #: en/NetInstall.xml:13
 msgid "Installing Mageia Using a Tiny Boot Image"
diff --git a/docs/docs/stable/bootiso/en/netInstall-intro.xml b/docs/docs/stable/bootiso/en/netInstall-intro.xml
new file mode 100644
index 00000000..79bad220
--- /dev/null
+++ b/docs/docs/stable/bootiso/en/netInstall-intro.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+
+  <title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to
+          download a full DVD, or if you have a PC without a DVD drive or
+          unable to boot from a USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the
+          <literal>DrakX</literal> installer and b) find
+          <literal>DrakX-installer-stage2</literal> and other packages that
+          are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local
+      drive, a local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not
+        supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who
+          prefer not to use non-free software, this ISO contains only free
+          software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This
+          ISO additionally includes proprietary device drivers, which may be
+          required for your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <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>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer
+      to put it on a USB stick, follow the instructions here: <link
+      xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the
+        pre-Installation stage. You will need to provide the method and
+        details for accessing the medium containing the files to be used for
+        the installation. If the method involves a server, then the network
+        connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual
+        Installation stage, which will automatically commence once a
+        connection to the installer files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it
+      is safe to quit at any point during Stage 1 if you wish. You can do so
+      by pressing <keycombo>
+          <keycap>Ctrl</keycap>
+
+          <keycap>Alt</keycap>
+
+          <keycap>Del</keycap>
+        </keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo>
+          <keycap>Alt</keycap>
+
+          <keycap>F3</keycap>
+        </keycombo> to read the logs and <keycombo>
+          <keycap>Alt</keycap>
+
+          <keycap>F1</keycap>
+        </keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part
+      of the installation (<emphasis role="bold">Stage 1</emphasis>), you will
+      be asked to type things. During this stage, your keyboard will operate
+      as per an <link
+      xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+      keyboard</link> layout. This can be very confusing when you need to type
+      names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/en/netInstall-stage1.xml b/docs/docs/stable/bootiso/en/netInstall-stage1.xml
new file mode 100644
index 00000000..fcd56f45
--- /dev/null
+++ b/docs/docs/stable/bootiso/en/netInstall-stage1.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <!-- 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) -->
+
+  <title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see
+    when booting with the NetInstall media depends on whether you are booting
+    on a BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <para>When booting up, you can choose to read the advanced help by
+    pressing <keycap>F2</keycap> and return to the installer screen by
+    pressing <keycap>F1</keycap>. Otherwise, the boot will continue with
+    default settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia
+        Install</emphasis> and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up
+    notification saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server
+    (NFS, FTP or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this
+    point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the
+        appropriate method of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis>
+        is highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation,
+          choose <emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so
+          using <emphasis>HTTP server</emphasis> is a good choice in this
+          case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically
+      proceed to the <emphasis><xref linkend="netConn"/></emphasis>
+      section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB
+      stick), a scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the
+      installer then presents you with a list of directories and files from
+      which you can make your selection using the up and down arrows, as seen
+      in the second of the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the
+      ISO, either on CDROM or HDD, you will automatically proceed to
+      <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual
+      installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then
+      you will be asked for the location of the directory containing the
+      modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the
+      <emphasis>Installation Method</emphasis> step, you will then be asked to
+      choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP,
+      Static or ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should
+      probably accept the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain
+      names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the
+          fields blank, highlight <emphasis>Ok</emphasis> and press
+          <keycap>Enter</keycap> to proceed. The network connection will now
+          be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically
+      proceed to the <emphasis><xref linkend="netMirrors"/></emphasis>
+      section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name
+      and the directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+      linkend="netStageTwo"/></emphasis> you will automatically proceed to
+      <emphasis><xref linkend="netStageTwo"/></emphasis> (the actual
+      installation stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This
+    can be done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+      xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like
+      structure from "mageia" (or "Mageia") as used by the official Mageia
+      mirrors. That means
+      .../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the
+      <emphasis>Mageia directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the
+      screenshots below show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically
+      proceed to <emphasis><xref linkend="netStageTwo"/></emphasis> (the
+      actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the
+      install, reboot and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can
+      optionally add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically
+      proceed to <emphasis><xref linkend="netStageTwo"/></emphasis> (the
+      actual installation stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/en/netInstall-stage2.xml b/docs/docs/stable/bootiso/en/netInstall-stage2.xml
new file mode 100644
index 00000000..73cdb72a
--- /dev/null
+++ b/docs/docs/stable/bootiso/en/netInstall-stage2.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         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. -->
+
+  <title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore,
+  if you decide not to proceed with the actual installation, then it is safe
+  to reboot now: go to <literal>tty2</literal> with <keycombo>
+      <keycap>Ctrl</keycap>
+
+      <keycap>Alt</keycap>
+
+      <keycap>F2</keycap>
+    </keycombo> and press <keycombo>
+      <keycap>Ctrl</keycap>
+
+      <keycap>Alt</keycap>
+
+      <keycap>Del</keycap>
+    </keycombo> (or <keycombo>
+      <keycap>Ctrl</keycap>
+
+      <keycap>Alt</keycap>
+
+      <keycap>F7</keycap>
+    </keycombo> to come back if you change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>