65 files changed, 404 insertions, 211 deletions
diff --git a/colophon.mdwn b/colophon.mdwn
index a9a2952e..2a0dd119 100644
--- a/colophon.mdwn
+++ b/colophon.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2003, 2004, 2007, 2008, 2009 Free Software
+[[!meta copyright="Copyright © 2003, 2004, 2007, 2008, 2009, 2013 Free Software
 Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -6,16 +6,17 @@ 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
-Just like a book, this topic is designed to help describe the tools used to
+Just as in a book, this page is designed to help describe the tools used to
 create this website and what methods were used to give it its look and feel.
 
 
 What we see today is the junction of two different branches: the original
 static HTML pages and the wiki pages.
 
+
 # Static HTML Pages
 
 In November 2008, the Hurd's old static web pages were merged into the wiki
@@ -23,6 +24,7 @@ pages' repository.  After a lot of cleansing work, on 2008-11-22 the joined set
 of pages was made available for serving the official GNU Hurd web appearance at
 <http://www.gnu.org/software/hurd/>.
 
+
 # Wiki Pages
 
 ## Rev. I
@@ -52,6 +54,7 @@ timely fashion anymore.  In July 2006, the [slow burial of the Hurd
 Wiki](http://lists.gnu.org/archive/html/bug-hurd/2006-07/msg00014.html) was
 announced.
 
+
 ## Rev. II
 
 Considering this [from April 2006 on
@@ -60,5 +63,16 @@ already](http://lists.gnu.org/archive/html/web-hurd/2006-04/msg00000.html), on
 [ikiwiki](http://ikiwiki.info) was finally finished.  Read
 [[about_the_twiki_to_ikiwiki_conversion]].
 
-This wiki instance is now running distributed over two GNU/Hurd machines, and
-is also providing the content of the official GNU Hurd pages.
+This wiki instance was running distributed over two GNU/Hurd machines,
+[[flubber|public_hurd_boxen]] (Git repository) and
+[[snubber|public_hurd_boxen]] (web server), both hosted by Barry deFreese.
+
+The wiki's content also provides that of the official GNU Hurd pages,
+<http://www.gnu.org/software/hurd/>.
+
+
+## Rev. III
+
+As of early 2013, both flubber and snubber's duties are [[!message-id
+"87vc9417dc.fsf@kepler.schwinge.homeip.net" desc="taken over"]] by Richard
+Braun's [[darnassus|public_hurd_boxen]].
diff --git a/faq.mdwn b/faq.mdwn
index 678ce428..46636796 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -18,58 +18,74 @@ feeds=no
 actions=yes
 rootpage="faq" postformtext="Add a new item titled:"]]
 
-# Also see the...
-
-  * [[microkernel FAQ|microkernel/faq]],
-  * [[this FAQ in just one web page|faq_all]].
+This page [[with all items inlined|faq_inlined]].
 
 
 # General-discussion FAQs
 
 [[!map
-pages="faq/* and !*/discussion and !*/debian/* and !*/running/* and !*/support/* and !*/issues/* and !*/dev/* and !*/old/*"
+pages="tagged(faq/general) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/general) and !tagged(faq/_important)"
 show=title]]
 
 
 # Hardware/Software support FAQs
 
 [[!map
-pages="faq/support/* and !*/discussion"
+pages="tagged(faq/support) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/support) and !tagged(faq/_important)"
 show=title]]
 
 
 # Running GNU/Hurd FAQs
 
 [[!map
-pages="faq/running/* and !*/discussion"
+pages="tagged(faq/running) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/running) and !tagged(faq/_important)"
 show=title]]
 
 
 # Debian GNU/Hurd FAQs
 
 [[!map
-pages="faq/debian/* and !*/discussion"
+pages="tagged(faq/debian) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/debian) and !tagged(faq/_important)"
 show=title]]
 
 
-# Issues FAQs
+# Open Issues FAQs
 
 [[!map
-pages="faq/issues/* and !*/discussion"
+pages="tagged(faq/open_issues) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/open_issues) and !tagged(faq/_important)"
 show=title]]
 
 
 # Development FAQs
 
 [[!map
-pages="faq/dev/* and !*/discussion"
+pages="tagged(faq/development) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/development) and !tagged(faq/_important)"
 show=title]]
 
 
 # Old FAQs
 
 [[!map
-pages="faq/old/* and !*/discussion"
+pages="tagged(faq/old) and tagged(faq/_important)"
+show=title]]
+[[!map
+pages="tagged(faq/old) and !tagged(faq/_important)"
 show=title]]
-
-
diff --git a/faq/support/2_gib_partition_limit.mdwn b/faq/2_gib_partition_limit.mdwn
index 3d502a17..3fd43793 100644
--- a/faq/support/2_gib_partition_limit.mdwn
+++ b/faq/2_gib_partition_limit.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Is there still a 2 GiB Partition Limit?"]]
 
 The 2 GiB limit has been removed in Debian GNU/Hurd.
diff --git a/faq/support/64-bit.mdwn b/faq/64-bit.mdwn
index ab95d9d0..b88c4b20 100644
--- a/faq/support/64-bit.mdwn
+++ b/faq/64-bit.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Is there a 64-bit version?"]]
 
 There are currently no plan for 64-bit userland, but there are plans for 64-bit
diff --git a/faq/debian/apt_umount.mdwn b/faq/apt_umount.mdwn
index db0dbfd1..c8dc3eb4 100644
--- a/faq/debian/apt_umount.mdwn
+++ b/faq/apt_umount.mdwn
@@ -1,12 +1,15 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/debian]]
 
 [[!meta title="apt: unmount cdroms"]]
 
