rebase master

Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine

components/engine/docs/sources/api/docker_remote_api.rst

@@ -35,6 +35,9 @@ The client should send it's authConfig as POST on each call of /images/(name)/pu
 .. http:get:: /auth is now deprecated
 .. http:post:: /auth only checks the configuration but doesn't store it on the server
 
+Deleting an image is now improved, will only untag the image if it has chidrens and remove all the untagged parents if has any.
+.. http:post:: /images/<name>/delete now returns a JSON with the list of images deleted/untagged
+
 
 :doc:`docker_remote_api_v1.1`
 *****************************
@@ -60,13 +63,15 @@ Uses json stream instead of HTML hijack, it looks like this:
 	   {"error":"Invalid..."}
 	   ...
 
-:doc:`docker_remote_api_v1.0`
-*****************************
 
 docker v0.3.4 8d73740_
 
+What's new
+----------
+
 Initial version
 
+
 .. _a8ae398: https://github.com/dotcloud/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f
 .. _8d73740: https://github.com/dotcloud/docker/commit/8d73740343778651c09160cde9661f5f387b36f4
 

components/engine/docs/sources/api/docker_remote_api_v1.1.rst

@@ -1,3 +1,4 @@
+
 :title: Remote API v1.1
 :description: API Documentation for Docker
 :keywords: API, Docker, rcli, REST, documentation
@@ -744,6 +745,7 @@ Tag an image into a repository
 	:statuscode 200: no error
 	:statuscode 400: bad parameter
 	:statuscode 404: no such image
+	:statuscode 409: conflict
         :statuscode 500: server error
 
 

components/engine/docs/sources/api/docker_remote_api_v1.2.rst

@@ -745,6 +745,7 @@ Tag an image into a repository
 	:statuscode 200: no error
 	:statuscode 400: bad parameter
 	:statuscode 404: no such image
+	:statuscode 409: conflict
         :statuscode 500: server error
 
 
@@ -765,10 +766,18 @@ Remove an image
 
         .. sourcecode:: http
 
-           HTTP/1.1 204 OK
+	   HTTP/1.1 200 OK
+	   Content-type: application/json
+
+	   [
+	    {"Untagged":"3e2f21a89f"},
+	    {"Deleted":"3e2f21a89f"},
+	    {"Deleted":"53b4f83ac9"}
+	   ]
 
 	:statuscode 204: no error
         :statuscode 404: no such image
+	:statuscode 409: conflict
         :statuscode 500: server error
 
 

components/engine/docs/sources/commandline/command/build.rst

@@ -19,10 +19,15 @@ Examples
 
     docker build .
 
-This will take the local Dockerfile
+| This will read the Dockerfile from the current directory. It will also send any other files and directories found in the current directory to the docker daemon.
+| The contents of this directory would be used by ADD commands found within the Dockerfile.
+| This will send a lot of data to the docker daemon if the current directory contains a lot of data.
+| If the absolute path is provided instead of '.', only the files and directories required by the ADD commands from the Dockerfile will be added to the context and transferred to the docker daemon.
+|
 
 .. code-block:: bash
 
     docker build -
 
-This will read a Dockerfile form Stdin without context
+| This will read a Dockerfile from Stdin without context. Due to the lack of a context, no contents of any local directory will be sent to the docker daemon.
+| ADD doesn't work when running in this mode due to the absence of the context, thus having no source files to copy to the container.