Remove mentions of floppy

6 files changed, 1 insertions, 12 deletions

diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386
index 0b341aeb6..160c79642 100644
--- a/build/arch-options/hurd-i386
+++ b/build/arch-options/hurd-i386
@@ -19,8 +19,6 @@ smp_config_option="N/A"
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
 network=""
-# For Lenny i386 does not have floppy images
-#boot="supports-floppy-boot;bootable-disk"
 boot="bootable-disk"
 frontend="newt"
 other=""
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 4cb7d5316..9d155392f 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -19,8 +19,6 @@ smp_config_option="Symmetric multi-processing support"
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
-# For Lenny i386 does not have floppy images
-#boot="supports-floppy-boot;bootable-disk;bootable-usb"
 boot="bootable-disk;bootable-usb;isohybrid-supported"
 frontend="newt;gtk"
 other="supports-wireless;supports-pcmcia;supports-serial-console"
diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386
index 46be8b717..8357cbf24 100644
--- a/build/arch-options/kfreebsd-i386
+++ b/build/arch-options/kfreebsd-i386
@@ -21,8 +21,6 @@ smp_config_option="Symmetric multi-processing support"
 # TODO: update
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
-# For Lenny i386 does not have floppy images
-#boot="supports-floppy-boot;bootable-disk;bootable-usb"
 boot="bootable-disk;bootable-usb;isohybrid-unsupported"
 frontend="newt;not-gtk"
 other="supports-wireless;supports-pcmcia;supports-serial-console"
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index d885d54e2..db8a8d8fa 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -20,7 +20,7 @@ smp_config_option="Symmetric multi-processing support"
 # in the build scripts
 fdisk="mac-fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
-boot="supports-floppy-boot;bootable-disk"
+boot="bootable-disk"
 frontend="newt;gtk"
 other="supports-wireless;supports-pcmcia;supports-serial-console"
 smp="supports-smp-sometimes"
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 128095798..37ebf5991 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -184,5 +184,4 @@ to first switch tasksel to that DE using the following command, e.g:
    "install.<filename arch='i386'>386</filename><filename arch='amd64'>amd</filename>">
 
 <!-- prefix for files that can be downloaded -->
-<!-- <![ %official-web-build; [ <!ENTITY downloadable-file "&url-boot-floppies;"> ]]> -->
                           <!ENTITY downloadable-file "&url-debian-installer;">
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index f3b6e8faa..112c7881b 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -60,10 +60,6 @@
    <!ENTITY download-powerpc.xml     SYSTEM "##SRCPATH##/install-methods/download/powerpc.xml">  
   <!ENTITY ipl-tape.xml             SYSTEM "##SRCPATH##/install-methods/ipl-tape.xml">  
 
-  <!ENTITY create-floppy.xml        SYSTEM "##SRCPATH##/install-methods/create-floppy.xml">
-   <!ENTITY floppy-i386.xml       SYSTEM "##SRCPATH##/install-methods/floppy/i386.xml">
-   <!ENTITY floppy-powerpc.xml     SYSTEM "##SRCPATH##/install-methods/floppy/powerpc.xml">
-
   <!ENTITY boot-usb-files.xml       SYSTEM "##SRCPATH##/install-methods/boot-usb-files.xml">
    <!ENTITY usb-setup-x86.xml           SYSTEM "##SRCPATH##/install-methods/usb-setup/x86.xml">
    <!ENTITY usb-setup-powerpc.xml       SYSTEM "##SRCPATH##/install-methods/usb-setup/powerpc.xml">