30 files changed, 16 insertions, 68 deletions
diff --git a/faq.mdwn b/faq.mdwn
index 9167ede6..9146f384 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -14,15 +14,24 @@ Also see the...
 
   * [[microkernel FAQ|microkernel/faq]],
 
-  * [[GNU Hurd FAQ|hurd/faq]],
-
-  * [[running GNU Hurd FAQ|hurd/running/faq]],
-
-  * [[Debian GNU/Hurd FAQ|hurd/running/debian/faq]].
-
 [[!inline
-pages="faq/* and !*/discussion"
+pages=none
 show=0
 feeds=no
 actions=yes
 rootpage="faq" postformtext="Add a new item titled:"]]
+
+
+# FAQs
+
+[[!map
+pages="faq/* and !*/discussion and !*/debian"
+show=title]]
+
+
+# Debian GNU/Hurd FAQs
+
+[[!map
+pages="faq/debian/* and !*/discussion"
+show=title]]
+
diff --git a/hurd/running/debian/faq/2_gib_partition_limit.mdwn b/faq/2_gib_partition_limit.mdwn
index 195191cb..195191cb 100644
--- a/hurd/running/debian/faq/2_gib_partition_limit.mdwn
+++ b/faq/2_gib_partition_limit.mdwn
diff --git a/hurd/running/debian/faq/bad_hypermeta_data.mdwn b/faq/bad_hypermeta_data.mdwn
index bc960e30..bc960e30 100644
--- a/hurd/running/debian/faq/bad_hypermeta_data.mdwn
+++ b/faq/bad_hypermeta_data.mdwn
diff --git a/hurd/running/debian/faq/apt_umount.mdwn b/faq/debian/apt_umount.mdwn
index db0dbfd1..db0dbfd1 100644
--- a/hurd/running/debian/faq/apt_umount.mdwn
+++ b/faq/debian/apt_umount.mdwn
diff --git a/hurd/running/debian/faq/other_repositories.mdwn b/faq/debian/other_repositories.mdwn
index 88781d46..88781d46 100644
--- a/hurd/running/debian/faq/other_repositories.mdwn
+++ b/faq/debian/other_repositories.mdwn
diff --git a/hurd/running/debian/faq/debugging_inside_glibc.mdwn b/faq/debugging_inside_glibc.mdwn
index 91b71d64..91b71d64 100644
--- a/hurd/running/debian/faq/debugging_inside_glibc.mdwn
+++ b/faq/debugging_inside_glibc.mdwn
diff --git a/hurd/running/debian/faq/debugging_translators.mdwn b/faq/debugging_translators.mdwn
index b55484e1..b55484e1 100644
--- a/hurd/running/debian/faq/debugging_translators.mdwn
+++ b/faq/debugging_translators.mdwn
diff --git a/hurd/running/debian/faq/df.mdwn b/faq/df.mdwn
index bbd3a7b9..bbd3a7b9 100644
--- a/hurd/running/debian/faq/df.mdwn
+++ b/faq/df.mdwn
diff --git a/hurd/running/debian/faq/eata.mdwn b/faq/eata.mdwn
index fa7dbdec..fa7dbdec 100644
--- a/hurd/running/debian/faq/eata.mdwn
+++ b/faq/eata.mdwn
diff --git a/hurd/faq/how_about_drivers.mdwn b/faq/how_about_drivers.mdwn
index 0e1887ba..0e1887ba 100644
--- a/hurd/faq/how_about_drivers.mdwn
+++ b/faq/how_about_drivers.mdwn
diff --git a/hurd/faq/how_to_switch_microkernels.mdwn b/faq/how_to_switch_microkernels.mdwn
index 21f7a371..21f7a371 100644
--- a/hurd/faq/how_to_switch_microkernels.mdwn
+++ b/faq/how_to_switch_microkernels.mdwn
diff --git a/hurd/running/debian/faq/hurd_console.mdwn b/faq/hurd_console.mdwn
index 5cccc83c..5cccc83c 100644
--- a/hurd/running/debian/faq/hurd_console.mdwn
+++ b/faq/hurd_console.mdwn
diff --git a/hurd/running/debian/faq/kernel_logs.mdwn b/faq/kernel_logs.mdwn
index d539bf1b..d539bf1b 100644
--- a/hurd/running/debian/faq/kernel_logs.mdwn
+++ b/faq/kernel_logs.mdwn
diff --git a/hurd/running/faq/native-install_doesnt_finish.mdwn b/faq/native-install_doesnt_finish.mdwn
index a852e1dd..a852e1dd 100644
--- a/hurd/running/faq/native-install_doesnt_finish.mdwn
+++ b/faq/native-install_doesnt_finish.mdwn
diff --git a/hurd/faq/off.mdwn b/faq/off.mdwn
index 8c90d53e..8c90d53e 100644
--- a/hurd/faq/off.mdwn
+++ b/faq/off.mdwn
diff --git a/hurd/faq/old-stuff.mdwn b/faq/old-stuff.mdwn
index f5be2814..f5be2814 100644
--- a/hurd/faq/old-stuff.mdwn
+++ b/faq/old-stuff.mdwn
diff --git a/hurd/faq/old_faq.txt b/faq/old_faq.txt
index 24127462..24127462 100644
--- a/hurd/faq/old_faq.txt
+++ b/faq/old_faq.txt
diff --git a/hurd/faq/old_hurd_faq.txt b/faq/old_hurd_faq.txt
index 4ebe019b..4ebe019b 100644
--- a/hurd/faq/old_hurd_faq.txt
+++ b/faq/old_hurd_faq.txt
diff --git a/hurd/running/debian/faq/ps_hangs.mdwn b/faq/ps_hangs.mdwn
index b58a3308..b58a3308 100644
--- a/hurd/running/debian/faq/ps_hangs.mdwn
+++ b/faq/ps_hangs.mdwn
diff --git a/hurd/running/debian/faq/ram_limit.mdwn b/faq/ram_limit.mdwn
index 447ff20c..447ff20c 100644
--- a/hurd/running/debian/faq/ram_limit.mdwn
+++ b/faq/ram_limit.mdwn
diff --git a/hurd/faq/release.mdwn b/faq/release.mdwn
index d80c6825..d80c6825 100644
--- a/hurd/faq/release.mdwn
+++ b/faq/release.mdwn
diff --git a/hurd/running/debian/faq/reporting_bugs.mdwn b/faq/reporting_bugs.mdwn
index 40781ab0..40781ab0 100644
--- a/hurd/running/debian/faq/reporting_bugs.mdwn
+++ b/faq/reporting_bugs.mdwn
diff --git a/hurd/running/debian/faq/sata_disk_drives.mdwn b/faq/sata_disk_drives.mdwn
index dad10cb9..dad10cb9 100644
--- a/hurd/running/debian/faq/sata_disk_drives.mdwn
+++ b/faq/sata_disk_drives.mdwn
diff --git a/hurd/faq/slash_usr_symlink.mdwn b/faq/slash_usr_symlink.mdwn
index 5c47f4e1..5c47f4e1 100644
--- a/hurd/faq/slash_usr_symlink.mdwn
+++ b/faq/slash_usr_symlink.mdwn
diff --git a/hurd/faq/slash_usr_symlink/discussion.mdwn b/faq/slash_usr_symlink/discussion.mdwn
index 219e14e4..219e14e4 100644
--- a/hurd/faq/slash_usr_symlink/discussion.mdwn
+++ b/faq/slash_usr_symlink/discussion.mdwn
diff --git a/hurd/faq/still_useful.mdwn b/faq/still_useful.mdwn
index bffeaebd..bffeaebd 100644
--- a/hurd/faq/still_useful.mdwn
+++ b/faq/still_useful.mdwn
diff --git a/hurd/running/debian/faq/xserver-common.mdwn b/faq/xserver-common.mdwn
index 3420154c..3420154c 100644
--- a/hurd/running/debian/faq/xserver-common.mdwn
+++ b/faq/xserver-common.mdwn
diff --git a/hurd/faq.mdwn b/hurd/faq.mdwn
deleted file mode 100644
index 413aaf3f..00000000
--- a/hurd/faq.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta copyright="Copyright © 2008, 2010 Free Software Foundation, Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU Free Documentation License|/fdl]]."]]"""]]
-
-[[!meta title="GNU Hurd FAQ"]]
-
-See also other [[/FAQ]].
-
-[[!inline
-pages="hurd/faq/* and !*/discussion"
-show=0
-feeds=no
-actions=yes
-rootpage="hurd/faq" postformtext="Add a new item titled:"]]
diff --git a/hurd/running/debian/faq.mdwn b/hurd/running/debian/faq.mdwn
deleted file mode 100644
index 8aaadf9c..00000000
--- a/hurd/running/debian/faq.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!meta copyright="Copyright © 2007, 2009, 2010 Free Software Foundation,
-Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU Free Documentation License|/fdl]]."]]"""]]
-
-[[!meta title="Debian GNU/Hurd FAQ"]]
-
-See also [[after_install]] instructions, and other [[/FAQ]].
-
-[[!inline
-pages="hurd/running/debian/faq/* and !*/discussion"
-show=0
-feeds=no
-actions=yes
-rootpage="hurd/running/debian/faq" postformtext="Add a new item titled:"]]
diff --git a/hurd/running/faq.mdwn b/hurd/running/faq.mdwn
deleted file mode 100644
index 2746a20a..00000000
--- a/hurd/running/faq.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|/fdl]]."]]"""]]
-
-[[!meta title="General FAQ About Running GNU/Hurd"]]
-
-See also other [[/FAQ]].
-
-[[!inline
-pages="hurd/running/faq/* and !*/discussion"
-show=0
-feeds=no
-actions=yes
-rootpage="hurd/running/faq" postformtext="Add a new item titled:"]]