Integrate the Microkernel FAQ into the general FAQ.

6 files changed, 16 insertions, 45 deletions

diff --git a/faq.mdwn b/faq.mdwn
index 605b6422..46636796 100644
--- a/faq.mdwn
+++ b/faq.mdwn
@@ -21,11 +21,6 @@ rootpage="faq" postformtext="Add a new item titled:"]]
 This page [[with all items inlined|faq_inlined]].
 
 
-# Also see the...
-
-  * [[microkernel FAQ|microkernel/faq]]
-
-
 # General-discussion FAQs
 
 [[!map
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_inlined.mdwn b/faq_inlined.mdwn
index 237855e6..2472f2e0 100644
--- a/faq_inlined.mdwn
+++ b/faq_inlined.mdwn
@@ -21,11 +21,6 @@ rootpage="faq" postformtext="Add a new item titled:"]]
 This page [[without all items inlined|faq]].
 
 
-# Also see the...
-
-  * [[microkernel FAQ|microkernel/faq]]
-
-
 # General-discussion FAQs
 
 [[!inline
diff --git a/getting_help.mdwn b/getting_help.mdwn
index 92efabbe..34e54159 100644
--- a/getting_help.mdwn
+++ b/getting_help.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]]."]]"""]]
 
 # Essential Documentation
 
@@ -14,7 +15,7 @@ is included in the section entitled
 
   * Debian GNU/Hurd [[hurd/running/debian/FAQ]]
 
-  * Microkernel [[microkernel/FAQ]]
+  * [[faq/Multiserver_Microkernel]]
 
   * GNU Mach's [[microkernel/mach/gnumach/Hardware_Compatibility_List]]
 
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:"]]