summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-01-09 09:58:14 +0000
committerColin Watson <cjwatson@debian.org>2006-01-09 09:58:14 +0000
commit87aa91f8b22964a1c1087f02822ab2fd55960330 (patch)
tree32ed802f4e42899a218cf179a980902a9d8389bb
parente698cae0f1b80ac6351f4f026f3aaa25692453be (diff)
downloadinstallation-guide-87aa91f8b22964a1c1087f02822ab2fd55960330.zip
add more bootable-usb conditionals too
-rw-r--r--debian/changelog4
-rw-r--r--en/boot-installer/i386.xml2
-rw-r--r--en/boot-installer/powerpc.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 0d570bdb0..b6c6362ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,8 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low
* Change references from package d-i-manual to package installation-guide.
[ Colin Watson ]
- * Add a few more supports-floppy-boot conditionals to make it easier to
- turn all this off in rebuilds of the manual.
+ * Add a few more supports-floppy-boot and bootable-usb conditionals to
+ make it easier to turn all this off in rebuilds of the manual.
-- Frans Pop <fjp@debian.org> Wed, 4 Jan 2006 23:03:45 +0100
diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml
index 9410b55c4..a9b01492b 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/i386.xml
@@ -192,7 +192,7 @@ or <command>LILO</command>.
</para>
</sect2>
- <sect2 arch="i386" id="usb-boot">
+ <sect2 arch="i386" condition="bootable-usb" id="usb-boot">
<title>Booting from USB Memory Stick</title>
<para>
diff --git a/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml
index 95108df02..434973f98 100644
--- a/en/boot-installer/powerpc.xml
+++ b/en/boot-installer/powerpc.xml
@@ -111,7 +111,7 @@ doesn't work. The Debian installation program should start.
</sect3>
</sect2>
- <sect2 arch="powerpc" id="usb-boot">
+ <sect2 arch="powerpc" condition="bootable-usb" id="usb-boot">
<title>Booting from USB memory stick</title>
<para>