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
This commit is contained in:
Daniel Mizyrycki 2013-03-26 13:20:51 -07:00
commit 262be79041
5 changed files with 5 additions and 2 deletions

View File

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

0
docs/sources/.nojekyll Normal file
View File

1
docs/sources/CNAME Normal file
View File

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

View File

@ -2,7 +2,7 @@
Mac OS X and other linux 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 may be out of date because it depends on some binaries to be updated and published

View File

@ -6,7 +6,7 @@
Windows 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 may be out of date because it depends on some binaries to be updated and published