diff --git a/faq/asking.mdwn b/faq/asking.mdwn
deleted file mode 100644
index 73348ce2..00000000
--- a/faq/asking.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!meta copyright="Copyright © 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010,
-2013 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="Why can't I get the answers I need from Hurd hackers?"]]
-
-This [document](http://www.catb.org/~esr/faqs/smart-questions.html) may help you
-understand some developers attitudes and social norms.
-
diff --git a/asking_questions.mdwn b/faq/asking_questions.mdwn
index 2d43cbbe..912c78dc 100644
--- a/asking_questions.mdwn
+++ b/faq/asking_questions.mdwn
@@ -1,12 +1,17 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010,
+2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/general]]
+
+[[!meta title="Why can't I get the answers I need from Hurd hackers?"]]
 
 Before asking a question, first make an effort to find the answer to your
 question.  A lot of questions have been asked and answered before, so please
@@ -19,5 +24,5 @@ e.g., "I am having trouble frobbing the foo.  I searched the web and only found
 information regarding how to frob a bar, but that seems unrelated."  Provide as
 many relevant details as possible reproducing them as exactly as possible.
 
-Also consider these
-[guidelines](http://catb.org/~esr/faqs/smart-questions.html).
+This [document](http://www.catb.org/~esr/faqs/smart-questions.html) may help you
+understand some developers attitudes and social norms.
diff --git a/faq/issues/bad_hypermeta_data.mdwn b/faq/bad_hypermeta_data.mdwn
index bc960e30..6121e599 100644
--- a/faq/issues/bad_hypermeta_data.mdwn
+++ b/faq/bad_hypermeta_data.mdwn
@@ -1,12 +1,15 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/open_issues]]
 
 If you get the error `bad hypermeta data` when trying to mount an ext3
 partition from GNU/Linux, that is usually because the file system has not been
diff --git a/faq/support/binary_compatibility.mdwn b/faq/binary_compatibility.mdwn
index e9dfcdb8..37050763 100644
--- a/faq/support/binary_compatibility.mdwn
+++ b/faq/binary_compatibility.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2012 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2012, 2013 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
@@ -8,9 +8,12 @@ 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]]."]]"""]]
 
-[[!tag open_issue_documentation]]
+[[!tag faq/support]]
+
 
-IRC, freenode, #hurd, 2012-01-13:
+# IRC, freenode, #hurd, 2012-01-13
+
+[[!tag open_issue_documentation]]
 
     <veganman> sothere's absolutelyno way,evenslowly to run i386 linuxcode
       under hurd/i386? Ihave a small app, commercial, which I have to get
diff --git a/faq/dev/debugging_inside_glibc.mdwn b/faq/debugging_inside_glibc.mdwn
index 63a77a04..2a75a1a7 100644
--- a/faq/dev/debugging_inside_glibc.mdwn
+++ b/faq/debugging_inside_glibc.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/development]]
+
 In Debian, to get [[debugging]] information for glibc, you need to install the
 `libc0.3-dbg` package.  At the place [[debugging/GDB]] looks for debugging
 symbols by default (`/usr/lib/debug/lib/`), Debian's `libc0.3-dbg` stores only
diff --git a/faq/dev/debugging_translators.mdwn b/faq/debugging_translators.mdwn
index a054f2e0..195b2276 100644
--- a/faq/dev/debugging_translators.mdwn
+++ b/faq/debugging_translators.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/development]]
+
 In order to [[debug|debugging]] translators and being able to step into glibc
 during it, on Debian you need the `hurd-dbg` and `libc0.3-dbg` packages installed.
 If you need to debug the initialization of the translator, start the translator
diff --git a/faq/running/df.mdwn b/faq/df.mdwn
index 9987a373..8af6009a 100644
--- a/faq/running/df.mdwn
+++ b/faq/df.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="Why df doesn't work?"]]
 
 There is no `/etc/mtab` (due to dynamic translator startup, its content is hard
diff --git a/faq/support/0-drivers.mdwn b/faq/drivers.mdwn
index 54b2d744..197d47b7 100644
--- a/faq/support/0-drivers.mdwn
+++ b/faq/drivers.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support faq/_important]]
+
 [[!meta title="What drivers does GNU/Hurd have?"]]
 
 Currently, for disks Mach integrates drivers from Linux 2.0 through some
