Merge pull request #3566 from tianon/fix-volume-symlinks

Fix symlink mounting issues
Merge pull request #3688 from shykes/docs-simplify-basic-usage

Simplify basic usage docs
switch back to the valid json format

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Merge pull request #3640 from proppy/networkgetroutes-add-default

netlink: add default Route to NetworkGetRoutes
Merge pull request #3704 from vieux/json_api_return_valid

Switch back to the valid json format
Automatically create non-existent bind-mounted directories on the host

Fixes #1279.

Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com> (github: mpetazzoni)
Documentation about automatic bind-mount dir creation

Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com> (github: mpetazzoni)
Fix die command when monitor returns

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #2655 from mpetazzoni/create-local-bind-dirs

Automatically create non-existent bind-mounted host directories
Fix wait on stopped container (after docker restart) + add Unit test for that case

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Merge pull request #3706 from creack/fix_wait_stopped

Fix wait on stopped container (after docker restart) + add Unit test for that case
Merge pull request #3705 from crosbymichael/fix-die-event

Fix die command when monitor returns
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)

Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com> (github: bkcsoft)
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs

Update bash shebangs to use "/usr/bin/env bash" for increased portability
Merge branch 'add_missing_attributes' of https://github.com/rogaha/docker into rogaha-add_missing_attributes

Conflicts:
	api.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Fix issue with exit code in non-tty mode.

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Merge pull request #3708 from creack/fix_run_exit_code

Fix issue with exit code in non-tty mode.
Add a --signal option to the kill command to specify a signal.

Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net> (github: plietar)
Grammar and punctuation fixes

Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com> (github: johngmyers)
Wording improvements

Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com> (github: johngmyers)