summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--en/boot-installer/x86.xml19
-rw-r--r--en/install-methods/boot-drive-files.xml17
-rw-r--r--en/install-methods/boot-usb-files.xml4
4 files changed, 22 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index a1136aa3b..118ea547f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ installation-guide (20200110) UNRELEASED; urgency=medium
"Installing GRUB on the primary drive").
* Also mention Windows 10 fast-startup feature in-line with fast-boot from
Windows 8. Closes: #939862
+ * Move advise for downloading netboot/hd-media files from chapter 5.1.5. to
+ 4.4.1. where it belongs. And convert filenames into clickable links.
+ Closes: #284760
[ Changwoo Ryu ]
* Improve Korean pdf
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index f54201c97..570cec236 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -104,25 +104,6 @@ and place the needed files as described in <xref linkend="boot-drive-files"/>.
</para>
<para>
-If you intend to use the hard drive only for booting and then
-download everything over the network, you should download the
-<filename>netboot/debian-installer/&architecture;/initrd.gz</filename> file and its
-corresponding kernel
-<filename>netboot/debian-installer/&architecture;/linux</filename>. This will allow you
-to repartition the hard disk from which you boot the installer, although you
-should do so with care.
-</para>
-
-<para>
-Alternatively, if you intend to keep an existing partition on the hard
-drive unchanged during the install, you can download the
-<filename>hd-media/initrd.gz</filename> file and its kernel, as well as
-copy an installation image to the hard drive (make sure the file is named ending in
-<literal>.iso</literal>). The installer can then boot from the hard drive
-and install from the installation image, without needing the network.
-</para>
-
-<para>
For <command>GRUB2</command>, you will need to configure two
essential things in <filename>/boot/grub/grub.cfg</filename>:
<itemizedlist>
diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml
index 806da3faf..188feda52 100644
--- a/en/install-methods/boot-drive-files.xml
+++ b/en/install-methods/boot-drive-files.xml
@@ -69,6 +69,23 @@ convenient location on your hard drive, for instance to
</itemizedlist>
</para><para>
+If you intend to use the hard drive only for booting and then
+download everything over the network, you should download the
+&x86-netboot-initrd; file and its
+corresponding kernel &x86-netboot-linux;. This will allow you
+to repartition the hard disk from which you boot the installer, although you
+should do so with care.
+</para>
+
+<para>
+Alternatively, if you intend to keep an existing partition on the hard
+drive unchanged during the install, you can download the
+&x86-hdmedia-initrd; file and its kernel
+&x86-hdmedia-vmlinuz;, as well as
+copy an installation image to the hard drive (make sure the file is named ending in
+<literal>.iso</literal>). The installer can then boot from the hard drive
+and install from the installation image, without needing the network.
+</para><para>
Finally, to configure the bootloader proceed to
<xref linkend="boot-initrd"/>.
diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml
index c1e6d23d1..12d81924c 100644
--- a/en/install-methods/boot-usb-files.xml
+++ b/en/install-methods/boot-usb-files.xml
@@ -40,7 +40,7 @@ on your USB stick. See
Alternatively,
for very small USB sticks, only a few megabytes in size, you can download
-the <filename>mini.iso</filename> image from the <filename>netboot</filename>
+the &netboot-mini-iso; image from the <filename>netboot</filename>
directory (at the location mentioned in <xref linkend="where-files"/>).
</para><para>
@@ -117,7 +117,7 @@ setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
</para><para>
-There is an all-in-one file <filename>hd-media/boot.img.gz</filename>
+There is an all-in-one file &hdmedia-boot-img;
which contains all the installer files (including the kernel)
<phrase arch="x86">as well as <classname>syslinux</classname> and its
configuration file</phrase>