diff --git a/docs/sources/documentation/commandline/basecommands.rst b/docs/sources/documentation/commandline/basecommands.rst
index 7aa8973657..c764af6bb8 100644
--- a/docs/sources/documentation/commandline/basecommands.rst
+++ b/docs/sources/documentation/commandline/basecommands.rst
@@ -61,3 +61,7 @@ Expose a service on a TCP port
# Verify that the network connection worked
echo "Daemon received: $(docker logs $JOB)"
+
+Continue to the complete `Command Line Interface`_
+
+.. _Command Line Interface: ../commandline/cli.html
diff --git a/docs/sources/documentation/examples/python_web_app.rst b/docs/sources/documentation/examples/python_web_app.rst
index 9d988b5160..5fac374889 100644
--- a/docs/sources/documentation/examples/python_web_app.rst
+++ b/docs/sources/documentation/examples/python_web_app.rst
@@ -6,7 +6,7 @@
Building a python web app
=========================
-The goal of this example is to show you how you can author your own docker images using a parent image, making changes to it, and then saving the results as a new image. We will do that by making a simple hello flask web application image.
+The goal of this example is to show you how you can author your own docker images using a parent image, making changes to it, and then saving the results as a new image. We will do that by making a simple hello flask web application image.
**Steps:**
@@ -64,3 +64,7 @@ See the example in action
+
+Continue to the `base commands`_
+
+.. _base commands: ../commandline/basecommands.html
diff --git a/docs/sources/documentation/faq.rst b/docs/sources/documentation/faq.rst
index 7b2b54de5f..aa167acd97 100644
--- a/docs/sources/documentation/faq.rst
+++ b/docs/sources/documentation/faq.rst
@@ -3,27 +3,45 @@ FAQ
Most frequently asked questions.
----------------------------------------------
+--------------------------------
-1. How much does Docker cost?
+**1. How much does Docker cost?**
Docker is 100% free, it is open source, so you can use it without paying.
-2. What open source license are you using?
+**2. What open source license are you using?**
We are using the Apache License Version 2.0, see it here: https://github.com/dotcloud/docker/blob/master/LICENSE
-3. Does Docker run on Mac OS X or Windows?
+**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 getting started guides for help on setting up your machine.
+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_ intallation guides.
-4. How do containers compare to virtual machines?
+**4. How do containers compare to virtual machines?**
-Containers are more light weight and can start in less then a second, and are great for lots of different tasks, but they aren't as full featured as virtual machines.
+Containers are more light weight and can start in less then a second, and are great for lots of different tasks, but they aren't as full featured as virtual machines.
-5. Can I help by adding some questions and answers?
+**5. Can I help by adding some questions and answers?**
-Definitely! You can fork the repo and edit the documentation sources right there.
+Definitely! You can fork `the repo`_ and edit the documentation sources.
+
+
+**42. Where can I find more answers?**
+
+You can find more answers on:
+
+* `IRC: docker on freenode`_
+* `Github`_
+* `Ask questions on Stackoverflow`_
+* `Join the conversation on Twitter`_
+
+.. _Windows: ../documentation/installation/windows.html
+.. _MacOSX: ../documentation/installation/macos.html
+.. _the repo: http://www.github.com/dotcloud/docker
+.. _IRC\: 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
Looking for something else to read? Checkout the :ref:`hello_world` example.