diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-03-19 18:47:23 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-03-19 18:47:23 +0100 |
| commit | d166bfaaa3ddf8b83b5cc6bde62f8872e6a80c82 (patch) | |
| tree | 4d8a8904c2c49122c37895ed4573a5fcbd19ed4f /faq/which_microkernel.mdwn | |
| parent | 64f867bbc45d265009a1bad590bc1d4d9ea91d6e (diff) | |
| parent | ce8c2531cdb7ee05784437da4c38459e5d3897d6 (diff) | |
Merge remote-tracking branch 'savannah/master'
As part of the merge, fix some typos, add copyright and licensing headers, and
a few more minor changes.
Diffstat (limited to 'faq/which_microkernel.mdwn')
| -rw-r--r-- | faq/which_microkernel.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/faq/which_microkernel.mdwn b/faq/which_microkernel.mdwn index 84b661e4..4c3f0a42 100644 --- a/faq/which_microkernel.mdwn +++ b/faq/which_microkernel.mdwn @@ -1,4 +1,5 @@ -[[!meta copyright="Copyright © 2009, 2011 Free Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2009, 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,7 +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]]."]]"""]] -[[!meta title="What happened with the Hurd ports to the L4 / Coyotos / Viengoos +[[!meta title="What happened with the Hurd ports to the OSKit Mach / L4 / Coyotos / Viengoos microkernels?"]] <!-- This page shares some text with history/port_to_another_microkernel. --> |