added proper returns type, move the auto-prune in v1.1 api

Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b Component: engine
2013-05-31 14:37:02 +00:00
parent cfeb8eda2b
commit 799ca20158
8 changed files with 102 additions and 32 deletions
@@ -750,13 +750,27 @@ Remove an image

 	   DELETE /images/test HTTP/1.1

-	**Example response**:
+	**Example response v1.0**:

        .. sourcecode:: http

           HTTP/1.1 204 OK

+	**Example response v1.1**:
+
+        .. sourcecode:: http
+
+           HTTP/1.1 200 OK
+	   Content-type: application/json
+
+	   [
+	    {"Untagged":"3e2f21a89f"},
+	    {"Deleted":"3e2f21a89f"},
+	    {"Deleted":"53b4f83ac9"}
+	   ]
+
 	:query force: 1/True/true or 0/False/false, default false
+	:statuscode 200: no error
 	:statuscode 204: no error
        :statuscode 404: no such image
 	:statuscode 409: conflict