X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=README;h=d57aef26d8aa35567e313858ffbb0387adda2173;hb=0f230305d3ce5650a5b405928dcefd87fe96e59d;hp=3f2d3f7b64e62456bb8176024587bc9807b73e30;hpb=e44022ec89d488902c63c46d182c137b8e4ea0cf;p=mono.git

diff --git a/README b/README
index 3f2d3f7b64e..d57aef26d8a 100644
--- a/README
+++ b/README
@@ -11,16 +11,6 @@ This is Mono.
    a. Build Requirements
    ---------------------
 
-	To build Mono, you will need the following components:
-
-		* pkg-config
-
-		  Available from: http://www.freedesktop.org/Software/pkgconfig
-
-		* glib 2.4
-
-		  Available from: http://www.gtk.org/
-
 	On Itanium, you must obtain libunwind:
 
 		http://www.hpl.hp.com/research/linux/libunwind/download.php4
@@ -35,7 +25,15 @@ This is Mono.
 		* libgdiplus
 
 		  If you want to get support for System.Drawing, you will need to get
-		  Libgdiplus.
+		  Libgdiplus.    This library in turn requires glib and pkg-config:
+
+			* pkg-config
+
+		    	  Available from: http://www.freedesktop.org/Software/pkgconfig
+
+		  	* glib 2.4
+
+		    	  Available from: http://www.gtk.org/
 
 		* libzlib
 
@@ -74,15 +72,18 @@ This is Mono.
 		 make V=1
 
 
-
-    c. Building the software from SVN
+    c. Building the software from GIT
     ---------------------------------
 
-	If you are building the software from SVN, make sure that you
+	If you are building the software from GIT, make sure that you
 	have up-to-date mcs and mono sources:
 
-		svn co svn+ssh://USER@mono-cvs.ximian.com/source/trunk/mono
-		svn co svn+ssh://USER@mono-cvs.ximian.com/source/trunk/mcs
+	   If you are an anonymous user:
+		git clone git://github.com/mono/mono.git
+
+           If you are a Mono contributors with read/write privileges:
+	        git clone git@github.com:mono/mono.git
+
 
 	Then, go into the mono directory, and configure:
 
@@ -129,16 +130,16 @@ This is Mono.
 	distribution, which contains just enough to run the 'mcs'
 	compiler.  You do this with:
 
+		# Run the following line after ./autogen.sh
 		make get-monolite-latest
 
 	This will download and automatically gunzip and untar the
 	tarball, and place the files appropriately so that you can then
 	just run:
 
-		make
+		make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe
 
-	To ensure that you're using the 'monolite' distribution, you can
-	also try passing EXTERNAL_MCS=false on the make command-line.
+	And that will use the files downloaded by 'make get-monolite-latest.
 
 	Testing and Installation
 	------------------------
@@ -164,10 +165,13 @@ This is Mono.
 
 		make install
 
+	You can verify your installation by using the mono-test-install
+	script, it can diagnose some common problems with Mono's install.
+
 	Failure to follow these steps may result in a broken installation. 
 
-    d. Common Configuration Options
-    -------------------------------
+    d. Configuration Options
+    ------------------------
 
 	The following are the configuration options that someone
 	building Mono might want to use:
@@ -301,6 +305,21 @@ This is Mono.
 		System.dll, System.Code.dll and System.Xml.Core.dll) and turn
 	  	on the LINQ extensions for the compiler.
 
+	--with-moon-gc=boehm,sgen
+
+		Select the GC to use for Moonlight.
+
+		boehm:
+			Selects the Boehm Garbage Collector, with the same flags
+			as the regular Mono build. This is the default.
+
+		sgen:
+			Selects the new SGen Garbage Collector, which provides
+			Generational GC support, using the same flags as the
+			mono-sgen build.
+
+		This defaults to `boehm'.
+
 	--with-libgdiplus=installed,sibling,<path>
 
 		This is used to configure where should Mono look for
@@ -473,6 +492,15 @@ This is Mono.
 		There are a number of runtime options to control this
 	  	also, see the man page.
 
+	--enable-nacl
+
+		This configures the Mono compiler to generate code
+		suitable to be used by Google's Native Client:
+
+			 http://code.google.com/p/nativeclient/
+
+		Currently this is used with Mono's AOT engine as
+		Native Client does not support JIT engines yet.
 
 2. Using Mono
 =============