diff --git a/faq/issues/eata.mdwn b/faq/eata.mdwn
index b9b0565a..1221c27a 100644
--- a/faq/issues/eata.mdwn
+++ b/faq/eata.mdwn
@@ -5,8 +5,10 @@ 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/open_issues]]
 
 [[!meta title="Boot seems to get stuck at EATA probing"]]
 
diff --git a/faq/issues/fd.mdwn b/faq/fd.mdwn
index 514ab378..e0fefc66 100644
--- a/faq/issues/fd.mdwn
+++ b/faq/fd.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/open_issues]]
+
 [[!meta title="I'm getting I/O eror, dev 02:00, sector 0"]]
 
 dev 02:00 is the floppy drive. This message simply means that reading the floppy
diff --git a/faq/support/fuse_support.mdwn b/faq/fuse_support.mdwn
index 33e877ce..48ca30a4 100644
--- a/faq/support/fuse_support.mdwn
+++ b/faq/fuse_support.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Does Hurd support FUSE?"]]
 
 There is a start of work on implementing a [[FUSE|hurd/libfuse]] library on Hurd; its support is not updated to the latest version, but at least some fuse filesystems do work already.
diff --git a/faq/ghamp.mdwn b/faq/ghamp.mdwn
index 65b2097f..088ae69e 100644
--- a/faq/ghamp.mdwn
+++ b/faq/ghamp.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="What is GHAMP?"]]
 
 *GHAMP* is the GNU/Hurd-based Apache, MySQL, PHP solution stack -- analoguous
diff --git a/faq/gnu.mdwn b/faq/gnu.mdwn
index 6632d888..b0426391 100644
--- a/faq/gnu.mdwn
+++ b/faq/gnu.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="You say GNU, don't you mean GNU/Hurd?"]]
 
 Yes and no. GNU refers to the system as a whole, while GNU/Hurd is more
diff --git a/faq/issues/got_a_db_prompt.mdwn b/faq/got_a_db_prompt.mdwn
index ad99c515..d9f41b35 100644
--- a/faq/issues/got_a_db_prompt.mdwn
+++ b/faq/got_a_db_prompt.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/open_issues]]
+
 [[!meta title="Help, I've just gotten a db> prompt"]]
 
 If you see a `db>` prompt on the console, something unexpected and bad happened
diff --git a/faq/help.mdwn b/faq/help.mdwn
index 9525be12..15145afa 100644
--- a/faq/help.mdwn
+++ b/faq/help.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="How can I help?"]]
 
 Please see the [[contributing page|contributing]].
diff --git a/faq/0-how_many_developers.mdwn b/faq/how_many_developers.mdwn
index a96e0576..2a3894bd 100644
--- a/faq/0-how_many_developers.mdwn
+++ b/faq/how_many_developers.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2010, 2011, 2013 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
@@ -8,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general faq/_important]]
+
 [[!meta title="How many developers are working on the GNU Hurd, and why so
 few?"]]
 
diff --git a/faq/0-how_many_developers/discussion.mdwn b/faq/how_many_developers/discussion.mdwn
index 8e4c487a..8e4c487a 100644
--- a/faq/0-how_many_developers/discussion.mdwn
+++ b/faq/how_many_developers/discussion.mdwn
diff --git a/faq/how_to_switch_microkernels.mdwn b/faq/how_to_switch_microkernels.mdwn
index 21f7a371..a0e57174 100644
--- a/faq/how_to_switch_microkernels.mdwn
+++ b/faq/how_to_switch_microkernels.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2010, 2013 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
@@ -8,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="How difficult would it be to switch to another microkernel?"]]
 
 One would have to reimplement the `mach/` and `sysdeps/mach/` parts of
diff --git a/faq/running/hurd_console.mdwn b/faq/hurd_console.mdwn
index f55e30d2..a1e4f718 100644
--- a/faq/running/hurd_console.mdwn
+++ b/faq/hurd_console.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="How about the virtual console?"]]
 
 Edit `/etc/default/hurd-console` to configure the Hurd console.
diff --git a/faq/running/kernel_logs.mdwn b/faq/kernel_logs.mdwn
index 0c9e05a0..c00c1c89 100644
--- a/faq/running/kernel_logs.mdwn
+++ b/faq/kernel_logs.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="dmesg, kernel logs"]]
 
 There is no `dmesg` command, since the kernel does not keep a buffer of its
diff --git a/microkernel/faq/multiserver_microkernel.mdwn b/faq/multiserver_microkernel.mdwn
index ca9b2179..b4edd9af 100644
--- a/microkernel/faq/multiserver_microkernel.mdwn
+++ b/faq/multiserver_microkernel.mdwn
@@ -1,13 +1,15 @@
-[[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free
-Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2013
+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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/general]]
 
 [[!meta title="What is a Multiserver Microkernel?"]]
 
@@ -22,5 +24,4 @@ use, but now, because the server runs in user space as the user that started
 it, they may, for instance, mount an FTP filesystem in their home directory.
 
 For more information about the design of the Hurd, read the paper by Thomas
