From f8a62fd1c55965f6c5e805b24c50122843ba7c9a Mon Sep 17 00:00:00 2001 From: Luca Marturana Date: Fri, 9 Oct 2015 10:48:18 +0200 Subject: [PATCH] Sync with remote API Signed-off-by: Luca Marturana Sync also container events Signed-off-by: Luca Marturana Sync also man page Signed-off-by: Luca Marturana --- docs/reference/commandline/events.md | 4 ++-- man/docker-events.1.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md index ab7e8e6788..d923573096 100644 --- a/docs/reference/commandline/events.md +++ b/docs/reference/commandline/events.md @@ -21,11 +21,11 @@ parent = "smn_cli" Docker containers will report the following events: - create, destroy, die, export, kill, oom, pause, restart, start, stop, unpause + attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause and Docker images will report: - untag, delete + delete, import, pull, push, tag, untag The `--since` and `--until` parameters can be Unix timestamps, RFC3339 dates or Go duration strings (e.g. `10m`, `1h30m`) computed relative to diff --git a/man/docker-events.1.md b/man/docker-events.1.md index f854bbc1ad..87d921cdaa 100644 --- a/man/docker-events.1.md +++ b/man/docker-events.1.md @@ -18,11 +18,11 @@ information and real-time information. Docker containers will report the following events: - create, destroy, die, export, kill, pause, restart, start, stop, unpause + attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause and Docker images will report: - untag, delete + delete, import, pull, push, tag, untag # OPTIONS **--help**