summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-05 22:16:15 +0200
committerGitHub <noreply@github.com>2021-04-05 22:16:15 +0200
commit8d411a876c2b0ebae4a77a00fcb216d9058f89f0 (patch)
tree67b51a866720b4f0b1ef930f641a33cf79a4d32e /cmd/podman
parenta64f39ba3c3cfb1c3dd761fb464cf3c87a1b5e22 (diff)
parent7a446b06c39a7e29788ff96b65da1068e40e0f6d (diff)
downloadpodman-8d411a876c2b0ebae4a77a00fcb216d9058f89f0.tar.gz
podman-8d411a876c2b0ebae4a77a00fcb216d9058f89f0.tar.bz2
podman-8d411a876c2b0ebae4a77a00fcb216d9058f89f0.zip
Merge pull request #9917 from baude/machineconventions
fix machine naming conventions
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/machine/init.go4
-rw-r--r--cmd/podman/machine/list.go2
-rw-r--r--cmd/podman/machine/rm.go2
-rw-r--r--cmd/podman/machine/ssh.go6
-rw-r--r--cmd/podman/machine/start.go2
-rw-r--r--cmd/podman/machine/stop.go2
6 files changed, 9 insertions, 9 deletions
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index 61261e008..02dfc80aa 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -15,8 +15,8 @@ import (
var (
initCmd = &cobra.Command{
Use: "init [options] [NAME]",
- Short: "initialize a vm",
- Long: "initialize a virtual machine for Podman to run on. Virtual machines are used to run Podman.",
+ Short: "Initialize a virtual machine",
+ Long: "initialize a virtual machine ",
RunE: initMachine,
Args: cobra.MaximumNArgs(1),
Example: `podman machine init myvm`,
diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go
index 3c8368c6b..ce4129e87 100644
--- a/cmd/podman/machine/list.go
+++ b/cmd/podman/machine/list.go
@@ -28,7 +28,7 @@ var (
Use: "list [options]",
Aliases: []string{"ls"},
Short: "List machines",
- Long: "List Podman managed virtual machines.",
+ Long: "List managed virtual machines.",
RunE: list,
Args: validate.NoArgs,
Example: `podman machine list,
diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go
index e05b5f7a8..0be2ba40c 100644
--- a/cmd/podman/machine/rm.go
+++ b/cmd/podman/machine/rm.go
@@ -19,7 +19,7 @@ var (
rmCmd = &cobra.Command{
Use: "rm [options] [MACHINE]",
Short: "Remove an existing machine",
- Long: "Remove an existing machine ",
+ Long: "Remove a managed virtual machine ",
RunE: rm,
Args: cobra.MaximumNArgs(1),
Example: `podman machine rm myvm`,
diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go
index fc7c71992..504fcbe46 100644
--- a/cmd/podman/machine/ssh.go
+++ b/cmd/podman/machine/ssh.go
@@ -14,11 +14,11 @@ import (
var (
sshCmd = &cobra.Command{
Use: "ssh [NAME] [COMMAND [ARG ...]]",
- Short: "SSH into a virtual machine",
- Long: "SSH into a virtual machine ",
+ Short: "SSH into an existing machine",
+ Long: "SSH into a managed virtual machine ",
RunE: ssh,
Example: `podman machine ssh myvm
- podman machine ssh -e myvm echo hello`,
+ podman machine ssh myvm echo hello`,
ValidArgsFunction: autocompleteMachineSSH,
}
)
diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go
index 959fa21d2..d06e04f41 100644
--- a/cmd/podman/machine/start.go
+++ b/cmd/podman/machine/start.go
@@ -14,7 +14,7 @@ var (
startCmd = &cobra.Command{
Use: "start [MACHINE]",
Short: "Start an existing machine",
- Long: "Start an existing machine ",
+ Long: "Start a managed virtual machine ",
RunE: start,
Args: cobra.MaximumNArgs(1),
Example: `podman machine start myvm`,
diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go
index 36b434d8e..4235b64f1 100644
--- a/cmd/podman/machine/stop.go
+++ b/cmd/podman/machine/stop.go
@@ -14,7 +14,7 @@ var (
stopCmd = &cobra.Command{
Use: "stop [MACHINE]",
Short: "Stop an existing machine",
- Long: "Stop an existing machine ",
+ Long: "Stop a managed virtual machine ",
RunE: stop,
Args: cobra.MaximumNArgs(1),
Example: `podman machine stop myvm`,