From fe5ab5b058e33d2d8577f1803448078e8eb92345 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 11 Jul 2014 23:27:23 +0000 Subject: [PATCH] proper rebase Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- docs/sources/reference/api/docker_remote_api.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/sources/reference/api/docker_remote_api.md b/docs/sources/reference/api/docker_remote_api.md index dd0e358e51..04b750f4c5 100644 --- a/docs/sources/reference/api/docker_remote_api.md +++ b/docs/sources/reference/api/docker_remote_api.md @@ -34,6 +34,15 @@ You can still call an old version of the API using ### What's new +`DELETE /containers/(id)` + +**New!** +You can now use the `stop` parameter to stop running containers before removal +(replace `force`). + +**New!** +You can now use the `kill` parameter to kill running containers before removal. + ## v1.13 ### Full Documentation @@ -42,14 +51,6 @@ You can still call an old version of the API using ### What's new -`DELETE /containers/(id)` - -New! You can now use the `stop` parameter to stop running containers -before removal (replace `force`). - -New! You can now use the `kill` parameter to kill running containers -before removal. - `GET /containers/(name)/json` **New!**