Merge remote-tracking branch 'upstream/master'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.1 (2013-08-23)
+* Registry: Pass "meta" headers in API calls to the registry
+- Packaging: Use correct upstart script with new build tool
+- Packaging: Use libffi-dev, don't build it from sources
+- Packaging: Removed duplicate mercurial install command
+
 ## 0.6.0 (2013-08-22)
 - Runtime: Load authConfig only when needed and fix useless WARNING
 + Runtime: Add lxc-conf flag to allow custom lxc options

VERSION

@@ -1 +1 @@
-0.6.0-dev
+0.6.1-dev

docs/sources/api/docker_remote_api.rst

@@ -165,7 +165,7 @@ Initial version
 Docker Remote API Client Libraries
 ==================================
 
-These libraries have been not tested by the Docker Maintainers for
+These libraries have not been tested by the Docker Maintainers for
 compatibility. Please file issues with the library owners.  If you
 find more library implementations, please list them in Docker doc bugs
 and we will add the libraries here.

docs/sources/use/basics.rst

@@ -33,6 +33,8 @@ Running an interactive shell
 
   # Run an interactive shell in the ubuntu image,
   # allocate a tty, attach stdin and stdout
+  # To detach the tty without exiting the shell,
+  # use the escape sequence Ctrl-p + Ctrl-q
   sudo docker run -i -t ubuntu /bin/bash
 
 Why ``sudo``?

hack/release/make.sh

@@ -57,7 +57,9 @@ stop on runlevel [!2345]
 
 respawn
 
-exec docker -d
+script
+    /usr/bin/docker -d
+end script
 '
 
 # Each "bundle" is a different type of build artefact: static binary, Ubuntu