testing markup

README.md

@@ -6,22 +6,82 @@ The privacy aware, personally controlled, do-it-all, open source social network.
 These instructions are designed for developers running [Ubuntu](http://www.ubuntu.com/) (Debian) or Mac OS X.
 
 ## Preparing your system
-In order to run Diaspora, you will need to download the following dependencies:
+In order to run Diaspora, you will need to download the following dependencies (specific instructions follow):
 
 - [Ruby](http://www.ruby-lang.org) - The Ruby programming language.  (We're using 1.8.  Comes preinstalled on Mac OS X.)
 - [MongoDB](http://www.mongodb.org) - A snappy noSQL database.
 - [OpenSSL](http://www.openssl.org/) - An encryption implementation.  (Comes preinstalled on Mac OS X and later versions of Ubuntu.)
 - [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos.
 - [Git](http://git-scm.com/) - The fast version controll system.
 
-We suggest using a package management system to download these dependencies.  Trust us, it's going to make your life a lot easier.  If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed).
-
-
 After you have Ruby installed on your system, you will need to get Rubygems, then install Bundler:
 
 - [RubyGems](http://rubygems.org/) - Source for Ruby gems.
 - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects.
 
+**We suggest using a package management system to download these dependencies.  Trust us, it's going to make your life a lot easier.  If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); and if you're using Ubuntu (Debian), just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed).  The below instructions assume you have these installed.**  
+
+### Ruby
+
+To install Ruby 1.8.7 on **Ubuntu**, run the following command:
+
+			sudo apt-get install ruby-full
+
+If you're on **Mac OS X**, you already have Ruby on your system.  Yay!
+
+### MongoDB
+
+To install MongoDB on **Ubuntu**, run the following commands:
+
+		**Download**
+
+		- 32 bit
+			http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz
+
+		- 64 bit
+			http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz
+
+			# extract
+			tar xzf mongodb-linux-i686-1.4.0.tgz
+			# create the required data directory
+			sudo mkdir -p /data/db
+			sudo chmod -Rv 777 /data/
+			
+
+To install MongoDB on **Mac OS X**, run the following:
+
+			brew install mongo
+
+### OpenSSL
+
+If you're running either **Ubuntu** or **Mac OS X** you already have OpenSSL installed!
+
+### ImageMagick
+
+To install ImageMagick on **Ubuntu**, run the following:
+
+To install ImageMagick on **Mac OS X**, run the following:
+
+### Git
+
+To install Git on **Ubuntu**, run the following:
+
+			sudo apt-get install git
+
+To install Git on **Mac OS X**, run the following:
+
+			brew install git
+
+
+### Rubygems
+
+This step is OS-independent.
+
+
+### Bundler
+
+This step is also OS-independent.
+
 
 ## Getting Diaspora
 To download Diaspora, you will want to clone it from the official github repository [here](http://github.com/diaspora/diaspora).  If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup[.](http://www.youtube.com/watch?v=OQSNhk5ICTI)