Browse code

Add more links and a question to the faq

Daniel Mizyrycki authored on 2013/03/27 04:14:58
Showing 3 changed files
... ...
@@ -61,3 +61,7 @@ Expose a service on a TCP port
61 61
 
62 62
   # Verify that the network connection worked
63 63
   echo "Daemon received: $(docker logs $JOB)"
64
+
65
+Continue to the complete `Command Line Interface`_
66
+
67
+.. _Command Line Interface: ../commandline/cli.html
... ...
@@ -6,7 +6,7 @@
6 6
 
7 7
 Building a python web app
8 8
 =========================
9
-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. 
9
+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.
10 10
 
11 11
 **Steps:**
12 12
 
... ...
@@ -64,3 +64,7 @@ See the example in action
64 64
     <div style="margin-top:10px;">
65 65
       <iframe width="720" height="350" src="http://ascii.io/a/2573/raw" frameborder="0"></iframe>
66 66
     </div>
67
+
68
+Continue to the `base commands`_
69
+
70
+.. _base commands: ../commandline/basecommands.html
... ...
@@ -3,27 +3,45 @@ FAQ
3 3
 
4 4
 
5 5
 Most frequently asked questions.
6
+--------------------------------
6 7
 
7
-1. How much does Docker cost?
8
+**1. How much does Docker cost?**
8 9
 
9 10
 Docker is 100% free, it is open source, so you can use it without paying.
10 11
 
11
-2. What open source license are you using?
12
+**2. What open source license are you using?**
12 13
 
13 14
 We are using the Apache License Version 2.0, see it here: https://github.com/dotcloud/docker/blob/master/LICENSE
14 15
 
15
-3. Does Docker run on Mac OS X or Windows?
16
+**3. Does Docker run on Mac OS X or Windows?**
16 17
 
17
-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.
18
+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.
18 19
 
19
-4. How do containers compare to virtual machines?
20
+**4. How do containers compare to virtual machines?**
20 21
 
21
-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. 
22
+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.
22 23
 
23
-5. Can I help by adding some questions and answers?
24
+**5. Can I help by adding some questions and answers?**
24 25
 
25
-Definitely! You can fork the repo and edit the documentation sources right there.
26
+Definitely! You can fork `the repo`_ and edit the documentation sources.
27
+
28
+
29
+**42. Where can I find more answers?**
30
+
31
+You can find more answers on:
32
+
33
+* `IRC: docker on freenode`_
34
+* `Github`_
35
+* `Ask questions on Stackoverflow`_
36
+* `Join the conversation on Twitter`_
37
+
38
+.. _Windows: ../documentation/installation/windows.html
39
+.. _MacOSX: ../documentation/installation/macos.html
40
+.. _the repo: http://www.github.com/dotcloud/docker
41
+.. _IRC\: docker on freenode: irc://chat.freenode.net#docker
42
+.. _Github: http://www.github.com/dotcloud/docker
43
+.. _Ask questions on Stackoverflow: http://stackoverflow.com/search?q=docker
44
+.. _Join the conversation on Twitter: http://twitter.com/getdocker
26 45
 
27 46
 
28 47
 Looking for something else to read? Checkout the :ref:`hello_world` example.