Merge pull request #7356 from mitchellh/sethvargo/pr-7228

Make it clear that you can run commands on machine IDs too

plugins/commands/destroy/command.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
         options[:force] = false
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant destroy [options] [name]"
+          o.banner = "Usage: vagrant destroy [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/halt/command.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         options[:force] = false
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant halt [options] [name]"
+          o.banner = "Usage: vagrant halt [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/package/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant package [options] [name]"
+          o.banner = "Usage: vagrant package [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/port/command.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant port [options] [name]"
+          o.banner = "Usage: vagrant port [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/rdp/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant rdp [options] [name] [-- extra args]"
+          o.banner = "Usage: vagrant rdp [options] [name|id] [-- extra args]"
         end
 
         # Parse out the extra args to send to the RDP client, which

plugins/commands/ssh/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant ssh [options] [name] [-- extra ssh args]"
+          o.banner = "Usage: vagrant ssh [options] [name|id] [-- extra ssh args]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/ssh_config/command.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant ssh-config [options] [name]"
+          o.banner = "Usage: vagrant ssh-config [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

plugins/commands/status/command.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
 
       def execute
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant status [name]"
+          o.banner = "Usage: vagrant status [name|id]"
         end
 
         # Parse the options

plugins/commands/suspend/command.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
 
       def execute
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant suspend [name]"
+          o.banner = "Usage: vagrant suspend [name|id]"
         end
 
         # Parse the options

plugins/commands/up/command.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
         options[:provision_ignore_sentinel] = false
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant up [options] [name]"
+          o.banner = "Usage: vagrant up [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

website/source/docs/cli/destroy.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Destroy
 
-**Command: `vagrant destroy`**
+**Command: `vagrant destroy [name|id]`**
 
 This command stops the running machine Vagrant is managing and
 destroys all resources that were created during the machine creation process.

website/source/docs/cli/halt.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Halt
 
-**Command: `vagrant halt`**
+**Command: `vagrant halt [name|id]`**
 
 This command shuts down the running machine Vagrant is managing.
 

website/source/docs/cli/package.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Package
 
-**Command: `vagrant package`**
+**Command: `vagrant package [name|id]`**
 
 This packages a currently running _VirtualBox_ environment into a
 re-usable [box](/docs/boxes.html). This command can only be used with

website/source/docs/cli/port.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Port
 
-**Command: `vagrant port`**
+**Command: `vagrant port [name|id]`**
 
 The port command displays the full list of guest ports mapped to the host
 machine ports:

website/source/docs/cli/provision.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Provision
 
-**Command: `vagrant provision`**
+**Command: `vagrant provision [vm-name]`**
 
 Runs any configured [provisioners](/docs/provisioning/)
 against the running Vagrant managed machine.

website/source/docs/cli/reload.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Reload
 
-**Command: `vagrant reload`**
+**Command: `vagrant reload [name|id]`**
 
 The equivalent of running a [halt](/docs/cli/halt.html) followed by an
 [up](/docs/cli/up.html).

website/source/docs/cli/resume.html.md

@@ -10,7 +10,7 @@ description: |-
 
 # Resume
 
-**Command: `vagrant resume`**
+**Command: `vagrant resume [name|id]`**
 
 This resumes a Vagrant managed machine that was previously suspended,
 perhaps with the [suspend command](/docs/cli/suspend.html).

website/source/docs/cli/ssh.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # SSH
 
-**Command: `vagrant ssh`**
+**Command: `vagrant ssh [name|id] [-- extra_ssh_args]`**
 
 This will SSH into a running Vagrant machine and give you access to a shell.
 

website/source/docs/cli/ssh_config.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # SSH Config
 
-**Command: `vagrant ssh-config`**
+**Command: `vagrant ssh-config [name|id]`**
 
 This will output valid configuration for an SSH config file to SSH
 into the running Vagrant machine from `ssh` directly (instead of

website/source/docs/cli/status.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Status
 
-**Command: `vagrant status`**
+**Command: `vagrant status [name|id]`**
 
 This will tell you the state of the machines Vagrant is managing.
 

website/source/docs/cli/suspend.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Suspend
 
-**Command: `vagrant suspend`**
+**Command: `vagrant suspend [name|id]`**
 
 This suspends the guest machine Vagrant is managing, rather than fully
 [shutting it down](/docs/cli/halt.html) or [destroying it](/docs/cli/destroy.html).

website/source/docs/cli/up.html.md

@@ -9,7 +9,7 @@ description: |-
 
 # Up
 
-**Command: `vagrant up`**
+**Command: `vagrant up [name|id]`**
 
 This command creates and configures guest machines according to your
 [Vagrantfile](/docs/vagrantfile/).