Imported Upstream version 1.6.0

4 files changed, 76 insertions, 34 deletions

diff --git a/docs/building.debian.etch.ec2.md b/docs/building.debian.etch.ec2.md
index 4a96a79..b817560 100644
--- a/docs/building.debian.etch.ec2.md
+++ b/docs/building.debian.etch.ec2.md
@@ -1,4 +1,7 @@
 
+Building on debian etch on ec2
+================
+
 ami-f2f6159b
 
   apt-get update
diff --git a/docs/building.md b/docs/building.md
index 3f18557..3b3094d 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -2,64 +2,77 @@
 Building MongoDB
 ================
 
-Scons
-----------------
-
-  For detail information about building, please see:    
-  http://www.mongodb.org/display/DOCS/Building
+SCONS
+---------------
+        
+For detail information about building, please see [the wiki](http://www.mongodb.org/display/DOCS/Building).
 
-  If you want to build everything (mongod, mongo, tools, etc):
+If you want to build everything (mongod, mongo, tools, etc):
 
-     $ scons .
+    $ scons .
 
-  If you only want to build the database:
+If you only want to build the database:
 
-     $ scons
+    $ scons
+  
+To install
 
-  To install
+    $ scons --prefix=/opt/mongo install
 
-     $ scons --prefix=/opt/mongo install
+Please note that prebuilt binaries are available on [mongodb.org](http://www.mongodb.org/downloads) and may be the easiest way to get started.
 
-  Please note that prebuilt binaries are available on mongodb.org and may be the easier way to get started.
+SCONS TARGETS
+--------------
 
-scons targets
--------------
-* mongod
-* mongos
-* mongo
-* mongoclient
+  * mongod
+  * mongos
+  * mongo
+  * mongoclient
+  * all
 
-*general notes
----------------
-  COMPILER VERSIONS
+COMPILER VERSIONS
+--------------
 
-  Mongo has been tested with GCC 4.x and Visual Studio 2008.  Older versions
+  Mongo has been tested with GCC 4.x and Visual Studio 2008 and 2010.  Older versions
   of GCC may not be happy.
 
-windows
----------------
+WINDOWS
+--------------
 
-  See also http://www.mongodb.org/display/DOCS/Building+for+Windows
+  See http://www.mongodb.org/display/DOCS/Building+for+Windows
 
   Build requirements:
     - vc++ express or visual studio
     - python 2.5 (for scons - 2.6 might be needed for some regression tests)
     - scons
     - boost 1.35 (or higher)
-    - windows sdk - tested with v6.0 v6.0a
 
   Or download a prebuilt binary for Windows at www.mongodb.org.
 
-ubuntu
+UBUNTU
+--------------
+
+     scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev
+
+
+OS X
+--------------
+
+Try homebrew -- brew install mongodb.
+
+
+FREEBSD
 --------------
 
-  scons libboost-dev libpcre++-dev xulrunner-1.9.1-dev
+Install the following ports:
 
-FreeBSD
+  * devel/boost
+  * devel/libexecinfo
+  * devel/pcre
+  * lang/spidermonkey
 
-  Install the following ports:
 
-    - devel/boost
-    - devel/libexecinfo
-    - devel/pcre
-    - lang/spidermonkey
+Special Build Notes
+--------------
+  * [debian etch on ec2](building.debian.etch.ec2.html)
+  * [open solaris on ec2](building.opensolaris.ec2.html)
diff --git a/docs/building.opensolaris.ec2.md b/docs/building.opensolaris.ec2.md
new file mode 100644
index 0000000..2b5fd41
--- /dev/null
+++ b/docs/building.opensolaris.ec2.md
@@ -0,0 +1,17 @@
+
+Building on open solaris on ec2
+================
+
+ami-4133d528
+
+
+pkg install SUNWgcc
+pkg install SUNWgit
+pkg install SUNWpython-setuptools
+
+easy_install-2.4 scons
+
+
+git clone git://github.com/mongodb/mongo.git
+cd mongo
+scons 
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..9f6c5ea
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,9 @@
+
+MongoDB Server Documentation
+============
+
+This is just some internal documentation.
+
+For the full MongoDB docs, please see [mongodb.org](http://www.mongodb.org/)
+
+* [building](building.html)