2 files changed, 53 insertions, 32 deletions
diff --git a/distsrc/README b/distsrc/README
index 745608d..9b092a3 100644
--- a/distsrc/README
+++ b/distsrc/README
@@ -1,34 +1,52 @@
-
-MongoDB
-=======
-
+MongoDB README
+
 Welcome to MongoDB!
 
-Package Contents
-----------------
+COMPONENTS
+
+  bin/mongod - The database process.
+  bin/mongos - Sharding controller.
+  bin/mongo  - The database shell (uses interactive javascript).
 
-  bin/mongod            - MongoDB server
-  bin/mongo             - MongoDB client
+UTILITIES
 
   bin/mongodump         - MongoDB dump tool - for backups, snapshots, etc..
   bin/mongorestore      - MongoDB restore a dump
-  bin/mongoexport       - Export a single collection to test (json,csv)
-  bin/mongoimportjson   - Import a json file into a collection
-
-  bin/mongofiles        - Utility for putting and getting files from MongoDB gridfs
-  
-
-Useful Resources
-----------------
-
- MongoDB Website
-
- * http://www.mongodb.org/
-
-Documentation
-
- * http://www.mongodb.org/display/DOCS/Documentation
-
- MongoDB Maillists & IRC
-
- * http://www.mongodb.org/display/DOCS/Community
+  bin/mongoexport       - Export a single collection to test (JSON, CSV)
+  bin/mongoimport       - Import from JSON or CSV
+  bin/mongofiles        - Utility for putting and getting files from MongoDB GridFS
+  bin/mongostat         - Show performance statistics
+
+RUNNING
+
+  For command line options invoke:
+
+    $ ./mongod --help
+
+  To run a single server database:
+
+    $ mkdir /data/db
+    $ ./mongod
+    $
+    $ # The mongo javascript shell connects to localhost and test database by default:
+    $ ./mongo 
+    > help
+
+DRIVERS
+
+  Client drivers for most programming languages are available at mongodb.org.  Use the 
+  shell ("mongo") for administrative tasks.
+
+DOCUMENTATION
+
+  http://www.mongodb.org/
+
+MAIL LISTS AND IRC
+
+  http://www.mongodb.org/display/DOCS/Community
+
+32 BIT BUILD NOTES
+
+  MongoDB uses memory mapped files.  If built as a 32 bit executable, you will
+  not be able to work with large (multi-gigabyte) databases.  However, 32 bit
+  builds work fine with small development databases.
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
index a97699e..54fc943 100644..100755
--- a/distsrc/client/SConstruct
+++ b/distsrc/client/SConstruct
@@ -1,3 +1,4 @@
+# scons file for MongoDB c++ client library and examples
 
 import os
 
@@ -18,7 +19,7 @@ AddOption( "--prefix",
            help="installation root" )
 
 
-env = Environment()
+env = Environment( MSVS_ARCH=None )
 
 def addExtraLibs( s ):
     for x in s.split(","):
@@ -40,7 +41,7 @@ linux = False
 if "darwin" == os.sys.platform:
     addExtraLibs( "/opt/local/" )
     nix = True
-elif "linux2" == os.sys.platform:
+elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
     nix = True
     linux = True
 
@@ -50,7 +51,7 @@ if nix:
 if linux:
     env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
 
-boostLibs = [ "thread" , "filesystem" , "system" ]
+boostLibs = [ "thread" , "filesystem" , "system", "thread" ]
 conf = Configure(env)
 for lib in boostLibs:
     if not conf.CheckLib("boost_%s-mt" % lib):
@@ -60,7 +61,7 @@ dirs = [ "" , "bson/" , "bson/util/" ,
          "client/"  , "s/" , "shell/" , 
          "db/" , 
          "scripting/" , 
-         "util/" , "util/concurrency/" , "util/mongoutils/" ]
+         "util/" , "util/concurrency/" , "util/mongoutils/" , "util/net/" ]
 
 allClientFiles = []
 for x in dirs:
@@ -93,6 +94,7 @@ clientEnv.Prepend( LIBS=["libmongoclient.a"])
 clientEnv.Prepend( LIBPATH=["."] )
 
 # examples
+
 clientTests += [ clientEnv.Program( "firstExample" , [ "client/examples/first.cpp" ] ) ]
 clientTests += [ clientEnv.Program( "secondExample" , [ "client/examples/second.cpp" ] ) ]
 clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExample.cpp" ] ) ]
@@ -100,3 +102,4 @@ clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp
 clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ]
 clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ]
 clientEnv.Alias("clientTests", clientTests, [])
+