-Bushnell, BSG:
-[[Towards_a_New_Strategy_of_OS_Design|hurd-paper]].
+Bushnell, BSG: [[Towards a New Strategy of OS Design|hurd-paper]].
diff --git a/faq/issues/native-install_doesnt_finish.mdwn b/faq/native-install_doesnt_finish.mdwn
index a852e1dd..e9bca908 100644
--- a/faq/issues/native-install_doesnt_finish.mdwn
+++ b/faq/native-install_doesnt_finish.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2013 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
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/open_issues]]
+
 Copying baseGNU to the virtual disk works. Even booting got through but when I
 try to run native-install it never gets to the very end. First time it froze on
 *sed* package, the other time on *sysv-rc*.
diff --git a/faq/support/network_transparency.mdwn b/faq/network_transparency.mdwn
index aefaf500..906bfae5 100644
--- a/faq/support/network_transparency.mdwn
+++ b/faq/network_transparency.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2012 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2012, 2013 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
@@ -8,9 +8,12 @@ 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]]."]]"""]]
 
-[[!tag open_issue_documentation]]
+[[!tag faq/support]]
+
 
-IRC, freenode, #hurd, 2012-01-21:
+# IRC, freenode, #hurd, 2012-01-21
+
+[[!tag open_issue_documentation]]
 
     <chromaticwt> is it possible to transfer servers running on one microkernel
       on one machine, to another microkernel running on a different machine?
diff --git a/faq/running/off.mdwn b/faq/off.mdwn
index eb2a6d1c..a0b5e439 100644
--- a/faq/running/off.mdwn
+++ b/faq/off.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="shutdown does not work, how am I supposed to shut my Hurd system down?"]]
 
 The GNU/Hurd does not use SYSV runlevels, so commands like
diff --git a/faq/old/old_faq.txt b/faq/old_faq.txt
index caadb54a..98c605eb 100644
--- a/faq/old/old_faq.txt
+++ b/faq/old_faq.txt
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/old]]
+
             Frequently Asked Questions about the GNU Hurd
 
 This document attempts to answer the questions that most often plague
diff --git a/faq/old/old_hurd_faq.txt b/faq/old_hurd_faq.txt
index 70c93c61..50ea9331 100644
--- a/faq/old/old_hurd_faq.txt
+++ b/faq/old_hurd_faq.txt
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/old]]
+
 The Unofficial (and no longer maintained) GNU&nbsp;Hurd FAQ, Version 0.13
 
 Contributions by:
diff --git a/faq/debian/other_repositories.mdwn b/faq/other_repositories.mdwn
index 88781d46..f8ece75f 100644
--- a/faq/debian/other_repositories.mdwn
+++ b/faq/other_repositories.mdwn
@@ -1,12 +1,15 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/debian]]
 
 If you want to use the `apt-get source` facility, make sure that
 `/etc/apt/sources.list` contains a line like
diff --git a/faq/support/posix_compatibility.mdwn b/faq/posix_compatibility.mdwn
index 4490b7cb..2212a7d4 100644
--- a/faq/support/posix_compatibility.mdwn
+++ b/faq/posix_compatibility.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2010, 2011, 2013 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
@@ -8,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="POSIX compatibility"]]
 
 Is it favorable of rather a hindrance to be compatible to POSIX and similar
diff --git a/faq/support/posix_compatibility/discussion.mdwn b/faq/posix_compatibility/discussion.mdwn
index 0d722c9e..0d722c9e 100644
--- a/faq/support/posix_compatibility/discussion.mdwn
+++ b/faq/posix_compatibility/discussion.mdwn
diff --git a/faq/running/ps_hangs.mdwn b/faq/ps_hangs.mdwn
index b58a3308..a1a43ed1 100644
--- a/faq/running/ps_hangs.mdwn
+++ b/faq/ps_hangs.mdwn
@@ -9,5 +9,7 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 If `ps` hangs, try `ps -M` which should still work by not getting detailed
 information from processes.
diff --git a/faq/support/ram_limit.mdwn b/faq/ram_limit.mdwn
index 0fa27c2e..5017925c 100644
--- a/faq/support/ram_limit.mdwn
+++ b/faq/ram_limit.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="830 MiB RAM Limit"]]
 
 Just like any 32-bit OS without bad tricks, GNU Mach can not cope well with lots
diff --git a/faq/0-release.mdwn b/faq/release.mdwn
index 2da7deaa..e782a9fb 100644
--- a/faq/0-release.mdwn
+++ b/faq/release.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general faq/_important]]
+
 [[!meta title="When will the Hurd be released?"]]
 
 Next year.
diff --git a/faq/reporting_bugs.mdwn b/faq/reporting_bugs.mdwn
index 40781ab0..25be02ef 100644
--- a/faq/reporting_bugs.mdwn
+++ b/faq/reporting_bugs.mdwn
@@ -1,12 +1,15 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!tag faq/general]]
 
 Please try to reproduce bugs which are not obviously Hurd-specific on Debian
 GNU/Linux and then file them there.
