Forráskód Böngészése

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

Hello World Daemon edits
Andy Rothfusz 11 éve
szülő
commit
2d4ac06426
1 módosított fájl, 4 hozzáadás és 2 törlés
  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.
 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
 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
 world to standard out every second. It will continue to do this until
 we stop it.
 we stop it.
@@ -56,6 +56,8 @@ Attach to the container to see the results in realtime.
   process to see what is going on.
   process to see what is going on.
 - **$CONTAINER_ID** The Id of the container we want to attach too.
 - **$CONTAINER_ID** The Id of the container we want to attach too.
 
 
+Exit from the container attachment by pressing Control-C.
+
 .. code-block:: bash
 .. code-block:: bash
 
 
     sudo docker ps
     sudo docker ps