Browse Source

Merge pull request #1831 from brianshumate/jbs-docs-edits

Hello World Daemon edits
Andy Rothfusz 11 years ago
parent
commit
2d4ac06426
1 changed files with 4 additions and 2 deletions
  1. 4 2
      docs/sources/examples/hello_world_daemon.rst

+ 4 - 2
docs/sources/examples/hello_world_daemon.rst

@@ -11,8 +11,8 @@ Hello World Daemon
 
 The most boring daemon ever written.
 
-This example assumes you have Docker installed and with the Ubuntu
-image already imported ``docker pull ubuntu``.  We will use the Ubuntu
+This example assumes you have Docker installed and the Ubuntu
+image already imported with ``docker pull ubuntu``.  We will use the Ubuntu
 image to run a simple hello world daemon that will just print hello
 world to standard out every second. It will continue to do this until
 we stop it.
@@ -56,6 +56,8 @@ Attach to the container to see the results in realtime.
   process to see what is going on.
 - **$CONTAINER_ID** The Id of the container we want to attach too.
 
+Exit from the container attachment by pressing Control-C.
+
 .. code-block:: bash
 
     sudo docker ps