diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | en/boot-installer/i386.xml | 4 | ||||
| -rw-r--r-- | en/boot-installer/powerpc.xml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6a4ffc7b1..0d570bdb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,10 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low * Delete some obsolete entities. * 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. + -- Frans Pop <fjp@debian.org> Wed, 4 Jan 2006 23:03:45 +0100 installation-guide (20060102) unstable; urgency=low diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml index ed89407a9..9410b55c4 100644 --- a/en/boot-installer/i386.xml +++ b/en/boot-installer/i386.xml @@ -203,7 +203,7 @@ computer. The system should boot up, and you should be presented with the <prompt>boot:</prompt> prompt. Here you can enter optional boot arguments, or just hit &enterkey;. -</para><para> +</para><para condition="supports-floppy-boot"> In case your computer doesn't support booting from USB memory devices, you can still use a single floppy to do the initial boot and then @@ -215,7 +215,7 @@ When it asks for the root floppy, simply press &enterkey;. You should see </para> </sect2> - <sect2 arch="i386" id="floppy-boot"> + <sect2 arch="i386" condition="supports-floppy-boot" id="floppy-boot"> <title>Booting from Floppies</title> <para> diff --git a/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml index 7d7219d08..95108df02 100644 --- a/en/boot-installer/powerpc.xml +++ b/en/boot-installer/powerpc.xml @@ -195,7 +195,7 @@ you should try </sect2> - <sect2 arch="powerpc"> + <sect2 arch="powerpc" condition="supports-floppy-boot"> <title>Booting from Floppies</title> <para> |