summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2011-02-20 20:49:25 +0000
committerSamuel Thibault <sthibault@debian.org>2011-02-20 20:49:25 +0000
commita8e57f5c4dcf3e932640709fb838f73a65f4e4e9 (patch)
tree1d531dcb4480ece5426358ec054a1511d170acc1
parent6ddb1a8adba5be05027ba5a890f4d50d7f027927 (diff)
downloadinstallation-guide-a8e57f5c4dcf3e932640709fb838f73a65f4e4e9.zip
Document win32-loader as a possible boot method. Closes: #444017.
-rw-r--r--debian/changelog5
-rw-r--r--en/boot-installer/x86.xml19
2 files changed, 20 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 470344829..8b447041b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,10 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
[ Joey Hess ]
* Fix typo in example preseed. Closes: #612631
- -- Samuel Thibault <sthibault@debian.org> Sun, 20 Feb 2011 20:51:10 +0100
+ [ Didier Raboud ]
+ * Document win32-loader as a possible boot method. Closes: #444017.
+
+ -- Samuel Thibault <sthibault@debian.org> Sun, 20 Feb 2011 21:47:31 +0100
installation-guide (20110122) unstable; urgency=low
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 6d1f5221c..990abde01 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -75,9 +75,22 @@ Boots the <quote>bf2.4</quote> flavor.
<title>Booting from Windows</title>
<para>
-To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM
-or USB memory stick installation media as described in
-<xref linkend="official-cdrom"/> and <xref linkend="boot-usb-files"/>.
+To start the installer from Windows, you can either
+
+<itemizedlist>
+<listitem><para>
+
+obtain CD-ROM/DVD-ROM or USB memory stick installation media as described in
+<xref linkend="official-cdrom"/> and <xref linkend="boot-usb-files"/>, or
+
+</para></listitem>
+<listitem><para>
+
+download a standalone Windows executable, which is available as
+tools/win32-loader/stable/win32-loader.exe on the &debian; mirrors,
+
+</para></listitem>
+</itemizedlist>
</para><para>