diff --git a/faq/support/sata_disk_drives.mdwn b/faq/sata_disk_drives.mdwn
index 69470f10..70560f12 100644
--- a/faq/support/sata_disk_drives.mdwn
+++ b/faq/sata_disk_drives.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Are SATA disk drives supported?"]]
 
 GNU Mach does not support SATA disk drives (`/dev/sda` etc. in GNU/Linux)
diff --git a/faq/sauce.mdwn b/faq/sauce.mdwn
index 2306aece..691acf12 100644
--- a/faq/sauce.mdwn
+++ b/faq/sauce.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="Where's the sauce?"]]
 
 It's on [Savannah](http://savannah.gnu.org). See also the [GNU Development Resources](http://www.gnu.org/software/devel.html), for more information.
diff --git a/faq/running/serial_console.mdwn b/faq/serial_console.mdwn
index 44453ac5..4abadda9 100644
--- a/faq/running/serial_console.mdwn
+++ b/faq/serial_console.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="How do I initialize a serial console on the Hurd?"]]
 
   * You can try out the Serial Howto at <http://www.nongnu.org/thug/serial-howto.txt>
diff --git a/faq/support/sharing_the_user_space.mdwn b/faq/sharing_the_user_space.mdwn
index 2c31c22b..0d9dd587 100644
--- a/faq/support/sharing_the_user_space.mdwn
+++ b/faq/sharing_the_user_space.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Sharing the userspace between GNU Hurd and the Linux kernel"]]
 
 Given that both Linux and GNU Hurd are using the [[ELF]] binary
diff --git a/faq/running/slash_usr_symlink.mdwn b/faq/slash_usr_symlink.mdwn
index e7d7776a..0c586d4d 100644
--- a/faq/running/slash_usr_symlink.mdwn
+++ b/faq/slash_usr_symlink.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="Why is `/usr' a symbolic link to `.'?"]]
 
 The distinction between `/` and `/usr` has historical reasons.  Back when [[Unix]]
diff --git a/faq/running/slash_usr_symlink/discussion.mdwn b/faq/slash_usr_symlink/discussion.mdwn
index 219e14e4..219e14e4 100644
--- a/faq/running/slash_usr_symlink/discussion.mdwn
+++ b/faq/slash_usr_symlink/discussion.mdwn
diff --git a/faq/slow.mdwn b/faq/slow.mdwn
index cb6c4655..be01e882 100644
--- a/faq/slow.mdwn
+++ b/faq/slow.mdwn
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="Is the Hurd slow?"]]
 
 The Hurd is currently slower than Linux, yes. But not very much, so it is
diff --git a/faq/support/smp.mdwn b/faq/smp.mdwn
index 304f65e1..c0133b80 100644
--- a/faq/support/smp.mdwn
+++ b/faq/smp.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Does GNU/Hurd support SMP/Multicore?"]]
 
 The Hurd servers themselves are multithreaded, so they should be able to take benefit of the parallelism brought by SMP/Multicore boxes. This has however never been tested yet because of the following.
diff --git a/faq/support/0-software.mdwn b/faq/software.mdwn
index e58e0bd8..4ab7bbfc 100644
--- a/faq/support/0-software.mdwn
+++ b/faq/software.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support faq/_important]]
+
 [[!meta title="What software is available for GNU?"]]
 
 As of March 2013, 78% of all [Debian](http://www.debian.org/)
diff --git a/faq/0-still_useful.mdwn b/faq/still_useful.mdwn
index 85e3ec43..60149a2b 100644
--- a/faq/0-still_useful.mdwn
+++ b/faq/still_useful.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general faq/_important]]
+
 [[!meta title="What are the advantages with the Hurd over Linux/BSD?"]]
 
 The Hurd will be considerably more flexible and robust
diff --git a/faq/support/system_port.mdwn b/faq/system_port.mdwn
index c831c36f..fc710a3e 100644
--- a/faq/support/system_port.mdwn
+++ b/faq/system_port.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2011, 2013 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
@@ -8,6 +8,8 @@ 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]]."]]"""]]
 
+[[!tag faq/support]]
+
 [[!meta title="Doing a GNU/Hurd System Port"]]
 
 How difficult is it to port the GNU/Hurd system to run on another architecture?
diff --git a/faq/0-translator.mdwn b/faq/translator.mdwn
index d30b60e9..04aa9b8e 100644
--- a/faq/0-translator.mdwn
+++ b/faq/translator.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general faq/_important]]
+
 [[!meta title="What is a translator?"]]
 
 A [good explanation](http://www.debian.org/ports/hurd/hurd-doc-translator) is available, translated (sic) in several languages.
diff --git a/faq/which_microkernel.mdwn b/faq/which_microkernel.mdwn
index 4c3f0a42..5432dd92 100644
--- a/faq/which_microkernel.mdwn
+++ b/faq/which_microkernel.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/general]]
+
 [[!meta title="What happened with the Hurd ports to the OSKit Mach / L4 / Coyotos / Viengoos
 microkernels?"]]
 
diff --git a/faq/running/xserver-common.mdwn b/faq/xserver-common.mdwn
index 68058641..777ba025 100644
--- a/faq/running/xserver-common.mdwn
+++ b/faq/xserver-common.mdwn
@@ -9,6 +9,8 @@ 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]]."]]"""]]
 
