Merge pull request #181 from dhrp/master

These are the necessary changes to tell github to not use jekyill and listen to http://docker.io

docs/Makefile

@@ -49,6 +49,8 @@ docs:
 	cp sources/index.html $(BUILDDIR)/html/
 	cp sources/gettingstarted.html $(BUILDDIR)/html/
 	cp sources/dotcloud.yml $(BUILDDIR)/html/
+	cp sources/CNAME $(BUILDDIR)/html/
+	cp sources/.nojekyll $(BUILDDIR)/html/
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 

docs/sources/CNAME

@@ -0,0 +1 @@
+docker.io

docs/sources/documentation/installation/macos.rst

@@ -2,7 +2,7 @@
 Mac OS X and other linux
 ========================
 
-  Please note the only 'official' installation is using the :ref:`ubuntu_linux` installation path. This version
+  Please note this is a community contributed installation path. The only 'official' installation is using the :ref:`ubuntu_linux` installation path. This version
   may be out of date because it depends on some binaries to be updated and published
 
 

docs/sources/documentation/installation/windows.rst

@@ -6,7 +6,7 @@
 Windows
 =========
 
-  Please note the only 'official' installation is using the :ref:`ubuntu_linux` installation path. This version
+  Please note this is a community contributed installation path. The only 'official' installation is using the :ref:`ubuntu_linux` installation path. This version
   may be out of date because it depends on some binaries to be updated and published