3 files changed, 24 insertions, 49 deletions
diff --git a/en/boot-installer/sparc.xml b/en/boot-installer/sparc.xml
index 4a82c9647..a0f0fd508 100644
--- a/en/boot-installer/sparc.xml
+++ b/en/boot-installer/sparc.xml
@@ -32,52 +32,6 @@ command which is simply an alias to boot from the SCSI device on ID 6
 </para>
   </sect2>
 
-
-  <sect2 arch="sparc" condition="supports-floppy-boot">
-  <title>Booting from Floppies</title>
-<para>
-
-Floppy images are currently only available for sparc32, but, for technical
-reasons, not for official releases. (The reason is that they can only be
-built as root, which is not supported by our build daemons.)
-Look under <quote>daily built images</quote> on the
-<ulink url="&url-d-i;">Debian Installer project website</ulink> for links
-to floppy images for sparc32.
-
-</para><para>
-
-To boot from floppy on a Sparc, use
-
-<informalexample><screen>
-Stop-A -&gt; OpenBoot: "boot floppy"
-</screen></informalexample>
-
-Be warned that the newer Sun4u (ultra) architecture does not support
-floppy booting. A typical error message is <computeroutput>Bad magic
-number in disk label - Can't open disk label package</computeroutput>.
-
-</para><para>
-
-Several Sparcs (e.g. Ultra 10) have an OBP bug that prevents them from
-booting (instead of not supporting booting at all). The appropriate
-OBP update can be downloaded as product ID 106121 from
-<ulink url="http://sunsolve.sun.com"></ulink>.
-
-</para><para>
-
-If you are booting from the floppy, and you see messages such as
-
-<informalexample><screen>
-Fatal error: Cannot read partition
-Illegal or malformed device name
-</screen></informalexample>
-
-then it is possible that floppy booting is simply not supported on
-your machine.
-
-</para>
-  </sect2>
-
   <sect2 arch="sparc"><title>IDPROM Messages</title>
 <para>
 
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 6254e6ae2..ac4e6ce6c 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -164,12 +164,14 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>prep</entry>
 </row>
 
-<row>
+<row condition="etch">
   <entry morerows="2">Sun SPARC</entry>
   <entry morerows="2">sparc</entry>
   <entry>sun4m</entry>
   <entry>sparc32</entry>
 </row><row>
+  <entry morerows="1" condition="lenny">Sun SPARC</entry>
+  <entry morerows="1" condition="lenny">sparc</entry>
   <entry>sun4u</entry>
   <entry morerows="1">sparc64</entry>
 </row><row>
diff --git a/en/hardware/supported/sparc.xml b/en/hardware/supported/sparc.xml
index 31ffeca6a..3e83fddac 100644
--- a/en/hardware/supported/sparc.xml
+++ b/en/hardware/supported/sparc.xml
@@ -13,7 +13,7 @@ level of support may be expected for each of them.
 </para>
 
 <variablelist>
-<varlistentry>
+<varlistentry condition="etch">
 <term>sun4, sun4c, sun4d</term>
 
 <listitem><para>
@@ -26,7 +26,7 @@ SPARCstation page</ulink>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry condition="etch">
 <term>sun4m</term>
 
 <listitem><para>
@@ -46,6 +46,25 @@ machines, although it will activate and use only the first CPU.
 </para></listitem>
 </varlistentry>
 
+<varlistentry condition="lenny">
+<term>sun4, sun4c, sun4d, sun4m</term>
+
+<listitem><para>
+
+None of these 32-bit sparc subarchitectures (sparc32) is supported. For a
+complete list of machines belonging to these subarchitectures, please consult
+the <ulink url="http://en.wikipedia.org/wiki/SPARCstation">Wikipedia
+SPARCstation page</ulink>.
+
+</para><para>
+
+The last Debian release to support sparc32 was Etch, but even then only
+for sun4m systems. Support for the other 32-bits subarchitectures had
+already been discontinued after earlier releases.
+
+</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term>sun4u</term>