30 files changed, 35 insertions, 6 deletions

diff --git a/faq.mdwn b/faq.mdwn
index f3e6b719..303b8727 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -11,10 +11,6 @@ License|/fdl]]."]]"""]]
 [[!meta title="FAQ"]]
 [[!tag stable_URL]]
 
-Also see the...
-
-  * [[microkernel FAQ|microkernel/faq]],
-
 [[!inline
 pages=none
 show=0
@@ -22,11 +18,29 @@ feeds=no
 actions=yes
 rootpage="faq" postformtext="Add a new item titled:"]]
 
+# Also see the...
+
+  * [[microkernel FAQ|microkernel/faq]],
+
+
+# General-discussion FAQs
 
-# FAQs
+[[!map
+pages="faq/* and !*/discussion and !*/debian/* and !*/running/* and !*/support/* and !*/issues/* and !*/dev/* and !*/old/*"
+show=title]]
+
+
+# Hardware/Software support FAQs
 
 [[!map
-pages="faq/* and !*/discussion and !*/debian/*"
+pages="faq/support/* and !*/discussion"
+show=title]]
+
+
+# Running GNU/Hurd FAQs
+
+[[!map
+pages="faq/running/* and !*/discussion"
 show=title]]
 
 
@@ -36,3 +50,18 @@ show=title]]
 pages="faq/debian/* and !*/discussion"
 show=title]]
 
