diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-05-02 10:50:59 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-05-02 10:50:59 +0200 |
| commit | fc333951a76c5cc8ec4611b2b14562fde4c65219 (patch) | |
| tree | 81ed68cc5096ba93ad11dd2013f8386bd713082b /microkernel | |
| parent | 0198b3664ef958c44eccaf9cb6f847c2984e3d79 (diff) | |
| parent | 92d73f6d792bf0b3d32008e5e89c5d2402c72b53 (diff) | |
Merge remote branch 'kepler.SCHWINGE/foss_factory'
Conflicts:
sidebar.mdwn
Diffstat (limited to 'microkernel')
| -rw-r--r-- | microkernel/mach/gnumach.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/microkernel/mach/gnumach.mdwn b/microkernel/mach/gnumach.mdwn index b385ca09..d9ff6535 100644 --- a/microkernel/mach/gnumach.mdwn +++ b/microkernel/mach/gnumach.mdwn @@ -9,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]]."]]"""]] -GNU Mach is the microkernel that the [[GNU_Hurd|hurd]] system is based on. +GNU Mach is the microkernel that the GNU/Hurd system is based on. It is maintained by the Hurd developers for the GNU project and remains compatible with [[Mach]] 3.0. |