diff --git a/docs/Makefile b/docs/Makefile index dcbf111c29..517d01658f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -63,7 +63,7 @@ site: connect: @echo connecting dotcloud to www.docker.io website, make sure to use user 1 @cd _build/website/ ; \ - dotcloud connect dockerwebsite ; + dotcloud connect dockerwebsite ; \ dotcloud list push: diff --git a/docs/sources/faq.rst b/docs/sources/faq.rst index 901e51ddbb..dfffa012f4 100644 --- a/docs/sources/faq.rst +++ b/docs/sources/faq.rst @@ -19,7 +19,8 @@ Most frequently asked questions. 3. **Does Docker run on Mac OS X or Windows?** - Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a virtual machine on your box, and get the best of both worlds. Check out the MacOSX_ and Windows_ installation guides. + Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a + virtual machine on your box, and get the best of both worlds. Check out the :ref:`install_using_vagrant` and :ref:`windows` installation guides. 4. **How do containers compare to virtual machines?** @@ -39,10 +40,8 @@ Most frequently asked questions. * `Ask questions on Stackoverflow`_ * `Join the conversation on Twitter`_ - .. _Windows: ../installation/windows/ - .. _MacOSX: ../installation/vagrant/ .. _the repo: http://www.github.com/dotcloud/docker - .. _IRC\: docker on freenode: irc://chat.freenode.net#docker + .. _IRC: docker on freenode: docker on freenode: irc://chat.freenode.net#docker .. _Github: http://www.github.com/dotcloud/docker .. _Ask questions on Stackoverflow: http://stackoverflow.com/search?q=docker .. _Join the conversation on Twitter: http://twitter.com/getdocker diff --git a/docs/sources/installation/windows.rst b/docs/sources/installation/windows.rst index 230ac78051..7830106020 100644 --- a/docs/sources/installation/windows.rst +++ b/docs/sources/installation/windows.rst @@ -2,6 +2,7 @@ :description: Docker's tutorial to run docker on Windows :keywords: Docker, Docker documentation, Windows, requirements, virtualbox, vagrant, git, ssh, putty, cygwin +.. _windows: Using Vagrant (Windows) ======================= diff --git a/docs/website/gettingstarted/index.html b/docs/website/gettingstarted/index.html index 5a8de3232b..a40289144f 100644 --- a/docs/website/gettingstarted/index.html +++ b/docs/website/gettingstarted/index.html @@ -62,7 +62,7 @@
-
+
Docker is still under heavy development. It should not yet be used in production. Check the repo for recent progress.
@@ -133,13 +133,13 @@
-

More resources

- +

Questions? Want to get in touch?

+

There are several ways to get in touch:

+

Join the discussion on IRC. We can be found in the #docker channel on chat.freenode.net

+

Discussions happen on our google group: docker-club at googlegroups.com

+

All our development and decisions are made out in the open on Github github.com/dotcloud/docker

+

Get help on using Docker by asking on Stackoverflow

+

And of course, tweet your tweets to twitter.com/getdocker