+
+# Development FAQs
+
+[[!map
+pages="faq/dev/* and !*/discussion"
+show=title]]
+
+
+# Old FAQs
+
+[[!map
+pages="faq/old/* and !*/discussion"
+show=title]]
+
+
diff --git a/faq/debugging_inside_glibc.mdwn b/faq/dev/debugging_inside_glibc.mdwn
index 6f2d4ee3..6f2d4ee3 100644
--- a/faq/debugging_inside_glibc.mdwn
+++ b/faq/dev/debugging_inside_glibc.mdwn
diff --git a/faq/debugging_translators.mdwn b/faq/dev/debugging_translators.mdwn
index 7a90a7e0..7a90a7e0 100644
--- a/faq/debugging_translators.mdwn
+++ b/faq/dev/debugging_translators.mdwn
diff --git a/faq/bad_hypermeta_data.mdwn b/faq/issues/bad_hypermeta_data.mdwn
index bc960e30..bc960e30 100644
--- a/faq/bad_hypermeta_data.mdwn
+++ b/faq/issues/bad_hypermeta_data.mdwn
diff --git a/faq/eata.mdwn b/faq/issues/eata.mdwn
index 411a1b16..411a1b16 100644
--- a/faq/eata.mdwn
+++ b/faq/issues/eata.mdwn
diff --git a/faq/native-install_doesnt_finish.mdwn b/faq/issues/native-install_doesnt_finish.mdwn
index a852e1dd..a852e1dd 100644
--- a/faq/native-install_doesnt_finish.mdwn
+++ b/faq/issues/native-install_doesnt_finish.mdwn
diff --git a/faq/old-stuff.mdwn b/faq/old/old-stuff.mdwn
index f5be2814..f5be2814 100644
--- a/faq/old-stuff.mdwn
+++ b/faq/old/old-stuff.mdwn
diff --git a/faq/old_faq.txt b/faq/old/old_faq.txt
index 24127462..24127462 100644
--- a/faq/old_faq.txt
+++ b/faq/old/old_faq.txt
diff --git a/faq/old_hurd_faq.txt b/faq/old/old_hurd_faq.txt
index 4ebe019b..4ebe019b 100644
--- a/faq/old_hurd_faq.txt
+++ b/faq/old/old_hurd_faq.txt
diff --git a/faq/df.mdwn b/faq/running/df.mdwn
index 51de2b6c..51de2b6c 100644
--- a/faq/df.mdwn
+++ b/faq/running/df.mdwn
diff --git a/faq/hurd_console.mdwn b/faq/running/hurd_console.mdwn
index cb2de2c0..cb2de2c0 100644
--- a/faq/hurd_console.mdwn
+++ b/faq/running/hurd_console.mdwn
diff --git a/faq/kernel_logs.mdwn b/faq/running/kernel_logs.mdwn
index 0c9e05a0..0c9e05a0 100644
--- a/faq/kernel_logs.mdwn
+++ b/faq/running/kernel_logs.mdwn
diff --git a/faq/off.mdwn b/faq/running/off.mdwn
index 48e6bcc7..48e6bcc7 100644
--- a/faq/off.mdwn
+++ b/faq/running/off.mdwn
diff --git a/faq/ps_hangs.mdwn b/faq/running/ps_hangs.mdwn
index b58a3308..b58a3308 100644
--- a/faq/ps_hangs.mdwn
+++ b/faq/running/ps_hangs.mdwn
diff --git a/faq/slash_usr_symlink.mdwn b/faq/running/slash_usr_symlink.mdwn
index 5c47f4e1..5c47f4e1 100644
--- a/faq/slash_usr_symlink.mdwn
+++ b/faq/running/slash_usr_symlink.mdwn
diff --git a/faq/slash_usr_symlink/discussion.mdwn b/faq/running/slash_usr_symlink/discussion.mdwn
index 219e14e4..219e14e4 100644
--- a/faq/slash_usr_symlink/discussion.mdwn
+++ b/faq/running/slash_usr_symlink/discussion.mdwn
diff --git a/faq/xserver-common.mdwn b/faq/running/xserver-common.mdwn
index 460c6e55..460c6e55 100644
--- a/faq/xserver-common.mdwn
+++ b/faq/running/xserver-common.mdwn
diff --git a/faq/2_gib_partition_limit.mdwn b/faq/support/2_gib_partition_limit.mdwn
index 726605f9..726605f9 100644
--- a/faq/2_gib_partition_limit.mdwn
+++ b/faq/support/2_gib_partition_limit.mdwn
diff --git a/faq/64bit.mdwn b/faq/support/64bit.mdwn
index 5b899b55..5b899b55 100644
--- a/faq/64bit.mdwn
+++ b/faq/support/64bit.mdwn
diff --git a/faq/binary_compatibility.mdwn b/faq/support/binary_compatibility.mdwn
index e9dfcdb8..e9dfcdb8 100644
--- a/faq/binary_compatibility.mdwn
+++ b/faq/support/binary_compatibility.mdwn
diff --git a/faq/fuse_support.mdwn b/faq/support/fuse_support.mdwn
index 8867d954..8867d954 100644
--- a/faq/fuse_support.mdwn
+++ b/faq/support/fuse_support.mdwn
diff --git a/faq/how_about_drivers.mdwn b/faq/support/how_about_drivers.mdwn
index 974fb612..974fb612 100644
--- a/faq/how_about_drivers.mdwn
+++ b/faq/support/how_about_drivers.mdwn
diff --git a/faq/network_transparency.mdwn b/faq/support/network_transparency.mdwn
index aefaf500..aefaf500 100644
--- a/faq/network_transparency.mdwn
+++ b/faq/support/network_transparency.mdwn
diff --git a/faq/posix_compatibility.mdwn b/faq/support/posix_compatibility.mdwn
index 4490b7cb..4490b7cb 100644
--- a/faq/posix_compatibility.mdwn
+++ b/faq/support/posix_compatibility.mdwn
diff --git a/faq/posix_compatibility/discussion.mdwn b/faq/support/posix_compatibility/discussion.mdwn
index 0d722c9e..0d722c9e 100644
--- a/faq/posix_compatibility/discussion.mdwn
+++ b/faq/support/posix_compatibility/discussion.mdwn
diff --git a/faq/ram_limit.mdwn b/faq/support/ram_limit.mdwn
index 4043203e..4043203e 100644
--- a/faq/ram_limit.mdwn
+++ b/faq/support/ram_limit.mdwn
diff --git a/faq/sata_disk_drives.mdwn b/faq/support/sata_disk_drives.mdwn
index 2edaa610..2edaa610 100644
--- a/faq/sata_disk_drives.mdwn
+++ b/faq/support/sata_disk_drives.mdwn
diff --git a/faq/sharing_the_user_space.mdwn b/faq/support/sharing_the_user_space.mdwn
index 8702470a..8702470a 100644
--- a/faq/sharing_the_user_space.mdwn
+++ b/faq/support/sharing_the_user_space.mdwn
diff --git a/faq/smp.mdwn b/faq/support/smp.mdwn
index e95edcd2..e95edcd2 100644
--- a/faq/smp.mdwn
+++ b/faq/support/smp.mdwn
diff --git a/faq/system_port.mdwn b/faq/support/system_port.mdwn
index c831c36f..c831c36f 100644
--- a/faq/system_port.mdwn
+++ b/faq/support/system_port.mdwn