From 8ceb213b3e86973c795ec87a724c7dc7a794d57e Mon Sep 17 00:00:00 2001 From: Nathan Hsieh Date: Wed, 8 Oct 2014 13:44:21 -0700 Subject: [PATCH] merged conflicting commits Signed-off-by: Nathan Hsieh --- docs/sources/userguide/usingdocker.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/sources/userguide/usingdocker.md b/docs/sources/userguide/usingdocker.md index 928db5148e..e64db0bc2e 100644 --- a/docs/sources/userguide/usingdocker.md +++ b/docs/sources/userguide/usingdocker.md @@ -114,8 +114,7 @@ We've specified an image: `training/webapp`. This image is a pre-built image we've created that contains a simple Python Flask web application. -Lastly, we've specified a command for our container to run: `python app.py`. -This launches our web application. +Lastly, we've specified a command for our container to run: `python app.py`. This launches our web application. > **Note:** > You can see more detail on the `docker run` command in the [command