diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-13 21:52:01 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-03-13 21:52:01 +0100 |
| commit | 632c7ccda148b31171304f7bb5a8ed042ad89b26 (patch) | |
| tree | 4810a818b30d9ccd83cc877f8755549a29441b9c | |
| parent | 8f1c7d7153fc62c7a5cb73cc1ef01f9827262c98 (diff) | |
| parent | b81ce6fb8313e811a00e9ef37c1f58c2c6192047 (diff) | |
Merge branch 'master' of braunbox:~hurd-web/hurd-web
| -rw-r--r-- | microkernel/mach.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/microkernel/mach.mdwn b/microkernel/mach.mdwn index 536cbf35..df1a3dab 100644 --- a/microkernel/mach.mdwn +++ b/microkernel/mach.mdwn @@ -10,7 +10,7 @@ License|/fdl]]."]]"""]] [[!meta title="Mach"]] -Mach is a so-called first generation [[microkernel]]. Originally developed by Carnegie Mellon University (MCU) from 1985 to 1994, which was then forked and carried from 1996 onward by GNU. It is the +Mach is a so-called first generation [[microkernel]]. Originally developed by Carnegie Mellon University (CMU) from 1985 to 1994, which was then forked and carried from 1996 onward by GNU. It is the microkernel currently used by the [[Hurd]]. * [[Concepts]] |