Restructure supported hardware section.

5 files changed, 194 insertions, 189 deletions

diff --git a/en/hardware/buying-hardware.xml b/en/hardware/buying-hardware.xml
new file mode 100644
index 000000000..60eb7c7d4
--- /dev/null
+++ b/en/hardware/buying-hardware.xml
@@ -0,0 +1,114 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id$ -->
+
+ <sect1 arch="not-s390"><title>Purchasing Hardware Specifically for GNU/Linux</title>
+
+<para>
+
+There are several vendors, who ship systems with Debian or other
+distributions of GNU/Linux
+<ulink url="&url-pre-installed;">pre-installed</ulink>. You might pay more
+for the privilege, but it does buy a level of peace of mind, since you can
+be sure that the hardware is well-supported by GNU/Linux.
+
+</para><para arch="m68k">
+
+Unfortunately, it's quite rare to find any vendor shipping
+new &arch-title; machines at all.
+
+</para><para arch="x86">
+
+If you do have to buy a machine with Windows bundled, carefully read
+the software license that comes with Windows; you may be able to
+reject the license and obtain a rebate from your vendor.  Searching
+the Internet for <quote>windows refund</quote> may get you some useful
+information to help with that.
+
+</para><para>
+
+Whether or not you are purchasing a system with Linux bundled, or even
+a used system, it is still important to check that your hardware is
+supported by the Linux kernel.  Check if your hardware is listed in
+the references found above.  Let your salesperson (if any) know that
+you're shopping for a Linux system.  Support Linux-friendly hardware
+vendors.
+
+</para>
+
+  <sect2><title>Avoid Proprietary or Closed Hardware</title>
+<para>
+
+Some hardware manufacturers simply won't tell us how to write drivers
+for their hardware. Others won't allow us access to the documentation
+without a non-disclosure agreement that would prevent us from
+releasing the Linux source code.
+
+</para><para arch="m68k">
+
+Another example is the proprietary hardware in the older
+Macintosh line. In fact, no specifications or documentation have ever
+been released for any Macintosh hardware, most notably the ADB
+controller (used by the mouse and keyboard), the floppy controller,
+and all acceleration and CLUT manipulation of the video hardware
+(though we do now support CLUT manipulation on nearly all internal
+video chips).  In a nutshell, this explains why the Macintosh Linux
+port lags behind other Linux ports.
+
+</para><para>
+
+Since we haven't been granted access to the documentation on these
+devices, they simply won't work under Linux. You can help by asking
+the manufacturers of such hardware to release the documentation. If
+enough people ask, they will realize that the free software community
+is an important market.
+
+</para>
+</sect2>
+
+
+  <sect2 arch="x86"><title>Windows-specific Hardware</title>
+<para>
+
+A disturbing trend is the proliferation of Windows-specific modems and
+printers. In some cases these are specially designed to be operated by
+the Microsoft Windows operating system and bear the legend <quote>WinModem</quote>
+or <quote>Made especially for Windows-based computers</quote>. This
+is generally done by removing the embedded processors of the hardware
+and shifting the work they do over to a Windows driver that is run by
+your computer's main CPU. This strategy makes the hardware less
+expensive, but the savings are often <emphasis>not</emphasis> passed on to the
+user and this hardware may even be more expensive than equivalent
+devices that retain their embedded intelligence.
+
+</para><para>
+
+You should avoid Windows-specific hardware for two reasons. The first
+is that the manufacturers do not generally make the resources
+available to write a Linux driver. Generally, the hardware and
+software interface to the device is proprietary, and documentation is
+not available without a non-disclosure agreement, if it is available
+at all. This precludes it being used for free software, since free
+software writers disclose the source code of their programs. The
+second reason is that when devices like these have had their embedded
+processors removed, the operating system must perform the work of the
+embedded processors, often at <emphasis>real-time</emphasis> priority,
+and thus the CPU is not available to run your programs while it is
+driving these devices. Since the typical Windows user does not
+multi-process as intensively as a Linux user, the manufacturers hope
+that the Windows user simply won't notice the burden this hardware
+places on their CPU.  However, any multi-processing operating system,
+even Windows 2000 or XP, suffers from degraded performance when
+peripheral manufacturers skimp on the embedded processing power of
+their hardware.
+
+</para><para>
+
+You can help improve this situation by encouraging these manufacturers
+to release the documentation and other resources necessary for us to
+program their hardware, but the best strategy is simply to avoid this
+sort of hardware until it is listed as working in the
+<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
+
+</para>
+</sect2>
+ </sect1>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 2a1122b33..44e30472d 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -231,67 +231,6 @@ as well.
 &supported-s390.xml;
 &supported-sparc.xml;
 
-  <sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
-<para arch="x86">
-
-You should be using a VGA-compatible display interface for the console
-terminal. Nearly every modern display card is compatible with
-VGA. Ancient standards such CGA, MDA, or HGA should also work,
-assuming you do not require X11 support.  Note that X11 is not used
-during the installation process described in this document.
-
-</para><para>
-
-Debian's support for graphical interfaces is determined by the
-underlying support found in X.Org's X11 system.  Most AGP, PCI and
-PCIe video cards work under X.Org.  Details on supported graphics
-buses, cards, monitors, and pointing devices can be found at
-<ulink url="&url-xorg;"></ulink>.  Debian &release; ships
-with X.Org version &x11ver;.
-
-</para><para arch="mips">
-
-<!-- FIXME: mention explicit graphics chips and not system names -->
-The X.Org X Window System is only supported on the SGI Indy and the O2.  The
-Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
-slots and support VGA emulation or Linux framebuffer on a selected range
-of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
-listing</ulink> for Broadcom evaluation boards is available.
-
-</para><para arch="mipsel">
-
-The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
-slots and support VGA emulation or Linux framebuffer on a selected range
-of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
-listing</ulink> for Broadcom evaluation boards is available.
-
-</para><para arch="sparc">
-
-Most graphics options commonly found on Sparc-based machines are supported.
-X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6,
-sunleo and suntcx framebuffers, Creator3D and Elite3D cards (sunffb driver),
-PGX24/PGX64 ATI-based video cards (ati driver), and PermediaII-based cards
-(glint driver). To use an Elite3D card with X.org you additionally need to
-install the <classname>afbinit</classname> package, and read the documentation
-included with it on how to activate the card.
-
-</para><para arch="sparc">
-
-It is not uncommon for a Sparc machine to have two graphics cards in a
-default configuration. In such a case there is a possibility that the
-Linux kernel will not direct its output to the card initially used by the
-firmware. The lack of output on the graphical console may then be mistaken
-for a hang (usually the last message seen on console is 'Booting Linux...').
-One possible solution is to physically remove one of the video cards;
-another option is to disable one of the cards using a kernel boot parameter.
-Also, if graphical output is not required or desired, serial console may be
-used as an alternative. On some systems use of serial console can be
-activated automatically by disconnecting the keyboard before booting the
-system.
-
-</para>
-  </sect2>
-
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
 <para>
 
@@ -396,4 +335,69 @@ section of the kernel config.
 
 </para>
   </sect2>
+
+  <sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
+<para arch="x86">
+
+You should be using a VGA-compatible display interface for the console
+terminal. Nearly every modern display card is compatible with
+VGA. Ancient standards such CGA, MDA, or HGA should also work,
+assuming you do not require X11 support.  Note that X11 is not used
+during the installation process described in this document.
+
+</para><para>
+
+Debian's support for graphical interfaces is determined by the
+underlying support found in X.Org's X11 system.  Most AGP, PCI and
+PCIe video cards work under X.Org.  Details on supported graphics
+buses, cards, monitors, and pointing devices can be found at
+<ulink url="&url-xorg;"></ulink>.  Debian &release; ships
+with X.Org version &x11ver;.
+
+</para><para arch="mips">
+
+<!-- FIXME: mention explicit graphics chips and not system names -->
+The X.Org X Window System is only supported on the SGI Indy and the O2.  The
+Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
+slots and support VGA emulation or Linux framebuffer on a selected range
+of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
+listing</ulink> for Broadcom evaluation boards is available.
+
+</para><para arch="mipsel">
+
+The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
+slots and support VGA emulation or Linux framebuffer on a selected range
+of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
+listing</ulink> for Broadcom evaluation boards is available.
+
+</para><para arch="sparc">
+
+Most graphics options commonly found on Sparc-based machines are supported.
+X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6,
+sunleo and suntcx framebuffers, Creator3D and Elite3D cards (sunffb driver),
+PGX24/PGX64 ATI-based video cards (ati driver), and PermediaII-based cards
+(glint driver). To use an Elite3D card with X.org you additionally need to
+install the <classname>afbinit</classname> package, and read the documentation
+included with it on how to activate the card.
+
+</para><para arch="sparc">
+
+It is not uncommon for a Sparc machine to have two graphics cards in a
+default configuration. In such a case there is a possibility that the
+Linux kernel will not direct its output to the card initially used by the
+firmware. The lack of output on the graphical console may then be mistaken
+for a hang (usually the last message seen on console is 'Booting Linux...').
+One possible solution is to physically remove one of the video cards;
+another option is to disable one of the cards using a kernel boot parameter.
+Also, if graphical output is not required or desired, serial console may be
+used as an alternative. On some systems use of serial console can be
+activated automatically by disconnecting the keyboard before booting the
+system.
+
+</para>
+  </sect2>
+
+&network-cards.xml;
+&supported-peripherals.xml;
+
  </sect1>
