From 222d659c2f7d163e1a28a8998a6c01e24851ab24 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <joachim@gnufans.org>
Date: Tue, 22 Apr 2003 08:58:44 +0000
Subject: none

---
 Mach/BuildingOskitMach.mdwn | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Mach/BuildingOskitMach.mdwn b/Mach/BuildingOskitMach.mdwn
index ddfb860d..84503843 100644
--- a/Mach/BuildingOskitMach.mdwn
+++ b/Mach/BuildingOskitMach.mdwn
@@ -14,32 +14,39 @@
 
 First you need to checkout the relevant sources. It comes in various flavours and the recommended way is to checkout from CVS.
 
-### <a name="The_OSKit"> </a> The OSKit
+### <a name="The_OSKit_Sources"> </a> The OSKit Sources
+
+**_Note:_** The [Savannah OSKit](http://savannah.gnu.org/projects/oskit/) project is the recommended source today of the OSKit. Its CVS tree holds the official sources and all known patches, plus a few others.
 
-**_Sources:_**
+**_Official Sources:_**
 
 * St. Patricks day 2002 release: <ftp://flux.cs.utah.edu/flux/oskit/oskit-20020317.tar.gz>
 
 * Valentine's day 2001 release: <ftp://flux.cs.utah.edu/flux/oskit/oskit-20010214.tar.gz>
 
-**_Patches:_**
+**_Official Patches:_**
 
 * Useful patches are available [[OskitPatches]] or on the nearest Debian FTP.
 
-**_CVS:_**
+**_Savannah CVS:_**
+
+The recommended document for accessing the Savannah OSKit CVS is <http://savannah.gnu.org/cvs?group=oskit>
 
-If you don't feel like tracking down every unthinkable patch to the St. Patricks release you can also find the unofficial CVS tree at Savannah.
+Briefly, you need to setup a _different CVSROOT_ than the GNUmach and Mig sources below:
 
-* <http://savannah.nongnu.org/projects/oskit/>
+    $ export CVSROOT=":pserver:anoncvs@anoncvs.gnu.org:/cvsroot/oskit"
+    $ cvs login              # Press Enter at the password prompt
+    ...
+    $ cvs -z3 co oskit
 
-### <a name="Accessing_the_GNU_CVS"> </a> Accessing the GNU CVS
+### <a name="GNUmach_amp_Mig_Sources"> </a> GNUmach &amp; Mig Sources
 
 The recommended document for accessing the Hurd CVS on Savannah is at <http://savannah.gnu.org/cvs/?group=hurd>
 
 This is only a brief restatement, which may be inaccurate. Setup your environment with the `CVSROOT` variable and login as anonymous. How you do this may differ between shells.
 
     $ export CVSROOT=":pserver:anoncvs@anoncvs.gnu.org:/cvsroot/hurd"
-    $ cvs login              # Press Enter when asking for password
+    $ cvs login              # Press Enter at the password prompt
 
 **_Gnu Mach:_**
 
@@ -83,7 +90,7 @@ The recommended versions of GCC are
 
 ### <a name="The_OSKit"> </a> The OSKit
 
-Do _not_ forget to apply all known [[OskitPatches]] before starting the build!
+Do _not_ forget to apply all known [[OskitPatches]] before starting the build! This does not apply if you use the OSKit from [Savannah](http://savannah.gnu.org/).
 
 The attached [[ATTACHURLmodulesx86pc]], or [[ATTACHURLmodules-lightx86pc]], is an example setup, your needs may vary but this one works for standard COTS PC's. Now, how to configure and build the OSKit.
 
@@ -171,7 +178,7 @@ _I see, it was not that clear the context of your first comment, well anyhow whe
 
 ----
 
-## <a name="Blame_annotations_"> Blame annotations: </a>
+## <a name="Document_history_"> Document history: </a>
 
  First version. -- [[Main/JoachimNilsson]] - 14 May 2002
 
-- 
cgit v1.2.3