diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index d6dbd1bda7..7ae4aad387 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -453,11 +453,9 @@
Each line contains a keyword and one or more arguments. For
simplicity, most lines only contain one argument. Anything
following a <literal>#</literal> is considered a comment and
- ignored. The following sections describe each keyword, generally in
- the order they are listed in <filename>GENERIC</filename>, although
- some related keywords have been grouped together in a single section
- (such as Networking) even though they are actually scattered
- throughout the <filename>GENERIC</filename> file. <anchor
+ ignored. The following sections describe each keyword, in
+ the order they are listed in <filename>GENERIC</filename>.
+ <anchor
id="kernelconfig-options"> For an exhaustive list of architecture
dependent options and devices, see the <filename>NOTES</filename>
file in the same directory as <filename>GENERIC</filename>. For
@@ -502,28 +500,6 @@
<filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename>
fairly closely.</para>
- <programlisting>#
-# GENERIC -- Generic kernel configuration file for &os;/i386
-#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-# http://www.&os;.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# &os; World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-# $FreeBSD: /repoman/r/ncvs/src/sys/i386/conf/GENERIC,v 1.413 2004/08/11 01:34:18 rwatson Exp $</programlisting>
-
- <para>The following are the mandatory keywords required in
- <emphasis>every</emphasis> kernel you build:</para>
<indexterm>
<primary>kernel options</primary>
<secondary>machine</secondary>
@@ -601,27 +577,6 @@ cpu I686_CPU</programlisting>
kernel, so it is useful to give the new kernel a different name if you
want to keep it separate from your usual kernel (e.g., you want to
build an experimental kernel).</para>
-
- <programlisting># Floating point support - do not disable.
-device npx</programlisting>
-
- <para><literal>npx</literal> is the interface to the floating point
- math unit in &os;, which is either the hardware co-processor or
- the software math emulator. This is <emphasis>not</emphasis>
- optional.</para>
-
- <programlisting># Pseudo devices
-device loop # Network loopback</programlisting>
-
- <para>This is the generic loopback device for TCP/IP. If you telnet
- or FTP to <hostid>localhost</hostid> (a.k.a. <hostid
- role="ipaddr">127.0.0.1</hostid>) it will come back at you through
- this device. This is <emphasis>mandatory</emphasis>. Under
- &os; 4.X you have to use the line <literal>pseudo-device
- loop</literal>.</para>
-
- <para>Everything that follows is more or less optional. See the notes
- underneath or next to each option for more information.</para>
<programlisting>#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.</programlisting>
@@ -1067,6 +1022,14 @@ device sc</programlisting>
will enable support for AGP, and AGP GART for boards which
have these features.</para>
+ <programlisting># Floating point support - do not disable.
+device npx</programlisting>
+
+ <para><literal>npx</literal> is the interface to the floating point
+ math unit in &os;, which is either the hardware co-processor or
+ the software math emulator. This is <emphasis>not</emphasis>
+ optional.</para>
+
<indexterm>
<primary>APM</primary>
</indexterm>
@@ -1235,6 +1198,16 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
<para>Support for various wireless cards.</para>
+ <programlisting># Pseudo devices
+device loop # Network loopback</programlisting>
+
+ <para>This is the generic loopback device for TCP/IP. If you telnet
+ or FTP to <hostid>localhost</hostid> (a.k.a. <hostid
+ role="ipaddr">127.0.0.1</hostid>) it will come back at you through
+ this device. This is <emphasis>mandatory</emphasis>. Under
+ &os; 4.X you have to use the line <literal>pseudo-device
+ loop</literal>.</para>
+
<programlisting>device mem # Memory and kernel memory devices</programlisting>
<para>The system memory devices.</para>