- Improve text for smp-alternatives (thanks Frederik Schueler)

- i386 also has smp-alternatives, except for 486 flavor which is not compiled with SMP support
- hardware/hardware-supported.xml: whitespace cleanup
- changelog updated

3 files changed, 15 insertions, 18 deletions

diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 7cb81b35b..dd4bca72a 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -16,6 +16,6 @@ fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk"
-smp="supports-smp-sometimes"
+smp="smp-alternatives"
 goodies="supports-lang-chooser"
 status="checked"
diff --git a/debian/changelog b/debian/changelog
index dc9652dd0..4d4924e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,12 +13,14 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Apply various patches by or based on suggestions from Nathanael Nerode.
   * Add variant for the AMD64 architecture. Closes: #305977.
   * Suppress warnings about missing IDs for sections and such.
+  * Reorganize supported hardware table; i386 no longer has flavors.
+  * Document SMP-alternatives as one of the variants of SMP support.
 
   [ Miroslav Kure ]
   * Update information about booting with encrypted partitions.
     Closes: #378651.
 
- -- Frans Pop <fjp@debian.org>  Wed, 16 Aug 2006 02:13:53 +0200
+ -- Frans Pop <fjp@debian.org>  Wed, 16 Aug 2006 19:06:05 +0200
 
 installation-guide (20060726) unstable; urgency=low
 
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 61a00d7b8..03c9c55fd 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -3,7 +3,6 @@
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
-
 <para>
 
 Debian does not impose hardware requirements beyond the requirements
@@ -25,7 +24,6 @@ information can be found.
 </para>
 
   <sect2><title>Supported Architectures</title>
-
 <para>
 
 Debian &release; supports eleven major architectures and several
@@ -207,7 +205,6 @@ problems; make sure to mention the fact that the bug is on the
 as well.
 
 </para>
-
   </sect2>
 
 <!-- supported cpu docs -->
@@ -225,7 +222,6 @@ as well.
 &supported-sparc.xml;
 
   <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
-
 <para arch="x86">
 
 You should be using a VGA-compatible display interface for the console
@@ -261,7 +257,6 @@ of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
 listing</ulink> for Broadcom evaluation boards is available.
 
 </para>
-
   </sect2>
 
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
@@ -275,10 +270,8 @@ with GNU/Linux, see the
 </para>
    </sect2>
 
-
   <sect2 condition="defaults-smp">
-<title>Multiple Processors</title>
-
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
@@ -297,8 +290,7 @@ to do this in <xref linkend="kernel-baking"/>.  At this time
 section of the kernel config.
 
 </para>
-   </sect2>
-
+  </sect2>
 
   <sect2 condition="smp-alternatives">
 <title>Multiple Processors</title>
@@ -309,16 +301,19 @@ Multi-processor support &mdash; also called <quote>symmetric
 multi-processing</quote> or SMP &mdash; is available for this architecture.
 The standard Debian &release; kernel image was compiled with
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
-will detect if your system has multiple processors and will automatically
-activate SMP when needed.
+will detect the number of processors (or processor cores) and will
+automatically deactivate SMP on uniprocessor systems.
 
-</para>
+</para><para arch="i386">
 
-  </sect2>
+The 486 flavour of the Debian kernel image packages for &arch-title;
+is not compiled with SMP support.
 
+</para>
+  </sect2>
 
   <sect2 condition="supports-smp">
- <title>Multiple Processors</title>
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
@@ -341,7 +336,7 @@ section of the kernel config.
   </sect2>
 
   <sect2 condition="supports-smp-sometimes">
- <title>Multiple Processors</title>
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric