From 38f29f7d0c9cbdb4c458834d403fc128dcce3117 Mon Sep 17 00:00:00 2001
From: Thatcher Peskens <thatcher@dotcloud.com>
Date: Mon, 3 Jun 2013 11:45:19 -0700
Subject: [PATCH] Changed some text on the website to include docker-club Fixed
 a link in the FAQ on the docs Fixed a detail in the Makefile for pushing the
 site to dotcloud

---
 docs/Makefile                          |  2 +-
 docs/sources/faq.rst                   |  7 +++----
 docs/sources/installation/windows.rst  |  1 +
 docs/website/gettingstarted/index.html | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

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 @@
 </div>
 
 <div class="container">
-    <div class="alert alert-info">
+    <div class="alert alert-info" style="margin-bottom: 0;">
         <strong>Docker is still under heavy development.</strong> It should not yet be used in production. Check <a href="http://github.com/dotcloud/docker">the repo</a> for recent progress.
     </div>
     <div class="row">
@@ -133,13 +133,13 @@
             </section>
 
             <section class="contentblock">
-                <h2>More resources</h2>
-                <ul>
-                    <li><a href="irc://chat.freenode.net#docker">IRC: docker on freenode</a></li>
-                    <li><a href="http://www.github.com/dotcloud/docker">Github</a></li>
-                    <li><a href="http://stackoverflow.com/tags/docker/">Ask questions on Stackoverflow</a></li>
-                    <li><a href="http://twitter.com/getdocker/">Join the conversation on Twitter</a></li>
-                </ul>
+                <h2>Questions? Want to get in touch?</h2>
+                <p>There are several ways to get in touch:</p>
+                <p><strong>Join the discussion on IRC.</strong> We can be found in the <a href="irc://chat.freenode.net#docker">#docker</a> channel on chat.freenode.net</p>
+                <p><strong>Discussions</strong> happen on our google group: <a href="https://groups.google.com/d/forum/docker-club">docker-club at googlegroups.com</a></p>
+                <p>All our <strong>development and decisions</strong> are made out in the open on Github <a href="http://www.github.com/dotcloud/docker">github.com/dotcloud/docker</a></p>
+                <p><strong>Get help on using Docker</strong> by asking on <a href="http://stackoverflow.com/tags/docker/">Stackoverflow</a></p>
+                <p>And of course, <strong>tweet</strong> your tweets to <a href="http://twitter.com/getdocker/">twitter.com/getdocker</a></p>
             </section>