summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-03-07 18:25:00 +0000
committerMartin Michlmayr <tbm@cyrius.com>2006-03-07 18:25:00 +0000
commit5aadb1c394bbd2d78d007c431aad24d4365371ae (patch)
tree6bf83a6d8beb6afb66545d7ca2a2115925f71a41
parent563327609fcf9bded569e5ff6029135233e938c1 (diff)
downloadinstallation-guide-5aadb1c394bbd2d78d007c431aad24d4365371ae.zip
Fix Netwinder/CATS download location.
-rw-r--r--build/entities/tftp-images.ent4
-rw-r--r--debian/changelog1
-rw-r--r--en/install-methods/download/arm.xml9
3 files changed, 7 insertions, 7 deletions
diff --git a/build/entities/tftp-images.ent b/build/entities/tftp-images.ent
index 4253c4530..53207e9ca 100644
--- a/build/entities/tftp-images.ent
+++ b/build/entities/tftp-images.ent
@@ -3,11 +3,11 @@
<!-- -->
<!ENTITY cats-boot-img '
-<ulink url="&downloadable-file;cats/tftpboot.img">.../current/cats/tftpboot.img</ulink>
+<ulink url="&downloadable-file;cats/tftpboot.img">.../current/images/netwinder/netboot/</ulink>
'>
<!ENTITY netwinder-boot-img '
-<ulink url="&downloadable-file;netwinder/tftpboot.img">.../current/netwinder/tftpboot.img</ulink>
+<ulink url="&downloadable-file;netwinder/tftpboot.img">.../current/images/netwinder/netboot/boot.img</ulink>
'>
<!-- m68k updated 2004-11-04 -->
diff --git a/debian/changelog b/debian/changelog
index a2507133d..4d2b10d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* Bring ARM up to date with reality: remove unsupported flavours, add
NSLU2.
+ * Fix Netwinder/CATS download location.
-- Joey Hess <joeyh@debian.org> Tue, 21 Feb 2006 16:46:06 -0500
diff --git a/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml
index 69619a91d..7df684d10 100644
--- a/en/install-methods/download/arm.xml
+++ b/en/install-methods/download/arm.xml
@@ -16,10 +16,10 @@ Download this file onto the RISC OS machine, copy the
</sect3>
<sect3 arch="arm" id="netwinder-install-files">
- <title>NetWinder Installation Files</title>
+ <title>Netwinder Installation Files</title>
<para>
-The easiest way to boot a NetWinder is over the network, using the
+The easiest way to boot a Netwinder is over the network, using the
supplied TFTP image &netwinder-boot-img;.
</para>
@@ -29,9 +29,8 @@ supplied TFTP image &netwinder-boot-img;.
<title>CATS Installation Files</title>
<para>
-The only supported boot method for CATS is to use the combined image
-&cats-boot-img;. This can be loaded from any device accessible to the
-Cyclone bootloader.
+CATS be be booted either via the network or from CD-ROM. The kernel and
+initrd can be obtained from &cats-boot-img;.
</para>
</sect3>