summaryrefslogtreecommitdiff
path: root/microkernel
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-27 21:37:59 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-27 21:37:59 +0200
commit3f5b019c3f6e0c6e1683b2374cc86116251ecf2b (patch)
tree318230b32e3aa98afa4a28a0c0855e86a78fc721 /microkernel
parent51c4760238ec774f0eb4facb1eb17c4abd516029 (diff)
parent4f51f8e21f1962a0749ec7081567f4916bab7910 (diff)
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'microkernel')
-rw-r--r--microkernel/coyotos.mdwn7
-rw-r--r--microkernel/l4.mdwn5
2 files changed, 8 insertions, 4 deletions
diff --git a/microkernel/coyotos.mdwn b/microkernel/coyotos.mdwn
index 5ecea688..fec023ba 100644
--- a/microkernel/coyotos.mdwn
+++ b/microkernel/coyotos.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2006, 2007, 2008, 2010 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2010, 2011 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,3 +28,6 @@ design.
The coyotos microkernel specification can be found
[here](http://www.coyotos.org/docs/ukernel/spec.html).
+
+There once was the idea of a GNU/Hurd [[port using the Coyotos
+microkernel|history/port_to_another_microkernel]], but this didn't come live.
diff --git a/microkernel/l4.mdwn b/microkernel/l4.mdwn
index 45929842..7af5e6fc 100644
--- a/microkernel/l4.mdwn
+++ b/microkernel/l4.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2004, 2006, 2007, 2008, 2010 Free Software
+[[!meta copyright="Copyright © 2004, 2006, 2007, 2008, 2010, 2011 Free Software
Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -20,7 +20,8 @@ on formally verifying an L4 microkernel.
* {{$sel4}}
-There was a GNU/Hurd [[history/port_to_L4]], which is now stalled.
+There was a GNU/Hurd [[port to L4|history/port_to_another_microkernel]], which
+is now stalled.
[[!ymlfront data="""