diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-24 12:14:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 12:14:54 -0400 |
| commit | 85d9b3705126dfb6dfa5d0074df6787599273a08 (patch) | |
| tree | 07ac8c2103b35d0fc6b3c53d8bdb40605b7e8934 | |
| parent | 9c48947c73b3bac33c18cb94aa6e1c4abc709cca (diff) | |
| parent | a97551eb209d882f4aea60764e534739d230645f (diff) | |
| download | podman-85d9b3705126dfb6dfa5d0074df6787599273a08.tar.gz podman-85d9b3705126dfb6dfa5d0074df6787599273a08.tar.bz2 podman-85d9b3705126dfb6dfa5d0074df6787599273a08.zip | |
Merge pull request #11738 from rhatdan/docs
Fix english on prune prompt
| -rw-r--r-- | cmd/podman/images/prune.go | 4 | ||||
| -rw-r--r-- | cmd/podman/system/prune.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index 8a484495a..7e6a29d94 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -80,7 +80,7 @@ func prune(cmd *cobra.Command, args []string) error { func createPruneWarningMessage(pruneOpts entities.ImagePruneOptions) string { question := "Are you sure you want to continue? [y/N] " if pruneOpts.All { - return "WARNING! This will remove all images without at least one container associated to them.\n" + question + return "WARNING! This command removes all images without at least one container associated with them.\n" + question } - return "WARNING! This will remove all dangling images.\n" + question + return "WARNING! This command removes all dangling images.\n" + question } diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index e09e2d5e5..5565ea2f9 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -113,15 +113,15 @@ func prune(cmd *cobra.Command, args []string) error { func createPruneWarningMessage(pruneOpts entities.SystemPruneOptions) string { if pruneOpts.All { - return `WARNING! This will remove: + return `WARNING! This command removes: - all stopped containers - all networks not used by at least one container%s - - all images without at least one container associated to them + - all images without at least one container associated with them - all build cache %s` } - return `WARNING! This will remove: + return `WARNING! This command removes: - all stopped containers - all networks not used by at least one container%s - all dangling images |