diff --git a/en/hardware/hardware.xml b/en/hardware/hardware.xml
index a953e04d5..541357b32 100644
--- a/en/hardware/hardware.xml
+++ b/en/hardware/hardware.xml
@@ -13,9 +13,8 @@ about hardware supported by GNU and Linux.
 </para>
 
 &hardware-supported.xml;
+&buying-hardware.xml;
 &installation-media.xml;
-&supported-peripherals.xml;
 &memory-disk-requirements.xml;
-&network-cards.xml;
 
 </chapter>
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index ea779f370..0f28e37d6 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
- <sect1 id="network-cards">
+ <sect2 id="network-cards">
  <title>Network Connectivity Hardware</title>
 <para>
 
@@ -90,7 +90,7 @@ supported; Spellcaster BRI ISDN boards are also not supported by the
 
 </para>
 
-  <sect2 arch="not-s390" id="nics-firmware">
+  <sect3 arch="not-s390" id="nics-firmware">
   <title>Drivers Requiring Firmware</title>
 <para>
 
@@ -118,9 +118,9 @@ also copy the firmware to that location for the installed system before
 the reboot at the end of the installation.
 
 </para>
-  </sect2>
+  </sect3>
 
-  <sect2 condition="supports-wireless" id="nics-wireless">
+  <sect3 condition="supports-wireless" id="nics-wireless">
   <title>Wireless Network Cards</title>
 <para>
 
@@ -146,9 +146,9 @@ use the <classname>ndiswrapper</classname> package, which allows you to use
 a Windows driver.</phrase>
 
 </para>
-  </sect2>
+  </sect3>
 
-  <sect2 arch="sparc" id="nics-sparc-trouble">
+  <sect3 arch="sparc" id="nics-sparc-trouble">
   <title>Known Issues for &arch-title;</title>
 <para>
 
@@ -157,7 +157,7 @@ mentioning here.
 
 </para>
 
-   <sect3><title>Conflict between tulip and dfme drivers</title>
+   <sect4><title>Conflict between tulip and dfme drivers</title>
 <!-- BTS: #334104; may also affect other arches, but most common on sparc -->
 <para>
 
@@ -188,9 +188,9 @@ Note that the wrong module may then still be loaded when the system is
 rebooted.
 
 </para>
-   </sect3>
+   </sect4>
 
-   <sect3><title>Sun B100 blade</title>
+   <sect4><title>Sun B100 blade</title>
 <!-- BTS: #384549; should be checked for kernels >2.6.18 -->
 <para>
 
@@ -198,6 +198,6 @@ The <literal>cassini</literal> network driver does not work with Sun B100
 blade systems.
 
 </para>
-   </sect3>
-  </sect2>
- </sect1>
+   </sect4>
+  </sect3>
+ </sect2>
diff --git a/en/hardware/supported-peripherals.xml b/en/hardware/supported-peripherals.xml
index 41a2810a0..138213619 100644
--- a/en/hardware/supported-peripherals.xml
+++ b/en/hardware/supported-peripherals.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
- <sect1 id="supported-peripherals">
+ <sect2 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
 <para arch="not-s390">
 
@@ -41,116 +41,4 @@ board features four 64 bit PCI slots.  The Cobalt RaQ has no support for
 additional devices but the Qube has one PCI slot.
 
 </para>
