Merge pull request #6865 from SvenDowideit/remove-the-named-container-before-creating-a-new-one

Don't make the user get a container already exists error
Upstream-commit: 446ceee51ed1cde3a291c7d53ab3bd0c4a1573ea
Component: engine

components/engine/docs/sources/userguide/dockerlinks.md

@@ -116,8 +116,8 @@ We can also use `docker inspect` to return the container's name.
 
 > **Note:** 
 > Container names have to be unique. That means you can only call
-> one container `web`. If you want to re-use a container name you must delete the
-> old container with the `docker rm` command before you can create a new
+> one container `web`. If you want to re-use a container name you must delete
+> the old container with the `docker rm` command before you can create a new
 > container with the same name. As an alternative you can use the `--rm`
 > flag with the `docker run` command. This will delete the container
 > immediately after it stops.
@@ -133,6 +133,11 @@ container, this one a database.
 Here we've created a new container called `db` using the `training/postgres`
 image, which contains a PostgreSQL database.
 
+We need to delete the `web` container we created previously so we can replace it
+with a linked one:
+
+    $ docker rm -f web
+
 Now let's create a new `web` container and link it with our `db` container.
 
     $ sudo docker run -d -P --name web --link db:db training/webapp python app.py