Signed-off-by: David Gebler <davidgebler@gmail.com>

	modified:   userguide/dockerlinks.md
    fixes incorrect environment variable labeling in container linking guide
Merge pull request #8008 from dwgebler/master

fixes incorrect environment variable labeling in container linking guide
HTTP Status 201 not 200

The http status should be 201 not 200.

Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com> (github: SvenDowideit)
Merge pull request #8028 from SvenDowideit/ekristen-patch-1

HTTP Status 201 not 200
Allow extra lines in /etc/hosts

This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>