summaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-01 15:54:27 +0200
committerGitHub <noreply@github.com>2019-07-01 15:54:27 +0200
commit150778820f0f6d9f7ffdb672a8b136804378f025 (patch)
treeb959b53d288816c3c36fb5b054a19075d65a3c34 /cmd/podman/common.go
parented394070a895654ad3ffbabd81a3033b0c7088ff (diff)
parent4f56964d556a7379c09a903258fd44c2232a686a (diff)
downloadpodman-150778820f0f6d9f7ffdb672a8b136804378f025.tar.gz
podman-150778820f0f6d9f7ffdb672a8b136804378f025.tar.bz2
podman-150778820f0f6d9f7ffdb672a8b136804378f025.zip
Merge pull request #3324 from marcov/detach-keys-configurable
libpod: specify a detach keys sequence in libpod.conf
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 578094718..3cc645f95 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -181,7 +181,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.String(
"detach-keys", "",
- "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`",
+ "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`",
)
createFlags.StringSlice(
"device", []string{},