Merge branch 'master' into external_pager_mechanism

Conflicts:
	microkernel/mach/external_pager_mechanism.mdwn

1 files changed, 31 insertions, 16 deletions

diff --git a/microkernel.mdwn b/microkernel.mdwn
index 56268b61..17344689 100644
--- a/microkernel.mdwn
+++ b/microkernel.mdwn
@@ -1,19 +1,15 @@
-[[license text="""
-Copyright © 2007 Free Software Foundation, Inc.
+[[!meta copyright="Copyright © 2007, 2008, 2010 Free Software Foundation,
+Inc."]]
 
-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.txt]].
+[[!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]]."]]"""]]
 
-By contributing to this page, you agree to assign copyright for your
-contribution to the Free Software Foundation.  The Free Software Foundation
-promises to always use either a verbatim copying license or a free
-documentation license when publishing your contribution.  We grant you back all
-your rights under copyright, including the rights to copy, modify, and
-redistribute your contributions.
-"""]]
+A *microkernel* is one kind of a [[kernel]] implementation.
 
 [[Liedtke]] explains in [On Microkernel Construction](http://l4ka.org/publications/paper.php?docid=642)
 that a microkernel attempts to minimize the mandatory part of the operating
@@ -26,8 +22,6 @@ The idea of a microkernel as explained above was first explored
 by Per Brinch-Hansen in 1970 in
 [The Nucleus of a Multiprogramming System](http://brinch-hansen.net/papers/1970a.pdf).
 
-Other notable microkernels include Hydra, KeyKOS, Eros and L4.
-
 An [introduction](http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.html) by 
 Úlfar Erlingsson and Athanasios Kyparlis (from 1996) to microkernel concepts.
 
@@ -36,3 +30,24 @@ An [introduction](http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.ht
 [[Microkernels_for_beginners|for_beginners]].
 
 A 2002 article about [[microkernel_FUD|FUD]] (Fear, Uncertainty, Doubt).
+
+[[FAQ]].
+
+
+# Implementations
+
+  * [[Hydra]]
+
+  * [[KeyKOS]]
+
+  * [[Mach]] -- used by the GNU/Hurd
+
+  * [[EROS]]
+
+  * [[CapROS]]
+
+  * [[Coyotos]]
+
+  * [[L4]]
+
+  * [[Viengoos]]