aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/docs/stable/bootiso/bootiso.pot51
-rw-r--r--docs/docs/stable/bootiso/en/NetInstall-cover.xml66
-rw-r--r--docs/docs/stable/bootiso/en/NetInstall.xml47
-rw-r--r--docs/docs/stable/bootiso/en/bootIso.xml4
-rw-r--r--docs/docs/stable/bootiso/uk.po75
-rw-r--r--docs/docs/stable/bootiso/uk/NetInstall-cover.xml57
-rw-r--r--docs/docs/stable/bootiso/uk/NetInstall.xml35
-rw-r--r--docs/docs/stable/bootiso/uk/bootIso.xml2
8 files changed, 245 insertions, 92 deletions
diff --git a/docs/docs/stable/bootiso/bootiso.pot b/docs/docs/stable/bootiso/bootiso.pot
index c94664e1..4afc2bd6 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: 2017-06-06 19:43+0300\n"
+"POT-Creation-Date: 2019-01-06 12:21+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"
@@ -55,7 +55,7 @@ msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><simpara>
#: en/bootIso.xml:25
msgid ""
-"the ISO image on a <emphasis role=\"bold\">lan</emphasis> (local area "
+"the ISO image on a <emphasis role=\"bold\">LAN</emphasis> (local area "
"network)"
msgstr ""
@@ -518,28 +518,43 @@ msgid ""
"the version you are installing."
msgstr ""
-#. type: Attribute 'xml:lang' of: <article>
-#: en/NetInstall-cover.xml:9 en/NetInstall.xml:1
+#. type: Attribute 'xml:lang' of: <book>
+#: en/NetInstall-cover.xml:10
msgid "en"
msgstr ""
#. type: Content of: <article><info><title>
-#: en/NetInstall-cover.xml:12 en/NetInstall.xml:3
-msgid "Installation with tiny image"
+#: en/NetInstall-cover.xml:12 en/NetInstall.xml:11
+msgid "Mageia NetInstall"
msgstr ""
-#. type: Content of: <book><info><cover><para>
+#. type: Content of: <book><info>
#: en/NetInstall-cover.xml:14
+msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
+msgstr ""
+
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/NetInstall-cover.xml:20
+msgid "May 2018"
+msgstr ""
+
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/NetInstall-cover.xml:22
+msgid "Mageia 7"
+msgstr ""
+
+#. type: Content of: <book><info><cover><para>
+#: en/NetInstall-cover.xml:27
msgid "The tool to install Mageia with remote repositories"
msgstr ""
#. type: Attribute 'fileref' of: <book><info><cover><mediaobject><imageobject><imagedata>
-#: en/NetInstall-cover.xml:17
+#: en/NetInstall-cover.xml:32
msgid "../mageia-2013.png"
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:21 en/NetInstall.xml:12
+#: en/NetInstall-cover.xml:36 en/NetInstall.xml:22
msgid ""
"The texts and screenshots in this manual are available under the CC BY-SA "
"3.0 license <link "
@@ -547,7 +562,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:24 en/NetInstall.xml:16
+#: en/NetInstall-cover.xml:40 en/NetInstall.xml:26
msgid ""
"This manual was produced with the help of the <link "
"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
@@ -555,15 +570,25 @@ msgid ""
msgstr ""
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:26 en/NetInstall.xml:18
+#: en/NetInstall-cover.xml:44 en/NetInstall.xml:30
msgid ""
-"It was written by volunteers in their free time. Please contact <link "
+"It was written by volunteers in their free time. Please contact the <link "
"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
"Team</link>, if you would like to help improve this manual."
msgstr ""
+#. type: Content of: <book><article><title>
+#: en/NetInstall-cover.xml:52
+msgid "Installing Mageia using a Tiny Boot Image"
+msgstr ""
+
+#. type: Content of: <article><info><subtitle>
+#: en/NetInstall.xml:13
+msgid "Installing Mageia Using a Tiny Boot Image"
+msgstr ""
+
#. type: Content of: <article><info><cover><para><note><para>
-#: en/NetInstall.xml:7
+#: en/NetInstall.xml:17
msgid ""
"No one will see all the installer screens that you see in this manual. Which "
"screens you will see, depends on your hardware and the choices you make "
diff --git a/docs/docs/stable/bootiso/en/NetInstall-cover.xml b/docs/docs/stable/bootiso/en/NetInstall-cover.xml
index 9f3b04a5..06327175 100644
--- a/docs/docs/stable/bootiso/en/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/en/NetInstall-cover.xml
@@ -1,34 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
-<book xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xhtml"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- version="5.0" xml:lang="en" xml:id="NetInstall">
-
+<book xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook"
+ version="5.0" xml:lang="en" xml:id="NetInstall-cover">
<info>
- <title>Installation with tiny image</title>
+ <title>Mageia NetInstall</title>
+
+ <publisher>
+ <publishername>Mageia.org</publishername>
+ </publisher>
+
+ <revhistory>
+ <revision>
+ <date>May 2018</date>
+
+ <revremark>Mageia 7</revremark>
+ </revision>
+ </revhistory>
+
<cover>
- <para role="tagline">The tool to install Mageia with remote repositories</para>
+ <para role="tagline">The tool to install Mageia with remote
+ repositories</para>
+
<mediaobject>
<imageobject>
<imagedata fileref="../mageia-2013.png"/>
</imageobject>
</mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
- </para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+ <para>The texts and screenshots in this manual are available under the
+ CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>It was written by volunteers in their free time. Please contact
+ the <link
+ ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
+
<article>
-
-<xi:include href="bootIso.xml"></xi:include>
+ <title>Installing Mageia using a Tiny Boot Image</title>
+
+ <xi:include href="netInstall-intro.xml"/>
+
+ <xi:include href="netInstall-stage1.xml"/>
-</article>
+ <xi:include href="netInstall-stage2.xml"/>
+ </article>
</book>
diff --git a/docs/docs/stable/bootiso/en/NetInstall.xml b/docs/docs/stable/bootiso/en/NetInstall.xml
index 6478a342..243e93b5 100644
--- a/docs/docs/stable/bootiso/en/NetInstall.xml
+++ b/docs/docs/stable/bootiso/en/NetInstall.xml
@@ -1,6 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- Converted by db4-upgrade version 1.0 --><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<article version="5.0" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title>Installation with tiny image</title>
+ <title>Mageia NetInstall</title>
+
+ <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
<cover>
<para><note>
@@ -9,18 +19,37 @@
choices you make while installing.</para>
</note></para>
- <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the
- CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ <para xml:id="CC_BY-SA">The texts and screenshots in this manual are
+ available under the CC BY-SA 3.0 license <link
+ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
- <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>This manual was produced with the help of the <link
+ ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+ ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
- <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+ <para>It was written by volunteers in their free time. Please contact
+ the <link
+ ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+ Team</link>, if you would like to help improve this manual.</para>
</cover>
</info>
-
+
<!-- <xi:include href="drakx-intro.xml"/> -->
- <xi:include href="bootIso.xml"/>
+ <!-- 2018/??/?? apb: a) Bit of a re-word/format.
+ b) Disabled the XInclude for bootIso.xml, and included its contents directly within this NetInstall.xml instead. It does not seem practical to have NetInstall.xml acting as the header for
+ just bootIso.xml. As it was, there were basically two competing titles (one for NetInstall and one for bootIso), and this also resulted in an unnecessary extra nest level for bootIso sections.
+ c) I have also (via xi:include) bolted on the Classical Installer XML's (starting from Please Choose a Language) to Stage 2. This seems better than just pointing people to the documentation.
+ d) Update some PNG's to Mga6 and center-align all PNG's. Added a PNG each for NFS and 3rd-party. Uploaded a renamed set of PNG's (from Boot/boot-iso/imgx/x.png to netInstall-xx.png) and using those instead.
+ e) Made a couple of web-link pointers verbose (instead of see "here"). -->
+
+ <!-- <xi:include href="bootIso.xml"/> -->
+
+ <!-- 2018/05/18 apb: Split the body into 3 parts: netInstall-intro.xml, netInstall-stage1.xml and netInstall-stage2.xml -->
+
+ <xi:include href="netInstall-intro.xml"/>
+
+ <xi:include href="netInstall-stage1.xml"/>
+ <xi:include href="netInstall-stage2.xml"/>
</article>
diff --git a/docs/docs/stable/bootiso/en/bootIso.xml b/docs/docs/stable/bootiso/en/bootIso.xml
index 4467b191..79e3c1bd 100644
--- a/docs/docs/stable/bootiso/en/bootIso.xml
+++ b/docs/docs/stable/bootiso/en/bootIso.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="SOME_UNIQUE_ID">
+<?xml version='1.0' encoding='UTF-8'?><section version="5.0" xml:id="SOME_UNIQUE_ID" xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink">
<info>
<title xml:id="bootIso-ti1">Installation with a tiny boot image</title>
</info>
@@ -22,7 +22,7 @@
ROM</emphasis></simpara>
</listitem>
<listitem>
- <simpara>the ISO image on a <emphasis role="bold">lan</emphasis>
+ <simpara>the ISO image on a <emphasis role="bold">LAN</emphasis>
(local area network)</simpara>
</listitem>
</itemizedlist>
diff --git a/docs/docs/stable/bootiso/uk.po b/docs/docs/stable/bootiso/uk.po
index 018d1b97..89f84ed7 100644
--- a/docs/docs/stable/bootiso/uk.po
+++ b/docs/docs/stable/bootiso/uk.po
@@ -1,22 +1,22 @@
# Copyright (C) YEAR Mageia
# This file is distributed under the same license as the Mageia Boot ISO Help package.
#
-# Yuri Chornoivan <yurchor@ukr.net>, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2017, 2019.
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: 2017-05-23 19:44+0300\n"
-"PO-Revision-Date: 2017-05-23 19:51+0300\n"
+"POT-Creation-Date: 2019-01-06 12:21+0200\n"
+"PO-Revision-Date: 2019-01-06 12:23+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
+"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 2.0\n"
#. type: Content of: <section><info><title>
#: en/bootIso.xml:3
@@ -63,7 +63,7 @@ msgstr "образу ISO на <emphasis role=\"bold\">компакт диску
#. type: Content of: <section><section><itemizedlist><listitem><simpara>
#: en/bootIso.xml:25
msgid ""
-"the ISO image on a <emphasis role=\"bold\">lan</emphasis> (local area "
+"the ISO image on a <emphasis role=\"bold\">LAN</emphasis> (local area "
"network)"
msgstr "образу ISO у <emphasis role=\"bold\">локальній мережі</emphasis>"
@@ -630,28 +630,43 @@ msgstr ""
"із настановами, замінивши, у разі потреби цифру «5» у адресі відкритої "
"сторінки на номер версії, яку ви встановлюєте."
-#. type: Attribute 'xml:lang' of: <article>
-#: en/NetInstall-cover.xml:9 en/NetInstall.xml:1
+#. type: Attribute 'xml:lang' of: <book>
+#: en/NetInstall-cover.xml:10
msgid "en"
msgstr "uk"
#. type: Content of: <article><info><title>
-#: en/NetInstall-cover.xml:12 en/NetInstall.xml:3
-msgid "Installation with tiny image"
-msgstr "Встановлення з маленького образу"
+#: en/NetInstall-cover.xml:12 en/NetInstall.xml:11
+msgid "Mageia NetInstall"
+msgstr "Встановлення Mageia за допомогою мережі"
-#. type: Content of: <book><info><cover><para>
+#. type: Content of: <book><info>
#: en/NetInstall-cover.xml:14
+msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
+msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
+
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/NetInstall-cover.xml:20
+msgid "May 2018"
+msgstr "травень 2018 року"
+
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/NetInstall-cover.xml:22
+msgid "Mageia 7"
+msgstr "Mageia 7"
+
+#. type: Content of: <book><info><cover><para>
+#: en/NetInstall-cover.xml:27
msgid "The tool to install Mageia with remote repositories"
msgstr "Засіб для встановлення Mageia з віддалених сховищ"
#. type: Attribute 'fileref' of: <book><info><cover><mediaobject><imageobject><imagedata>
-#: en/NetInstall-cover.xml:17
+#: en/NetInstall-cover.xml:32
msgid "../mageia-2013.png"
msgstr "../mageia-2013.png"
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:21 en/NetInstall.xml:12
+#: en/NetInstall-cover.xml:36 en/NetInstall.xml:22
msgid ""
"The texts and screenshots in this manual are available under the CC BY-SA "
"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -662,7 +677,7 @@ msgstr ""
"licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>ю"
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:24 en/NetInstall.xml:16
+#: en/NetInstall-cover.xml:40 en/NetInstall.xml:26
msgid ""
"This manual was produced with the help of the <link ns6:href=\"http://www."
"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -673,19 +688,30 @@ msgstr ""
"neodoc.biz\">NeoDoc</link>."
#. type: Content of: <article><info><cover><para>
-#: en/NetInstall-cover.xml:26 en/NetInstall.xml:18
+#: en/NetInstall-cover.xml:44 en/NetInstall.xml:30
msgid ""
-"It was written by volunteers in their free time. Please contact <link ns6:"
-"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
-"link>, if you would like to help improve this manual."
+"It was written by volunteers in their free time. Please contact the <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
msgstr ""
"Підручник було написано охочими до цього користувачами у вільний від "
-"основної роботи час. Будь ласка, зверніться до <link ns6:href=\"https://wiki."
-"mageia.org/en/Documentation_team\">команди документування</link>, якщо "
+"основної роботи час. Будь ласка, зверніться до <link"
+" ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">команди"
+" документування</link>, якщо "
"хочете допомогти у покращенні цього підручника."
+#. type: Content of: <book><article><title>
+#: en/NetInstall-cover.xml:52
+msgid "Installing Mageia using a Tiny Boot Image"
+msgstr "Встановлення Mageia з маленького завантажувального образу"
+
+#. type: Content of: <article><info><subtitle>
+#: en/NetInstall.xml:13
+msgid "Installing Mageia Using a Tiny Boot Image"
+msgstr "Встановлення Mageia з маленького завантажувального образу"
+
#. type: Content of: <article><info><cover><para><note><para>
-#: en/NetInstall.xml:7
+#: en/NetInstall.xml:17
msgid ""
"No one will see all the installer screens that you see in this manual. Which "
"screens you will see, depends on your hardware and the choices you make "
@@ -695,6 +721,9 @@ msgstr ""
"сторінок, які ви побачите залежить від набору обладнання у вашій системі та "
"вибраного вами варіанта встановлення."
+#~ msgid "Installation with tiny image"
+#~ msgstr "Встановлення з маленького образу"
+
#~ msgid "boot-iso8.png"
#~ msgstr "boot-iso8.png"
diff --git a/docs/docs/stable/bootiso/uk/NetInstall-cover.xml b/docs/docs/stable/bootiso/uk/NetInstall-cover.xml
index 1ed33461..a569b890 100644
--- a/docs/docs/stable/bootiso/uk/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/uk/NetInstall-cover.xml
@@ -1,40 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
-<book xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:ns6="http://www.w3.org/1999/xlink"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xhtml"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- version="5.0" xml:lang="uk" xml:id="NetInstall">
-
+<book xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook"
+ version="5.0" xml:lang="uk" xml:id="NetInstall-cover">
<info>
- <title>Встановлення з маленького образу</title>
+ <title>Встановлення Mageia за допомогою мережі</title>
+
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+ <revhistory>
+ <revision>
+ <date>травень 2018 року</date>
+
+ <revremark>Mageia 7</revremark>
+ </revision>
+ </revhistory>
+
<cover>
<para role="tagline">Засіб для встановлення Mageia з віддалених сховищ</para>
+
<mediaobject>
<imageobject>
<imagedata fileref="../mageia-2013.png"/>
</imageobject>
</mediaobject>
- <para>Текст та знімки вікон у цьому підручнику надаються вам відповідно до умов
+ <para>Текст та знімки вікон у цьому підручнику надаються вам відповідно до умов
ліцензування CC BY-SA 3.0, <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>ю
- </para>
- <para>Цей підручник було створено за допомогою <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>ю</para>
+
+ <para>Цей підручник було створено за допомогою <link
ns6:href="http://www.calenco.com">Calenco CMS</link>, розробленої компанією
-<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
- </para>
- <para>Підручник було написано охочими до цього користувачами у вільний від
+<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>Підручник було написано охочими до цього користувачами у вільний від
основної роботи час. Будь ласка, зверніться до <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">команди
документування</link>, якщо хочете допомогти у покращенні цього підручника.</para>
</cover>
</info>
+
<article>
-
-<xi:include href="bootIso.xml"></xi:include>
+ <title>Встановлення Mageia з маленького завантажувального образу</title>
+
+ <xi:include href="netInstall-intro.xml"/>
+
+ <xi:include href="netInstall-stage1.xml"/>
-</article>
+ <xi:include href="netInstall-stage2.xml"/>
+ </article>
</book>
diff --git a/docs/docs/stable/bootiso/uk/NetInstall.xml b/docs/docs/stable/bootiso/uk/NetInstall.xml
index 97d4718c..84255b1d 100644
--- a/docs/docs/stable/bootiso/uk/NetInstall.xml
+++ b/docs/docs/stable/bootiso/uk/NetInstall.xml
@@ -1,9 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="uk" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="uk" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:ns62="http://docbook.org/ns/transclusion"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/1999/xhtml"
+ xmlns:ns3="http://www.w3.org/2000/svg"
+ xmlns:ns="http://docbook.org/ns/docbook">
<!-- <xi:include href="drakx-intro.xml"/>
-->
+<!-- 2018/??/?? apb: a) Bit of a re-word/format.
+ b) Disabled the XInclude for bootIso.xml, and included its contents directly within this NetInstall.xml instead. It does not seem practical to have NetInstall.xml acting as the header for
+ just bootIso.xml. As it was, there were basically two competing titles (one for NetInstall and one for bootIso), and this also resulted in an unnecessary extra nest level for bootIso sections.
+ c) I have also (via xi:include) bolted on the Classical Installer XML's (starting from Please Choose a Language) to Stage 2. This seems better than just pointing people to the documentation.
+ d) Update some PNG's to Mga6 and center-align all PNG's. Added a PNG each for NFS and 3rd-party. Uploaded a renamed set of PNG's (from Boot/boot-iso/imgx/x.png to netInstall-xx.png) and using those instead.
+ e) Made a couple of web-link pointers verbose (instead of see "here"). -->
+<!-- <xi:include href="bootIso.xml"/>
+ -->
+<!-- 2018/05/18 apb: Split the body into 3 parts: netInstall-intro.xml, netInstall-stage1.xml and netInstall-stage2.xml -->
<info>
- <title>Встановлення з маленького образу</title>
+ <title>Встановлення Mageia за допомогою мережі</title>
+
+ <subtitle>Встановлення Mageia з маленького завантажувального образу</subtitle>
<cover>
<para><note>
@@ -26,9 +44,18 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команди
документування</link>, якщо хочете допомогти у покращенні цього підручника.</para>
</cover>
</info>
+
+
- <xi:include href="bootIso.xml"/>
+
+
+
+
+ <xi:include href="netInstall-intro.xml"/>
+
+ <xi:include href="netInstall-stage1.xml"/>
+ <xi:include href="netInstall-stage2.xml"/>
</article>
diff --git a/docs/docs/stable/bootiso/uk/bootIso.xml b/docs/docs/stable/bootiso/uk/bootIso.xml
index 17e5ce16..b988db75 100644
--- a/docs/docs/stable/bootiso/uk/bootIso.xml
+++ b/docs/docs/stable/bootiso/uk/bootIso.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="uk" xml:id="SOME_UNIQUE_ID">
+<?xml version='1.0' encoding='utf-8'?><section version="5.0" xml:lang="uk" xml:id="SOME_UNIQUE_ID" xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink">
<info>
<title xml:id="bootIso-ti1">Встановлення з маленького завантажувального образу</title>
</info>