diff --git a/general.ent b/general.ent
index adc56cdeb2..c917f57d87 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/general/genlib/libusb.xml b/general/genlib/libusb.xml
index d7806f8b90..2fd8f7b54d 100644
--- a/general/genlib/libusb.xml
+++ b/general/genlib/libusb.xml
@@ -127,11 +127,14 @@ install -v -m644 doc/html/* \
To access raw USB devices (those not treated as a disk by the mass-storage
driver), appropriate support must be available in the kernel. Check your
- kernel configuration for Device Drivers ⇒ USB support ⇒ Support
- for Host-side USB. Select any USB hardware device drivers you may need
- on the same page.
+ kernel configuration:
+Device Drivers --->
+ [*] USB support ---> [CONFIG_USB_SUPPORT]
+ <*/M> Support for Host-side USB [CONFIG_USB]
+ (Select any USB hardware device drivers you may need on the same page)
+
Support for Host-side USB
diff --git a/general/sysutils/autofs.xml b/general/sysutils/autofs.xml
index 8d935f92d7..1554ae34d1 100644
--- a/general/sysutils/autofs.xml
+++ b/general/sysutils/autofs.xml
@@ -89,16 +89,16 @@
File systems --->
- Kernel automounter version 4 support (also supports v3): Y or M
+ <*/M> Kernel automounter version 4 support (also supports v3) [CONFIG_AUTOFS4_FS]
Optionally, enable the following options in the kernel configuration:
File systems --->
- Network File Systems --->
- NFS client support: Y or M
- CIFS support (advanced network filesystem, SMBFS successor): Y or M
+ [*] Network File Systems ---> [CONFIG_NETWORK_FILESYSTEMS]
+ <*/M> NFS client support [CONFIG_NFS_FS]
+ <*/M> CIFS support (advanced network filesystem, SMBFS successor) [CONFIG_CIFS]
Recompile and install the new kernel, if necessary.
diff --git a/general/sysutils/bluez.xml b/general/sysutils/bluez.xml
index ec6694f399..d6d236f234 100644
--- a/general/sysutils/bluez.xml
+++ b/general/sysutils/bluez.xml
@@ -104,21 +104,18 @@
kernel if necessary:
-[*] Networking support ---> [CONFIG_NET]
- <*> or <M> Bluetooth subsystem support ---> [CONFIG_BT]
- <*> or <M> RFCOMM protocol support [CONFIG_BT_RFCOMM]
- [*] RFCOMM TTY support [CONFIG_BT_RFCOMM_TTY]
- <*> or <M> BNEP protocol support [CONFIG_BT_BNEP]
- [*] Multicast filter support [CONFIG_BT_BNEP_MC_FILTER]
- [*] Protocol filter support [CONFIG_BT_BNEP_PROTO_FILTER]
- <*> or <M> HIDP protocol support [CONFIG_BT_HIDP]
+[*] Networking support ---> [CONFIG_NET]
+ </M> Bluetooth subsystem support ---> [CONFIG_BT]
+ <*/M> RFCOMM protocol support [CONFIG_BT_RFCOMM]
+ [*] RFCOMM TTY support [CONFIG_BT_RFCOMM_TTY]
+ <*/M> BNEP protocol support [CONFIG_BT_BNEP]
+ [*] Multicast filter support [CONFIG_BT_BNEP_MC_FILTER]
+ [*] Protocol filter support [CONFIG_BT_BNEP_PROTO_FILTER]
+ <*/M> HIDP protocol support [CONFIG_BT_HIDP]
+ Bluetooth device drivers --->
+ (Select the appropriate drivers for your Bluetooth hardware)
- Bluetooth device drivers --->
- <*> or <M> RF switch subsystem support
-
-
- Select the appropriate drivers for your Bluetooth hardware.
-
+ <*/M> RF switch subsystem support ---> [CONFIG_RFKILL]
bluez
diff --git a/general/sysutils/lm_sensors.xml b/general/sysutils/lm_sensors.xml
index 1f731e5256..cf5a5326a7 100644
--- a/general/sysutils/lm_sensors.xml
+++ b/general/sysutils/lm_sensors.xml
@@ -113,20 +113,21 @@
may be needed by Lm Sensors as a module:
-Top level
- [*] Enable loadable module support --->
+
+[*] Enable loadable module support ---> [CONFIG_MODULES]
Bus options (PCI etc.) --->
- [*] PCI support
+ [*] PCI support [CONFIG_PCI]
Device Drivers --->
- [*] I2C support
- [*] I2C device interface
- I2C Algorithms --->
- <M> (configure all of them as modules)
+ I2C support --->
+ <*/M> I2C device interface [CONFIG_I2C_CHARDEV]
I2C Hardware Bus support --->
<M> (configure all of them as modules)
- [*] Hardware Monitoring support --->
+ <*/M> Hardware Monitoring support ---> [CONFIG_HWMON]
<M> (configure all of them as modules)
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5f44fed341..2b8f07e9ff 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,17 @@
-->
+
+ December 6th, 2014
+
+
+ [pierre] - Last round of Kernel Configuration instructions
+ layout change. Fixes
+ #5885.
+
+
+
+
December 5th, 2014
diff --git a/postlfs/security/iptables.xml b/postlfs/security/iptables.xml
index 79385c4fbb..06fff44b13 100644
--- a/postlfs/security/iptables.xml
+++ b/postlfs/security/iptables.xml
@@ -84,10 +84,13 @@
A firewall in Linux is accomplished through a portion of the
kernel called netfilter. The interface to netfilter is
Iptables. To use it, the appropriate
- kernel configuration parameters are found in Networking Support ⇒
- Networking Options ⇒ Network Packet Filtering Framework.
+ kernel configuration parameters are found in:
+[*] Networking support ---> [CONFIG_NET]
+ Networking Options --->
+ [*] Network packet filtering framework (Netfilter) ---> [CONFIG_NETFILTER]
+
Iptables
diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml
index eea7480370..d7176ae8b2 100644
--- a/pst/printing/cups.xml
+++ b/pst/printing/cups.xml
@@ -135,10 +135,10 @@
Device Drivers --->
- USB support --->
- OHCI HCD (USB 1.1) support: Y or M [CONFIG_USB_OHCI_HCD]
- UHCI HCD (most Intel and VIA) support: Y or M [CONFIG_USB_UHCI_HCD]
- USB Printer support: Y or M [CONFIG_USB_PRINTER]
+ [*] USB support ---> [CONFIG_USB_SUPPORT]
+ <*/M> OHCI HCD (USB 1.1) support [CONFIG_USB_OHCI_HCD]
+ <*/M> UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+ <*/M> USB Printer support [CONFIG_USB_PRINTER]
If you have a parallel printer, enable the following options in your
@@ -146,10 +146,10 @@
Device Drivers --->
- Parallel port support ---> [CONFIG_PARPORT]
- PC-style hardware: Y or M [CONFIG_PARPORT_PC]
+ <*/M> Parallel port support ---> [CONFIG_PARPORT]
+ <*/M> PC-style hardware [CONFIG_PARPORT_PC]
Character devices --->
- Parallel printer support: Y or M [CONFIG_PRINTER]
+ <*/M> Parallel printer support [CONFIG_PRINTER]
cups
diff --git a/pst/printing/gutenprint.xml b/pst/printing/gutenprint.xml
index fa75bc7971..120c559b89 100644
--- a/pst/printing/gutenprint.xml
+++ b/pst/printing/gutenprint.xml
@@ -98,11 +98,11 @@
recompile the kernel:
-Device Drivers --->
- USB support --->
- OHCI HCD (USB 1.1) support: Y or M
- UHCI HCD (most Intel and VIA) support: Y or M
- USB Printer support: Y or M
+Device Drivers --->
+ [*] USB support ---> [CONFIG_USB_SUPPORT]
+ <*/M> OHCI HCD (USB 1.1) support [CONFIG_USB_OHCI_HCD]
+ <*/M> UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+ <*/M> USB Printer support [CONFIG_USB_PRINTER]
escputil for usb printers
diff --git a/xsoft/other/rox-filer.xml b/xsoft/other/rox-filer.xml
index 62bf12cbd8..c402b59e4a 100644
--- a/xsoft/other/rox-filer.xml
+++ b/xsoft/other/rox-filer.xml
@@ -94,8 +94,8 @@
dnotify support in your kernel. In make menuconfig:
-Filesystems --->
- [*] Dnotify support
+File systems --->
+ [*] Dnotify support [CONFIG_DNOTIFY]
Save the new .config and then compile the kernel.