Merge branch 'deimos1986/master'

pointcom · Aug 8, 2008 · 5116d26 · 5116d26
2 parents 878f73e + 83c7915
commit 5116d26
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/book/source/Chapters/3_Getting_Started/1_Installing.markdown b/book/source/Chapters/3_Getting_Started/1_Installing.markdown
@@ -18,19 +18,30 @@ Before we get started I'm going to assume you have the following installed:
 ### The Easy Way
 
 If you're on a *nix operating system then keeping up to date with all the edge 
-versions of these gems can be made really easy by using the [Edgy sake tasks](http://edgy.4ninjas.org).
+versions of these gems can be made really easy by using the Sake tasks.
 
-Run the following to install `RSpec`, `merb-core`, `merb-more`, `dm-core`, 
-`dm-more`, `data_objects`:
+Merb sake tasks can be found in merb-more repository under tools directory.
+Sake tasks for DataMapper are in dm-dev repository at
+http://github.com/dkubb/dm-dev/.
 
-		sudo gem install sake
-		sake -i 'http://edgy.4ninjas.org/edgy.sake'
-		sake edgy:install packages="merb-stack"
-		
+To install Sake tasks run sake -i PATH where PATH is path to Sake tasks file
+on your local machine. For example,
 
-And then to keep up to date you just need to execute:
+	 	sake -i ~/dev/opensource/merb/merb-more/tools/merb-dev.rake
 
-		sake edgy:update
+To do a fresh clone of all repositories use sake dm:clone and	merb:clone,
+respectively. And then to keep up to date you just need to execute:
+
+		sake dm:update
+
+and
+
+		sake merb:update
+
+to update Merb and DataMapper gems.
+
+But what you really want is probably to wipe out Merb and DM gems before update,
+do the update and install new updated gems. Use sake merb:gems:refresh and dm:gems:refresh to do so.
 
 ### If You're Hardcore
 
@@ -66,16 +77,19 @@ Start by installing the `gem` dependancies:
 
 Then download the `merb` source:
 
+		git clone git://github.com/sam/extlib.git
     git clone git://github.com/wycats/merb-core.git
     git clone git://github.com/wycats/merb-plugins.git
     git clone git://github.com/wycats/merb-more.git
 
 Then install the gems via rake:
 
+		cd extlib ; rake install ; cd ..
    	cd merb-core ; rake install ; cd ..    
     cd merb-more ; rake install ; cd ..
     cd merb-plugins; rake install ; cd ..
 
+Note that Merb and DataMappers share Extlib library since after 0.9.3 release of DM.
 The `json_pure` gem is needed for merb to install on [JRuby](http://jruby.codehaus.org/) (Java implementation of a Ruby Interpreter), otherwise use the `json` gem as it's faster.
 
 Merb is ORM agnostic, but as the title of this book suggests we'll be using