+[[!tag faq/running]]
+
 [[!meta title="Normal users can't start X"]]
 
 This happens because currently there is no way to detect console users.
diff --git a/faq_all.mdwn b/faq_all.mdwn
deleted file mode 100644
index d8d99bb7..00000000
--- a/faq_all.mdwn
+++ /dev/null
@@ -1,82 +0,0 @@
-[[!meta copyright="Copyright © 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="FAQ"]]
-[[!tag stable_URL]]
-
-[[!inline
-pages=none
-show=0
-feeds=no
-actions=yes
-rootpage="faq" postformtext="Add a new item titled:"]]
-
-# Also see the...
-
-  * [[microkernel FAQ|microkernel/faq]],
-
-
-# General-discussion FAQs
-
-[[!inline
-pages="faq/* and !*/discussion and !*/debian/* and !*/running/* and !*/support/* and !*/issues/* and !*/dev/* and !*/old/*"
-show=0
-feeds=no
-]]
-
-
-# Hardware/Software support FAQs
-
-[[!inline
-pages="faq/support/* and !*/discussion"
-show=0
-feeds=no]]
-
-
-# Running GNU/Hurd FAQs
-
-[[!inline
-pages="faq/running/* and !*/discussion"
-show=0
-feeds=no]]
-
-
-# Debian GNU/Hurd FAQs
-
-[[!inline
-pages="faq/debian/* and !*/discussion"
-show=0
-feeds=no]]
-
-
-# Issues FAQs
-
-[[!inline
-pages="faq/issues/* and !*/discussion"
-show=0
-feeds=no]]
-
-
-# Development FAQs
-
-[[!inline
-pages="faq/dev/* and !*/discussion"
-show=0
-feeds=no]]
-
-
-# Old FAQs
-
-[[!inline
-pages="faq/old/* and !*/discussion"
-show=0
-feeds=no]]
-
-
diff --git a/faq_inlined.mdwn b/faq_inlined.mdwn
new file mode 100644
index 00000000..2472f2e0
--- /dev/null
+++ b/faq_inlined.mdwn
@@ -0,0 +1,107 @@
+[[!meta copyright="Copyright © 2010, 2013 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="FAQ"]]
+[[!tag stable_URL]]
+
+[[!inline
+pages=none
+show=0
+feeds=no
+actions=yes
+rootpage="faq" postformtext="Add a new item titled:"]]
+
+This page [[without all items inlined|faq]].
+
+
+# General-discussion FAQs
+
+[[!inline
+pages="tagged(faq/general) and tagged(faq/_important)"
+show=0
+feeds=no
+]]
+[[!inline
+pages="tagged(faq/general) and !tagged(faq/_important)"
+show=0
+feeds=no
+]]
+
+
+# Hardware/Software support FAQs
+
+[[!inline
+pages="tagged(faq/support) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/support) and !tagged(faq/_important)"
+show=0
+feeds=no]]
+
+
+# Running GNU/Hurd FAQs
+
+[[!inline
+pages="tagged(faq/running) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/running) and !tagged(faq/_important)"
+show=0
+feeds=no]]
+
+
+# Debian GNU/Hurd FAQs
+
+[[!inline
+pages="tagged(faq/debian) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/debian) and !tagged(faq/_important)"
+show=0
+feeds=no]]
+
+
+# Open Issues FAQs
+
+[[!inline
+pages="tagged(faq/open_issues) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/open_issues) and !tagged(faq/_important)"
+show=0
+feeds=no]]
+
+
+# Development FAQs
+
+[[!inline
+pages="tagged(faq/development) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/development) and !tagged(faq/_important)"
+show=0
+feeds=no]]
+
+
+# Old FAQs
+
+[[!inline
+pages="tagged(faq/old) and tagged(faq/_important)"
+show=0
+feeds=no]]
+[[!inline
+pages="tagged(faq/old) and !tagged(faq/_important)"
+show=0
+feeds=no]]
diff --git a/getting_help.mdwn b/getting_help.mdwn
index 92efabbe..034a3c6b 100644
--- a/getting_help.mdwn
+++ b/getting_help.mdwn
@@ -1,20 +1,20 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
-# Essential Documentation
 
-  * GNU/Hurd [[hurd/FAQ]]
+# Essential Documentation
 
-  * Debian GNU/Hurd [[hurd/running/debian/FAQ]]
+  * [[Frequently Asked Questions|faq]]
 
-  * Microkernel [[microkernel/FAQ]]
+      * [[faq/Multiserver_Microkernel]]
 
   * GNU Mach's [[microkernel/mach/gnumach/Hardware_Compatibility_List]]
 
@@ -23,7 +23,7 @@ is included in the section entitled
 
 # Forums
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
   * [[Mailing_lists]]
   * [[IRC]]
diff --git a/hurd/running/qemu/networking.mdwn b/hurd/running/qemu/networking.mdwn
index 2bc9b16d..d20b84b1 100644
--- a/hurd/running/qemu/networking.mdwn
+++ b/hurd/running/qemu/networking.mdwn
@@ -1,12 +1,13 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2013 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
 ## User mode network
 
@@ -39,5 +40,4 @@ host os and use this.  (I was not able to use it without proxy)
 You might be able to do it using iptables, some clues
 <http://sujith-h.livejournal.com/9520.html>
 
-Use scp,ftp... to transfer files (also see
-[[hurd/running/debian/faq#index2h1]]), read about [[sharing_files]].
+Use scp,ftp... to transfer files, read about [[sharing_files]].
diff --git a/irc.mdwn b/irc.mdwn
index ebf63b97..b90aa680 100644
--- a/irc.mdwn
+++ b/irc.mdwn
@@ -1,5 +1,5 @@
 [[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
-2010, 2011, 2012 Free Software Foundation, Inc."]]
+2010, 2011, 2012, 2013 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
@@ -20,7 +20,7 @@ Please try to stay on topic.  We're not interested in Emacs vs. vi discussions,
 we don't want to hear why you think that the GNU project sucks, or what your
 favorite GNU/Linux distribution is.
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
 Sometimes providing a log or some other excerpt of text can
 help solve a problem or answer a question.  Do not paste
diff --git a/mailing_lists.mdwn b/mailing_lists.mdwn
index 33f131d5..0f90d200 100644
--- a/mailing_lists.mdwn
+++ b/mailing_lists.mdwn
@@ -1,5 +1,5 @@
 [[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2011, 2012 Free Software Foundation, Inc."]]
+2011, 2012, 2013 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
@@ -12,7 +12,7 @@ License|/fdl]]."]]"""]]
 
 # On Posting
 
-[[!inline pages=asking_questions raw=yes feeds=no]]
+[[!inline pages=faq/asking_questions raw=yes feeds=no]]
 
 List etiquette is to cc the sender and anyone **actively** involved in the
 discussion. Some people don't like this and they set their reply-to header
diff --git a/microkernel.mdwn b/microkernel.mdwn
index 754c7aee..5cad12ee 100644
--- a/microkernel.mdwn
+++ b/microkernel.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2008, 2010, 2012 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2010, 2012, 2013 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
@@ -27,12 +27,12 @@ An [introduction](http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.ht
 
 [[Research]].
 
+[[faq/Multiserver_Microkernel]].
+
 [[Microkernels_for_beginners|for_beginners]].
 
 A 2002 article about [[microkernel_FUD|FUD]] (Fear, Uncertainty, Doubt).
 
-[[FAQ]].
-
 
 # Implementations
 
diff --git a/microkernel/faq.mdwn b/microkernel/faq.mdwn
deleted file mode 100644
index fe259f05..00000000
--- a/microkernel/faq.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!meta copyright="Copyright © 2008, 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="Microkernel FAQ"]]
-
-See also other [[/FAQ]].
-
-[[!inline
-pages="microkernel/faq/* and !*/discussion"
-show=0
-feeds=no
-actions=yes
-rootpage="microkernel/faq" postformtext="Add a new item titled:"]]
diff --git a/microkernel/mach/gnumach/building.mdwn b/microkernel/mach/gnumach/building.mdwn
index 427fb083..0f328bb7 100644
--- a/microkernel/mach/gnumach/building.mdwn
+++ b/microkernel/mach/gnumach/building.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2006, 2007, 2008, 2011 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2011, 2013 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
@@ -28,8 +28,6 @@ You can either use the git repository (see <http://git.savannah.gnu.org/cgit/hur
 
     $ apt-get source gnumach
 
-Please see the Debian [[running/debian/FAQ]] before using `apt-get source`.
-
 ## On Debian Systems:
 
 ### Preparing for the Build
diff --git a/microkernel/mach/mig/gnu_mig/building.mdwn b/microkernel/mach/mig/gnu_mig/building.mdwn
index e7d3c150..be79b02d 100644
--- a/microkernel/mach/mig/gnu_mig/building.mdwn
+++ b/microkernel/mach/mig/gnu_mig/building.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2006, 2007, 2008, 2011 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2011, 2013 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
@@ -26,8 +26,6 @@ RCS](http://git.savannah.gnu.org/cgit/hurd/):
 
     $ apt-get source mig
 
-Please see the Debian [[hurd/running/debian/FAQ]] before using _apt-get source_.
-
 The unpacked source tree is around 1 MiB, and the build tree also is around 1 MiB.
 
 ## <a name="_on_Debian_systems"> On Debian Systems: </a>
diff --git a/public_hurd_boxen/installation.mdwn b/public_hurd_boxen/installation.mdwn
index 4f612a83..04ab5cd8 100644
--- a/public_hurd_boxen/installation.mdwn
+++ b/public_hurd_boxen/installation.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2010, 2013 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
@@ -8,10 +9,12 @@ 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]]."]]"""]]
 
-This page documents how installation of a new machine is being done on
-[[zenhost]].
+This page documents how installation of some new machines is being done.
 
-This method uses
+
+# [[zenhost]]
+
+For those on [[zenhost]], we use
 *[install_crosshurd](http://git.savannah.gnu.org/cgit/hurd/incubator.git/log/?h=install_crosshurd)*.
 
 Another option might be switching to <http://www.informatik.uni-koeln.de/fai/>
@@ -126,3 +129,6 @@ Steps for *install_crosshurd*:
 
       * [[flubber]]
       * [[snubber]]
+
+
+# [[darnassus]]
diff --git a/public_hurd_boxen/installation/darnassus.mdwn b/public_hurd_boxen/installation/darnassus.mdwn
index 156e40c2..3beb2c87 100644
--- a/public_hurd_boxen/installation/darnassus.mdwn
+++ b/public_hurd_boxen/installation/darnassus.mdwn
@@ -8,6 +8,76 @@ 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]]."]]"""]]
 
+/!\ Incomplete, but hopefully helpful for future reference.
+
+
+# Packages
+
+  * apache2-mpm-worker
+
+  * ikiwiki libcgi-session-perl libtext-csv-perl libcgi-formbuilder-perl
+    libauthen-passphrase-perl libnet-openid-consumer-perl
+    liblwpx-paranoidagent-perl libterm-readline-gnu-perl libgravatar-url-perl
+    librpc-xml-perl libtext-wikiformat-perl libhighlight-perl perlmagick
+    graphviz texinfo
+
+      * libemail-send-perl (for my *sendmail vs. ikiwiki* patch)
+
+      * libsearch-xapian-perl xapian-omega (for ikiwiki's search plugin)
+
+      * libyaml-perl libyaml-syck-perl (for ikiwiki's YAML field plugins)
+
+  * gitweb
+
+        sudo ln -s ~hurd-web/hurd-web.git /var/cache/git/
+
+  * git-daemon-sysvinit
+
+    Enable as per `/usr/share/doc/git-daemon-sysvinit/README.Debian`.  Also set
+    `GIT_DAEMON_OPTIONS=--user-path`, and `GIT_DAEMON_DIRECTORY='/var/cache/git
+    /home'`.  TODO: does not work if `ok_paths` is set, which it is by default.
+
+
+# `~hurd-web/`
+
+    $ mkdir hurd-web.git && GIT_DIR=hurd-web.git git init
+
+
+# `~tschwinge/`
+
+/!\ TODO.
+
+    $ mkdir tmp/backup && chmod 0733 tmp/backup
+
+
+# `/var/www/robots.txt`
+
+/!\ TODO.
+
+This file used to contain:
+
+    User-agent: *
+    Disallow: /gitweb/
+    Disallow: /cgi-bin/
+
+... which I've now changed to:
+
+    User-agent: *
+    Disallow: /
+
+The goal is that robots rather index the official pages,
+<http://www.gnu.org/software/hurd/>, instead of the staging area on
+<http://darnassus.sceen.net/~hurd-web/>.
+
+
+# Restore Backup
+
+/!\ TODO.
+
+## `/etc/apache2/mods-enabled/`
+
+`rewrite.load`, `userdir.conf`, `userdir.load`
+
 
 # IRC, freenode, #hurd, 2013-02-09
 
@@ -167,4 +237,6 @@ License|/fdl]]."]]"""]]
     <braunr> history for example
     <braunr> just fyi, we can look at this tomorrow
     <tschwinge> braunr: Yes, that'S what I need gitweb for.
-    <tschwinge> braunr: gitweb installed, hurd-web URLs fixed (s%bddebian%darnassus), also some more ikiwiki-related Perl pacakges installed (openID login, for example).
+    <tschwinge> braunr: gitweb installed, hurd-web URLs fixed
+      (s%bddebian%darnassus), also some more ikiwiki-related Perl pacakges
+      installed (openID login, for example).
diff --git a/unsorted/GrantBowHurdPage.mdwn b/unsorted/GrantBowHurdPage.mdwn
index 89af3ada..1de346e7 100644
--- a/unsorted/GrantBowHurdPage.mdwn
+++ b/unsorted/GrantBowHurdPage.mdwn
@@ -19,8 +19,6 @@ If anyone knows more about these items, please add your comments below with your
 
 PLEASE read these once. They are worth the effort.
 
-* [How To Ask Questions The Smart Way](http://www.tuxedo.org/~esr/faqs/smart-questions.html)
-
 * [How To Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) \*<http://khazad.dyndns.org/gnunet/>
 
 \*[Lincoln Portrait](http://www.people.virginia.edu/~skd9r/409/portrait.html) transcript - amazingly applicable to open source ideals.