-</sect1>
-
- <sect1 arch="not-s390"><title>Purchasing Hardware Specifically for GNU/Linux</title>
-
-<para>
-
-There are several vendors, who ship systems with Debian or other
-distributions of GNU/Linux
-<ulink url="&url-pre-installed;">pre-installed</ulink>. You might pay more
-for the privilege, but it does buy a level of peace of mind, since you can
-be sure that the hardware is well-supported by GNU/Linux.
-
-</para><para arch="m68k">
-
-Unfortunately, it's quite rare to find any vendor shipping
-new &arch-title; machines at all.
-
-</para><para arch="x86">
-
-If you do have to buy a machine with Windows bundled, carefully read
-the software license that comes with Windows; you may be able to
-reject the license and obtain a rebate from your vendor.  Searching
-the Internet for <quote>windows refund</quote> may get you some useful
-information to help with that.
-
-</para><para>
-
-Whether or not you are purchasing a system with Linux bundled, or even
-a used system, it is still important to check that your hardware is
-supported by the Linux kernel.  Check if your hardware is listed in
-the references found above.  Let your salesperson (if any) know that
-you're shopping for a Linux system.  Support Linux-friendly hardware
-vendors.
-
-</para>
-
-  <sect2><title>Avoid Proprietary or Closed Hardware</title>
-<para>
-
-Some hardware manufacturers simply won't tell us how to write drivers
-for their hardware. Others won't allow us access to the documentation
-without a non-disclosure agreement that would prevent us from
-releasing the Linux source code.
-
-</para><para arch="m68k">
-
-Another example is the proprietary hardware in the older
-Macintosh line. In fact, no specifications or documentation have ever
-been released for any Macintosh hardware, most notably the ADB
-controller (used by the mouse and keyboard), the floppy controller,
-and all acceleration and CLUT manipulation of the video hardware
-(though we do now support CLUT manipulation on nearly all internal
-video chips).  In a nutshell, this explains why the Macintosh Linux
-port lags behind other Linux ports.
-
-</para><para>
-
-Since we haven't been granted access to the documentation on these
-devices, they simply won't work under Linux. You can help by asking
-the manufacturers of such hardware to release the documentation. If
-enough people ask, they will realize that the free software community
-is an important market.
-
-</para>
-</sect2>
-
-
-  <sect2 arch="x86"><title>Windows-specific Hardware</title>
-<para>
-
-A disturbing trend is the proliferation of Windows-specific modems and
-printers. In some cases these are specially designed to be operated by
-the Microsoft Windows operating system and bear the legend <quote>WinModem</quote>
-or <quote>Made especially for Windows-based computers</quote>. This
-is generally done by removing the embedded processors of the hardware
-and shifting the work they do over to a Windows driver that is run by
-your computer's main CPU. This strategy makes the hardware less
-expensive, but the savings are often <emphasis>not</emphasis> passed on to the
-user and this hardware may even be more expensive than equivalent
-devices that retain their embedded intelligence.
-
-</para><para>
-
-You should avoid Windows-specific hardware for two reasons. The first
-is that the manufacturers do not generally make the resources
-available to write a Linux driver. Generally, the hardware and
-software interface to the device is proprietary, and documentation is
-not available without a non-disclosure agreement, if it is available
-at all. This precludes it being used for free software, since free
-software writers disclose the source code of their programs. The
-second reason is that when devices like these have had their embedded
-processors removed, the operating system must perform the work of the
-embedded processors, often at <emphasis>real-time</emphasis> priority,
-and thus the CPU is not available to run your programs while it is
-driving these devices. Since the typical Windows user does not
-multi-process as intensively as a Linux user, the manufacturers hope
-that the Windows user simply won't notice the burden this hardware
-places on their CPU.  However, any multi-processing operating system,
-even Windows 2000 or XP, suffers from degraded performance when
-peripheral manufacturers skimp on the embedded processing power of
-their hardware.
-
-</para><para>
-
-You can help improve this situation by encouraging these manufacturers
-to release the documentation and other resources necessary for us to
-program their hardware, but the best strategy is simply to avoid this
-sort of hardware until it is listed as working in the
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
-
-</para>
-</sect2>
- </sect1>
+ </sect2>