diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 771a6e5be..4b92b00cb 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -158,6 +158,7 @@
 									<li<%= sidebar_current("providers-installation") %>><a href="/v2/providers/installation.html">Installation</a></li>
 									<li<%= sidebar_current("providers-basic-usage") %>><a href="/v2/providers/basic_usage.html">Basic Usage</a></li>
 									<li<%= sidebar_current("providers-configuration") %>><a href="/v2/providers/configuration.html">Configuration</a></li>
+									<li<%= sidebar_current("providers-default") %>><a href="/v2/providers/default.html">Default Provider</a></li>
 									<li<%= sidebar_current("providers-custom") %>><a href="/v2/providers/custom.html">Custom Provider</a></li>
 								</ul> <!-- /.sub -->
 								<% end %>
diff --git a/website/docs/source/v2/boxes.html.md b/website/docs/source/v2/boxes.html.md
index 18b2196c6..1d7ed3327 100644
--- a/website/docs/source/v2/boxes.html.md
+++ b/website/docs/source/v2/boxes.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Boxes"
 sidebar_current: "boxes"
 ---
 
@@ -72,14 +73,6 @@ $ vagrant box remove precise64 virtualbox
 ```
 
 The two arguments are the logical name of the box and the provider of the
-box.
-
-<div class="alert alert-info">
-	<h3>Optional Provider Parameter?</h3>
-	<p>
-		A future release of Vagrant will make the provider parameter optional
-		when removing a box. In this case, Vagrant will show a list of
-		boxes that can be removed and ask the user which they want to remove.
-		This is not currently implemented.
-	</p>
-</div>
+box. The second argument (the provider) is optional. If you have only a single
+provider backing that box, it doesn't need to be specified. If you have multiple
+providers backing a box and it isn't specified, Vagrant will show an error.
diff --git a/website/docs/source/v2/boxes/format.html.md b/website/docs/source/v2/boxes/format.html.md
index acc6c181d..415338216 100644
--- a/website/docs/source/v2/boxes/format.html.md
+++ b/website/docs/source/v2/boxes/format.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Box File Format"
 sidebar_current: "boxes-format"
 ---
 
diff --git a/website/docs/source/v2/cli/box.html.md b/website/docs/source/v2/cli/box.html.md
index d64aa85ad..e7bf61ea5 100644
--- a/website/docs/source/v2/cli/box.html.md
+++ b/website/docs/source/v2/cli/box.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant box - Command-Line Interface"
 sidebar_current: "cli-box"
 ---
 
diff --git a/website/docs/source/v2/cli/destroy.html.md b/website/docs/source/v2/cli/destroy.html.md
index 7efed97da..8b16e7973 100644
--- a/website/docs/source/v2/cli/destroy.html.md
+++ b/website/docs/source/v2/cli/destroy.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant destroy - Command-Line Interface"
 sidebar_current: "cli-destroy"
 ---
 
diff --git a/website/docs/source/v2/cli/halt.html.md b/website/docs/source/v2/cli/halt.html.md
index 0092693d6..15091f8a8 100644
--- a/website/docs/source/v2/cli/halt.html.md
+++ b/website/docs/source/v2/cli/halt.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant halt - Command-Line Interface"
 sidebar_current: "cli-halt"
 ---
 
diff --git a/website/docs/source/v2/cli/index.html.md b/website/docs/source/v2/cli/index.html.md
index a1644254f..7bc55a43e 100644
--- a/website/docs/source/v2/cli/index.html.md
+++ b/website/docs/source/v2/cli/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Command-Line Interface"
 sidebar_current: "cli"
 ---
 
diff --git a/website/docs/source/v2/cli/init.html.md b/website/docs/source/v2/cli/init.html.md
index 3df129e06..25175d4fb 100644
--- a/website/docs/source/v2/cli/init.html.md
+++ b/website/docs/source/v2/cli/init.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant init - Command-Line Interface"
 sidebar_current: "cli-init"
 ---
 
diff --git a/website/docs/source/v2/cli/package.html.md b/website/docs/source/v2/cli/package.html.md
index bc3f6bfbf..0409cbeb1 100644
--- a/website/docs/source/v2/cli/package.html.md
+++ b/website/docs/source/v2/cli/package.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant package - Command-Line Interface"
 sidebar_current: "cli-package"
 ---
 
diff --git a/website/docs/source/v2/cli/plugin.html.md b/website/docs/source/v2/cli/plugin.html.md
index 78a2720ee..6a6d159ac 100644
--- a/website/docs/source/v2/cli/plugin.html.md
+++ b/website/docs/source/v2/cli/plugin.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant plugin - Command-Line Interface"
 sidebar_current: "cli-plugin"
 ---
 
@@ -15,6 +16,7 @@ of subcommands:
 * `license`
 * `list`
 * `uninstall`
+* `update`
 
 # Plugin Install
 
@@ -22,7 +24,9 @@ of subcommands:
 
 This installs a plugin with the given name or file path. If the name
 is not a path to a file, then the plugin is installed from remote
-repositories, usually [RubyGems](http://rubygems.org).
+repositories, usually [RubyGems](http://rubygems.org). This command will
+also update a plugin if it is already installed, but you can also use
+`vagrant plugin update` for that.
 
 # Plugin License
 
@@ -43,3 +47,10 @@ This lists all installed plugins and their respective versions.
 
 This uninstalls the plugin with the given name. Any dependencies of the
 plugin will also be uninstalled assuming no other plugin needs them.
+
+# Plugin Update
+
+**Command: `vagrant plugin update <name>`**
+
+This updates the plugin with the given name. If the plugin isn't already
+installed, this will not install it.
diff --git a/website/docs/source/v2/cli/provision.html.md b/website/docs/source/v2/cli/provision.html.md
index 4eb1be0ed..c329b1ffa 100644
--- a/website/docs/source/v2/cli/provision.html.md
+++ b/website/docs/source/v2/cli/provision.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant provision - Command-Line Interface"
 sidebar_current: "cli-provision"
 ---
 
diff --git a/website/docs/source/v2/cli/reload.html.md b/website/docs/source/v2/cli/reload.html.md
index aa9628f3a..e70c43f60 100644
--- a/website/docs/source/v2/cli/reload.html.md
+++ b/website/docs/source/v2/cli/reload.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant reload - Command-Line Interface"
 sidebar_current: "cli-reload"
 ---
 
@@ -13,9 +14,12 @@ This command is usually required for changes made in the Vagrantfile to
 take effect. After making any modifications to the Vagrantfile, a `reload`
 should be called.
 
+The configured provisioners will not run again, by default. You can force
+the provisioners to re-run by specifying the `--provision` flag.
+
 # Options
 
-* `--no-provision` - The provisioners will not run.
+* `--provision` - Force the provisioners to run.
 
 * `--provision-with x,y,z` - This will only run the given provisioners. For
   example, if you have a `:shell` and `:chef_solo` provisioner and run
diff --git a/website/docs/source/v2/cli/resume.html.md b/website/docs/source/v2/cli/resume.html.md
index 99deac83f..fb4c80995 100644
--- a/website/docs/source/v2/cli/resume.html.md
+++ b/website/docs/source/v2/cli/resume.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant resume - Command-Line Interface"
 sidebar_current: "cli-resume"
 ---
 
diff --git a/website/docs/source/v2/cli/ssh.html.md b/website/docs/source/v2/cli/ssh.html.md
index 0dd29c28d..c0153097d 100644
--- a/website/docs/source/v2/cli/ssh.html.md
+++ b/website/docs/source/v2/cli/ssh.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant ssh - Command-Line Interface"
 sidebar_current: "cli-ssh"
 ---
 
@@ -16,7 +17,8 @@ any abitrary commands to do things such as reverse tunneling down into the
 ## Options
 
 * `-c COMMAND` or `--command COMMAND` - This executes a single SSH command, prints
-  out the stdout and stderr, and exits.
+  out the stdout and stderr, and exits. stdin will not be functional on this
+  executed command.
 
 * `-p` or `--plain` - This does an SSH without authentication, leaving
   authentication up to the user.
diff --git a/website/docs/source/v2/cli/ssh_config.html.md b/website/docs/source/v2/cli/ssh_config.html.md
index fd64a097d..1bd0526e4 100644
--- a/website/docs/source/v2/cli/ssh_config.html.md
+++ b/website/docs/source/v2/cli/ssh_config.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant ssh-config - Command-Line Interface"
 sidebar_current: "cli-ssh_config"
 ---
 
diff --git a/website/docs/source/v2/cli/status.html.md b/website/docs/source/v2/cli/status.html.md
index 93311e8b7..b60dd42de 100644
--- a/website/docs/source/v2/cli/status.html.md
+++ b/website/docs/source/v2/cli/status.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant status - Command-Line Interface"
 sidebar_current: "cli-status"
 ---
 
diff --git a/website/docs/source/v2/cli/suspend.html.md b/website/docs/source/v2/cli/suspend.html.md
index e6c98ad90..8282de30d 100644
--- a/website/docs/source/v2/cli/suspend.html.md
+++ b/website/docs/source/v2/cli/suspend.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant suspend - Command-Line Interface"
 sidebar_current: "cli-suspend"
 ---
 
diff --git a/website/docs/source/v2/cli/up.html.md b/website/docs/source/v2/cli/up.html.md
index 5fa0c42ed..07f8f08ca 100644
--- a/website/docs/source/v2/cli/up.html.md
+++ b/website/docs/source/v2/cli/up.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "vagrant up - Command-Line Interface"
 sidebar_current: "cli-up"
 ---
 
@@ -12,3 +13,22 @@ This command creates and configures guest machines according to your
 This is the single most important command in Vagrant, since it is how
 any Vagrant machine is created. Anyone using Vagrant must use this command
 on a day-to-day basis.
+
+# Options
+
+* `--[no-]destroy-on-error` - Destroy the newly created machine if a fatal,
+  unexpected error occurs. This will only happen on the first `vagrant up`.
+  By default this is set.
+
+* `--[no-]parallel` - Bring multiple machines up in parallel if the provider
+  supports it.
+
+* `--provider x` - Bring the machine up with the given
+  [provider](/v2/providers/index.html). By default this is "virtualbox".
+
+* `--provision` - Force the provisioners to run.
+
+* `--provision-with x,y,z` - This will only run the given provisioners. For
+  example, if you have a `:shell` and `:chef_solo` provisioner and run
+  `vagrant provision --provision-with shell`, only the shell provisioner will
+  be run.
diff --git a/website/docs/source/v2/debugging.html.md b/website/docs/source/v2/debugging.html.md
index 207082f80..0821c815d 100644
--- a/website/docs/source/v2/debugging.html.md
+++ b/website/docs/source/v2/debugging.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Debugging and Troubleshooting"
 sidebar_current: "debugging"
 ---
 
diff --git a/website/docs/source/v2/getting-started/boxes.html.md b/website/docs/source/v2/getting-started/boxes.html.md
index a705c6a40..4a892c5b1 100644
--- a/website/docs/source/v2/getting-started/boxes.html.md
+++ b/website/docs/source/v2/getting-started/boxes.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Boxes - Getting Started"
 sidebar_current: "gettingstarted-boxes"
 ---
 
diff --git a/website/docs/source/v2/getting-started/index.html.md b/website/docs/source/v2/getting-started/index.html.md
index 9d71d7ac2..ed072b905 100644
--- a/website/docs/source/v2/getting-started/index.html.md
+++ b/website/docs/source/v2/getting-started/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Getting Started"
 sidebar_current: "gettingstarted"
 ---
 
diff --git a/website/docs/source/v2/getting-started/networking.html.md b/website/docs/source/v2/getting-started/networking.html.md
index e6f92ecf8..f4babf3b9 100644
--- a/website/docs/source/v2/getting-started/networking.html.md
+++ b/website/docs/source/v2/getting-started/networking.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Networking - Getting Started"
 sidebar_current: "gettingstarted-networking"
 ---
 
diff --git a/website/docs/source/v2/getting-started/project_setup.html.md b/website/docs/source/v2/getting-started/project_setup.html.md
index e10c9792a..b142b4529 100644
--- a/website/docs/source/v2/getting-started/project_setup.html.md
+++ b/website/docs/source/v2/getting-started/project_setup.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Project Setup - Getting Started"
 sidebar_current: "gettingstarted-projectsetup"
 ---
 
diff --git a/website/docs/source/v2/getting-started/providers.html.md b/website/docs/source/v2/getting-started/providers.html.md
index 408bb89b3..83239d5f5 100644
--- a/website/docs/source/v2/getting-started/providers.html.md
+++ b/website/docs/source/v2/getting-started/providers.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Providers - Getting Started"
 sidebar_current: "gettingstarted-providers"
 ---
 
diff --git a/website/docs/source/v2/getting-started/provisioning.html.md b/website/docs/source/v2/getting-started/provisioning.html.md
index 76b0f6afe..47211ed70 100644
--- a/website/docs/source/v2/getting-started/provisioning.html.md
+++ b/website/docs/source/v2/getting-started/provisioning.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Provisioning - Getting Started"
 sidebar_current: "gettingstarted-provisioning"
 ---
 
@@ -49,9 +50,11 @@ to the location of the project root (where the Vagrantfile is).
 After everything is configured, just run `vagrant up` to create your
 machine and Vagrant will automatically provision it. You should see
 the output from the shell script appear in your terminal. If the guest
-machine is already running from a previous step, run `vagrant reload`,
+machine is already running from a previous step, run `vagrant reload --provision`,
 which will quickly restart your virtual machine, skipping the initial
-import step.
+import step. The provision flag on the reload command instructs Vagrant to
+run the provisioners, since usually Vagrant will only do this on the first
+`vagrant up`.
 
 After Vagrant completes running, the web server will be up and running.
 You can't see the website from your own browser (yet), but you can verify
diff --git a/website/docs/source/v2/getting-started/rebuild.html.md b/website/docs/source/v2/getting-started/rebuild.html.md
index bbb1c8d87..aa5a3bc40 100644
--- a/website/docs/source/v2/getting-started/rebuild.html.md
+++ b/website/docs/source/v2/getting-started/rebuild.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Rebuild - Getting Started"
 sidebar_current: "gettingstarted-rebuild"
 ---
 
diff --git a/website/docs/source/v2/getting-started/synced_folders.html.md b/website/docs/source/v2/getting-started/synced_folders.html.md
index a009dad7a..11612e84c 100644
--- a/website/docs/source/v2/getting-started/synced_folders.html.md
+++ b/website/docs/source/v2/getting-started/synced_folders.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Synced Folders - Getting Started"
 sidebar_current: "gettingstarted-syncedfolders"
 ---
 
diff --git a/website/docs/source/v2/getting-started/teardown.html.md b/website/docs/source/v2/getting-started/teardown.html.md
index eb2ae2fc6..919793dc9 100644
--- a/website/docs/source/v2/getting-started/teardown.html.md
+++ b/website/docs/source/v2/getting-started/teardown.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Teardown - Getting Started"
 sidebar_current: "gettingstarted-teardown"
 ---
 
diff --git a/website/docs/source/v2/getting-started/up.html.md b/website/docs/source/v2/getting-started/up.html.md
index 8634036db..c064aae3c 100644
--- a/website/docs/source/v2/getting-started/up.html.md
+++ b/website/docs/source/v2/getting-started/up.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Up and SSH - Getting Started"
 sidebar_current: "gettingstarted-up"
 ---
 
diff --git a/website/docs/source/v2/installation/uninstallation.html.md b/website/docs/source/v2/installation/uninstallation.html.md
index 296bb77fa..4269c4885 100644
--- a/website/docs/source/v2/installation/uninstallation.html.md
+++ b/website/docs/source/v2/installation/uninstallation.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Uninstalling Vagrant"
 sidebar_current: "installation-uninstallation"
 ---
 
diff --git a/website/docs/source/v2/multi-machine/index.html.md b/website/docs/source/v2/multi-machine/index.html.md
index b783e88aa..e5b79f21f 100644
--- a/website/docs/source/v2/multi-machine/index.html.md
+++ b/website/docs/source/v2/multi-machine/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Multi-Machine"
 sidebar_current: "multimachine"
 ---
 
@@ -35,13 +36,13 @@ configuration. An example shows this best:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :shell, :inline => "echo Hello"
+  config.vm.provision "shell", inline: "echo Hello"
 
-  config.vm.define :web do |web|
+  config.vm.define "web" do |web|
     web.vm.box = "apache"
   end
 
-  config.vm.define :db do |db|
+  config.vm.define "db" do |db|
     db.vm.box = "mysql"
   end
 end
@@ -51,7 +52,7 @@ As you can see, `config.vm.define` takes a block with another variable. This
 variable, such as `web` above, is the _exact_ same as the `config` variable,
 except any configuration of the inner variable applies only to the machine
 being defined. Therefore, any configuration on `web` will only affect the
-`:web` machine.
+`web` machine.
 
 And importantly, you can continue to use the `config` object as well. The
 configuration object is loaded and merged before the machine-specific configuration,
@@ -87,3 +88,18 @@ In order to faciliate communication within machines in a multi-machine setup,
 the various [networking](/v2/networking/index.html) options should be used.
 In particular, the [private network](/v2/networking/private_network.html) can
 be used to make a private network between multiple machines and the host.
+
+## Specifying a Primary Machine
+
+You can also specify a _primary machine_. The primary machine will be the
+default machine used when a specific machine in a multi-machine environment
+is not specified.
+
+To specify a default, machine, just mark it primary when defining it. Only
+one primary machine may be specified.
+
+```ruby
+config.vm.define "web", primary: true do |web|
+  # ...
+end
+```
diff --git a/website/docs/source/v2/networking/basic_usage.html.md b/website/docs/source/v2/networking/basic_usage.html.md
index 881630e00..7dae96a81 100644
--- a/website/docs/source/v2/networking/basic_usage.html.md
+++ b/website/docs/source/v2/networking/basic_usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Basic Usage - Networking"
 sidebar_current: "networking-basic"
 ---
 
@@ -19,7 +20,7 @@ below defines some port forwarding:
 Vagrant.configure("2") do |config|
   # other config here
 
-  config.vm.network :forwarded_port, guest: 80, host: 8080
+  config.vm.network "forwarded_port", guest: 80, host: 8080
 end
 ```
 
diff --git a/website/docs/source/v2/networking/forwarded_ports.html.md b/website/docs/source/v2/networking/forwarded_ports.html.md
index 1d9e95ca2..f07e9fbed 100644
--- a/website/docs/source/v2/networking/forwarded_ports.html.md
+++ b/website/docs/source/v2/networking/forwarded_ports.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Forwarded Ports - Networking"
 sidebar_current: "networking-fp"
 ---
 
 # Forwarded Ports
 
-**Network identifier: `:forwarded_port`**
+**Network identifier: `forwarded_port`**
 
 Forwarded ports allow you to access a port on your host machine and have
 all data forwarded to a port on the guest machine, over either TCP or UDP.
@@ -21,7 +22,7 @@ guest and the port on the host. Example:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.network :forwarded_port, guest: 80, host: 8080
+  config.vm.network "forwarded_port", guest: 80, host: 8080
 end
 ```
 
@@ -45,7 +46,7 @@ is easy:
 
 ```
 Vagrant.configure("2") do |config|
-  config.vm.network :forwarded_port, guest: 80, host: 8080,
+  config.vm.network "forwarded_port", guest: 80, host: 8080,
     auto_correct: true
 end
 ```
diff --git a/website/docs/source/v2/networking/index.html.md b/website/docs/source/v2/networking/index.html.md
index e8bbef4ce..31ff8493f 100644
--- a/website/docs/source/v2/networking/index.html.md
+++ b/website/docs/source/v2/networking/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Networking"
 sidebar_current: "networking"
 ---
 
diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index 0d6578c1f..20153c69f 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Private Networks - Networking"
 sidebar_current: "networking-private"
 ---
 
 # Private Networks
 
-**Network identifier: `:private_network`**
+**Network identifier: `private_network`**
 
 Private networks allow you to access your guest machine by some address
 that is not publicly accessible from the global internet. In general, this
@@ -34,7 +35,7 @@ IP. The Vagrantfile for a static IP looks like this:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.network :private_network, ip: "192.168.50.4"
+  config.vm.network "private_network", ip: "192.168.50.4"
 end
 ```
 
diff --git a/website/docs/source/v2/networking/public_network.html.md b/website/docs/source/v2/networking/public_network.html.md
index 61bb6f033..2c7c141ef 100644
--- a/website/docs/source/v2/networking/public_network.html.md
+++ b/website/docs/source/v2/networking/public_network.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Public Networks - Networking"
 sidebar_current: "networking-public"
 ---
 
 # Public Networks
 
-**Network identifier: `:public_network`**
+**Network identifier: `public_network`**
 
 Public networks are less private than private networks, and the exact
 meaning actually varies from [provider to provider](/v2/providers/index.html),
@@ -29,7 +30,7 @@ via DHCP. In this case, defining a public network is trivially easy:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.network :public_network
+  config.vm.network "public_network"
 end
 ```
 
@@ -39,14 +40,14 @@ the IP, such as `ifconfig`.
 
 ## Default Network Interface
 
-If more than one network interface is available on the host machine, Vagrant will 
+If more than one network interface is available on the host machine, Vagrant will
 ask you to choose which interface the virtual machine should bridge to. A default
 interface can be specified by adding a `:bridge` clause to the network definition.
 
 ```ruby
-config.vm.network :public_network, :bridge => 'en1: Wi-Fi (AirPort)'
+config.vm.network "public_network", :bridge => 'en1: Wi-Fi (AirPort)'
 ```
 
 The string identifying the desired interface must exactly match the name of an
-available interface. If it can't be found, Vagrant will ask you to pick 
+available interface. If it can't be found, Vagrant will ask you to pick
 from a list of available network interfaces.
diff --git a/website/docs/source/v2/plugins/commands.html.md b/website/docs/source/v2/plugins/commands.html.md
index b2a4536cc..f3a8ed86d 100644
--- a/website/docs/source/v2/plugins/commands.html.md
+++ b/website/docs/source/v2/plugins/commands.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Command Plugins - Plugin Development"
 sidebar_current: "plugins-commands"
 ---
 
diff --git a/website/docs/source/v2/plugins/configuration.html.md b/website/docs/source/v2/plugins/configuration.html.md
index f868e03cb..0db821922 100644
--- a/website/docs/source/v2/plugins/configuration.html.md
+++ b/website/docs/source/v2/plugins/configuration.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Configuration - Plugin Development"
 sidebar_current: "plugins-configuration"
 ---
 
diff --git a/website/docs/source/v2/plugins/development-basics.html.md b/website/docs/source/v2/plugins/development-basics.html.md
index 2950ede06..884d88bc0 100644
--- a/website/docs/source/v2/plugins/development-basics.html.md
+++ b/website/docs/source/v2/plugins/development-basics.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Plugin Development Basics - Plugins"
 sidebar_current: "plugins-development-basics"
 ---
 
diff --git a/website/docs/source/v2/plugins/guest-capabilities.html.md b/website/docs/source/v2/plugins/guest-capabilities.html.md
index 9fc830394..2248c0f9e 100644
--- a/website/docs/source/v2/plugins/guest-capabilities.html.md
+++ b/website/docs/source/v2/plugins/guest-capabilities.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Guest Capabilities - Plugin Development"
 sidebar_current: "plugins-guestcapabilities"
 ---
 
diff --git a/website/docs/source/v2/plugins/guests.html.md b/website/docs/source/v2/plugins/guests.html.md
index 9945e5b2a..900d9aae3 100644
--- a/website/docs/source/v2/plugins/guests.html.md
+++ b/website/docs/source/v2/plugins/guests.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Guests - Plugin Development"
 sidebar_current: "plugins-guests"
 ---
 
diff --git a/website/docs/source/v2/plugins/hosts.html.md b/website/docs/source/v2/plugins/hosts.html.md
index a686bf19f..cf8d72f4e 100644
--- a/website/docs/source/v2/plugins/hosts.html.md
+++ b/website/docs/source/v2/plugins/hosts.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Hosts - Plugin Development"
 sidebar_current: "plugins-hosts"
 ---
 
diff --git a/website/docs/source/v2/plugins/index.html.md b/website/docs/source/v2/plugins/index.html.md
index b906c18b8..11d5eb365 100644
--- a/website/docs/source/v2/plugins/index.html.md
+++ b/website/docs/source/v2/plugins/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Plugins"
 sidebar_current: "plugins"
 ---
 
diff --git a/website/docs/source/v2/plugins/packaging.html.md b/website/docs/source/v2/plugins/packaging.html.md
index 3b472b347..b0e90d097 100644
--- a/website/docs/source/v2/plugins/packaging.html.md
+++ b/website/docs/source/v2/plugins/packaging.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Packaging and Distribution - Plugin Development"
 sidebar_current: "plugins-packaging"
 ---
 
diff --git a/website/docs/source/v2/plugins/providers.html.md b/website/docs/source/v2/plugins/providers.html.md
index 641c6be8d..f4ed72e44 100644
--- a/website/docs/source/v2/plugins/providers.html.md
+++ b/website/docs/source/v2/plugins/providers.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Providers - Plugin Development"
 sidebar_current: "plugins-providers"
 ---
 
diff --git a/website/docs/source/v2/plugins/provisioners.html.md b/website/docs/source/v2/plugins/provisioners.html.md
index b2db3a1d5..4ae29e0df 100644
--- a/website/docs/source/v2/plugins/provisioners.html.md
+++ b/website/docs/source/v2/plugins/provisioners.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Provisioners - Plugin Development"
 sidebar_current: "plugins-provisioners"
 ---
 
diff --git a/website/docs/source/v2/plugins/usage.html.md b/website/docs/source/v2/plugins/usage.html.md
index 378a9caba..31b2d63d0 100644
--- a/website/docs/source/v2/plugins/usage.html.md
+++ b/website/docs/source/v2/plugins/usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Plugin Usage - Plugins"
 sidebar_current: "plugins-usage"
 ---
 
diff --git a/website/docs/source/v2/providers/basic_usage.html.md b/website/docs/source/v2/providers/basic_usage.html.md
index 165ac2988..8eb6dcf69 100644
--- a/website/docs/source/v2/providers/basic_usage.html.md
+++ b/website/docs/source/v2/providers/basic_usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Basic Usage - Providers"
 sidebar_current: "providers-basic-usage"
 ---
 
diff --git a/website/docs/source/v2/providers/configuration.html.md b/website/docs/source/v2/providers/configuration.html.md
index 9fc7977e6..c579a14b7 100644
--- a/website/docs/source/v2/providers/configuration.html.md
+++ b/website/docs/source/v2/providers/configuration.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Configuration - Providers"
 sidebar_current: "providers-configuration"
 ---
 
@@ -29,7 +30,7 @@ Configuring a specific provider looks like this:
 Vagrant.configure("2") do |config|
   # ... (other config)
 
-  config.vm.provider :virtualbox do |vb|
+  config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
   end
 end
@@ -67,7 +68,7 @@ Example:
 Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
 
-  config.vm.provider :vmware_fusion do |v, override|
+  config.vm.provider "vmware_fusion" do |v, override|
     override.vm.box = "precise64_fusion"
   end
 end
diff --git a/website/docs/source/v2/providers/custom.html.md b/website/docs/source/v2/providers/custom.html.md
index 6390c8cd6..f2567b365 100644
--- a/website/docs/source/v2/providers/custom.html.md
+++ b/website/docs/source/v2/providers/custom.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Custom Provider - Providers"
 sidebar_current: "providers-custom"
 ---
 
diff --git a/website/docs/source/v2/providers/default.html.md b/website/docs/source/v2/providers/default.html.md
new file mode 100644
index 000000000..e9925455f
--- /dev/null
+++ b/website/docs/source/v2/providers/default.html.md
@@ -0,0 +1,22 @@
+---
+page_title: "Default Provider - Providers"
+sidebar_current: "providers-default"
+---
+
+# Default Provider
+
+By default, VirtualBox is the default provider for Vagrant. VirtualBox is
+still the most accessible platform to use Vagrant: it is free, cross-platform,
+and has been supported by Vagrant for years. With VirtualBox as the default
+provider, it provides the lowest friction for new users to get started with
+Vagrant.
+
+However, you may find after using Vagrant for some time that you prefer
+to use another provider as your default. In fact, this is quite common.
+To make this experience better, Vagrant allows specifying the default
+provider to use by setting the `VAGRANT_DEFAULT_PROVIDER` environmental
+variable.
+
+Just set `VAGRANT_DEFAULT_PROVIDER` to the provider you wish to be the
+default. For example, if you use Vagrant with VMware Fusion, you can set
+the environmental variable to `vmware_fusion` and it will be your default.
diff --git a/website/docs/source/v2/providers/index.html.md b/website/docs/source/v2/providers/index.html.md
index 0d7a7b711..e0836dd93 100644
--- a/website/docs/source/v2/providers/index.html.md
+++ b/website/docs/source/v2/providers/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Providers"
 sidebar_current: "providers"
 ---
 
diff --git a/website/docs/source/v2/providers/installation.html.md b/website/docs/source/v2/providers/installation.html.md
index 2a6642276..209504ed2 100644
--- a/website/docs/source/v2/providers/installation.html.md
+++ b/website/docs/source/v2/providers/installation.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Installation - Providers"
 sidebar_current: "providers-installation"
 ---
 
diff --git a/website/docs/source/v2/provisioning/ansible.html.md b/website/docs/source/v2/provisioning/ansible.html.md
index beb19b1f6..bee777a24 100644
--- a/website/docs/source/v2/provisioning/ansible.html.md
+++ b/website/docs/source/v2/provisioning/ansible.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Ansible - Provisioning"
 sidebar_current: "provisioning-ansible"
 ---
 
 # Ansible Provisioner
 
-**Provisioner name: `:ansible`**
+**Provisioner name: `"ansible"`**
 
 The ansible provisioner allows you to provision the guest using
 [Ansible](http://ansible.cc) playbooks.
@@ -48,7 +49,7 @@ which contains the steps that should be run on the guest. Ansible's
 [playbook documentation](http://ansible.cc/docs/playbooks.html) goes into great
 detail on how to author playbooks, and there are a number of
 [best practices](http://ansible.cc/docs/bestpractices.html) that can be applied to use
-Ansible's powerful features effectively. A playbook that installs and starts (or restarts 
+Ansible's powerful features effectively. A playbook that installs and starts (or restarts
 if it was updated) the NTP daemon via YUM looks like:
 
 ```
@@ -74,7 +75,7 @@ To run Ansible against your Vagrant guest, the basic Vagrantfile configuration l
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :ansible do |ansible|
+  config.vm.provision "ansible" do |ansible|
     ansible.playbook = "playbook.yml"
   end
 end
@@ -98,7 +99,7 @@ In such an arrangement, the `ansible.playbook` path should be adjusted according
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :ansible do |ansible|
+  config.vm.provision "ansible" do |ansible|
     ansible.playbook = "provisioning/playbook.yml"
   end
 end
diff --git a/website/docs/source/v2/provisioning/basic_usage.html.md b/website/docs/source/v2/provisioning/basic_usage.html.md
index cbe5c9e32..2bc82592e 100644
--- a/website/docs/source/v2/provisioning/basic_usage.html.md
+++ b/website/docs/source/v2/provisioning/basic_usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Basic Usage - Provisioning"
 sidebar_current: "provisioning-basic"
 ---
 
@@ -18,11 +19,11 @@ below enables shell provisioning:
 Vagrant.configure("2") do |config|
   # ... other configuration
 
-  config.vm.provision :shell, :inline => "echo hello"
+  config.vm.provision "shell", inline: "echo hello"
 end
 ```
 
-Every provisioner has an identifier, such as `:shell`, used as the first
+Every provisioner has an identifier, such as `"shell", used as the first
 parameter to the provisioning configuration. Following that is basic key/value
 for configuring that specific provisioner. Instead of basic key/value, you
 can also use a Ruby block for a syntax that is more like variable assignment.
@@ -32,7 +33,7 @@ The following is effectively the same as the prior example:
 Vagrant.configure("2") do |config|
   # ... other configuration
 
-  config.vm.provision :shell do |s|
+  config.vm.provision "shell" do |s|
     s.inline = "echo hello"
   end
 end
@@ -57,7 +58,8 @@ Provisioners are run in three cases: `vagrant up`, `vagrant reload`, and
 `vagrant provision`.
 
 A `--no-provision` flag can be passed to `up` and `reload` if you don't
-want to run provisioners.
+want to run provisioners. Likewise, you can pass `--provision` to force
+provisioning.
 
 The `--provision-with` flag can be used if you only want to run a
 specific provisioner if you have multiple provisioners specified. For
diff --git a/website/docs/source/v2/provisioning/chef_client.html.md b/website/docs/source/v2/provisioning/chef_client.html.md
index 202c18b39..6ef1831c5 100644
--- a/website/docs/source/v2/provisioning/chef_client.html.md
+++ b/website/docs/source/v2/provisioning/chef_client.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Chef Client - Provisioning"
 sidebar_current: "provisioning-chefclient"
 ---
 
@@ -31,7 +32,7 @@ that the node can register with the Chef server:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :chef_client do |chef|
+  config.vm.provision "chef_client" do |chef|
     chef.chef_server_url = "http://mychefserver.com:4000/"
     chef.validation_key_path = "validation.pem"
   end
diff --git a/website/docs/source/v2/provisioning/chef_solo.html.md b/website/docs/source/v2/provisioning/chef_solo.html.md
index 4b8027d26..e9bdd6065 100644
--- a/website/docs/source/v2/provisioning/chef_solo.html.md
+++ b/website/docs/source/v2/provisioning/chef_solo.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Chef Solo - Provisioning"
 sidebar_current: "provisioning-chefsolo"
 ---
 
@@ -97,7 +98,7 @@ end
 Just like the cookbooks path, the roles path is relative to the project
 root if a relative path is given.
 
-**Note:** The name of the role file must be the same as the role name. 
+**Note:** The name of the role file must be the same as the role name.
 For example the `web` role must be in the `roles_path` as web.json or web.rb.
 This is required by Chef itself, and isn't a limitation imposed by
 Vagrant.
diff --git a/website/docs/source/v2/provisioning/index.html.md b/website/docs/source/v2/provisioning/index.html.md
index 2479869bc..c083e9438 100644
--- a/website/docs/source/v2/provisioning/index.html.md
+++ b/website/docs/source/v2/provisioning/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Provisioning"
 sidebar_current: "provisioning"
 ---
 
diff --git a/website/docs/source/v2/provisioning/puppet_agent.html.md b/website/docs/source/v2/provisioning/puppet_agent.html.md
index 92e40a62b..dd91ad78f 100644
--- a/website/docs/source/v2/provisioning/puppet_agent.html.md
+++ b/website/docs/source/v2/provisioning/puppet_agent.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Puppet Agent - Provisioning"
 sidebar_current: "provisioning-puppetagent"
 ---
 
diff --git a/website/docs/source/v2/provisioning/puppet_apply.html.md b/website/docs/source/v2/provisioning/puppet_apply.html.md
index 8f6771776..d0f380019 100644
--- a/website/docs/source/v2/provisioning/puppet_apply.html.md
+++ b/website/docs/source/v2/provisioning/puppet_apply.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Puppet Apply - Provisioning"
 sidebar_current: "provisioning-puppetapply"
 ---
 
 # Puppet Apply Provisioner
 
-**Provisioner name: `:puppet`**
+**Provisioner name: `puppet`**
 
 The Puppet provisioner allows you to provision the guest using
 [Puppet](http://www.puppetlabs.com/puppet), specifically by
@@ -26,7 +27,7 @@ enable it:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :puppet
+  config.vm.provision "puppet"
 end
 ```
 
@@ -53,7 +54,7 @@ entry-point with `manifest_file`:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :puppet do |puppet|
+  config.vm.provision "puppet" do |puppet|
     puppet.manifests_path = "my_manifests"
     puppet.manifest_file = "default.pp"
   end
@@ -71,7 +72,7 @@ The manifest file is still used as an entry-point.
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :puppet do |puppet|
+  config.vm.provision "puppet" do |puppet|
     puppet.module_path = "modules"
   end
 end
@@ -87,7 +88,7 @@ can be specified as well:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :puppet do |puppet|
+  config.vm.provision "puppet" do |puppet|
     puppet.facter = {
       "vagrant" => "1"
     }
@@ -106,7 +107,7 @@ flags to use:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :puppet do |puppet|
+  config.vm.provision "puppet" do |puppet|
     puppet.options = "--verbose --debug"
   end
 end
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
index 4a5b078c3..24d3f7571 100644
--- a/website/docs/source/v2/provisioning/shell.html.md
+++ b/website/docs/source/v2/provisioning/shell.html.md
@@ -1,10 +1,11 @@
 ---
+page_title: "Shell Scripts - Provisioning"
 sidebar_current: "provisioning-shell"
 ---
 
 # Shell Provisioner
 
-**Provisioner name: `:shell`**
+**Provisioner name: `"shell"`**
 
 The shell provisioner allows you to upload and execute a script as
 the root user within the guest machine.
@@ -22,8 +23,8 @@ the Vagrantfile. An example is best:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :shell,
-    :inline => "echo Hello, World"
+  config.vm.provision "shell",
+    inline: "echo Hello, World"
 end
 ```
 
@@ -40,7 +41,7 @@ date > /etc/vagrant_provisioned_at
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.provision :shell, :inline => $script
+  config.vm.provision "shell", inline: $script
 end
 ```
 
@@ -62,7 +63,7 @@ into the guest and execute it. An example:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :shell, :path => "script.sh"
+  config.vm.provision "shell", path: "script.sh"
 end
 ```
 
@@ -79,7 +80,7 @@ be sure to properly escape anything:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.provision :shell do |s|
+  config.vm.provision "shell" do |s|
     s.inline = "echo $1"
     s.args   = "'hello, world!'"
   end
diff --git a/website/docs/source/v2/synced-folders/basic_usage.html.md b/website/docs/source/v2/synced-folders/basic_usage.html.md
index 231b4dc14..4bfdfef17 100644
--- a/website/docs/source/v2/synced-folders/basic_usage.html.md
+++ b/website/docs/source/v2/synced-folders/basic_usage.html.md
@@ -1,6 +1,6 @@
 ---
+page_title: "Basic Usage - Synced Folders"
 sidebar_current: "syncedfolder-basic"
-page_title: "Synced Folders - Basic Usage"
 ---
 
 # Basic Usage
@@ -48,5 +48,6 @@ to the SSH user. Sometimes it is preferable to mount folders with a different
 owner and group. It is possible to set these options:
 
 ```ruby
-config.vm.synced_folder "src/", "/srv/website", owner: "root", group: "root"
+config.vm.synced_folder "src/", "/srv/website",
+  owner: "root", group: "root"
 ```
diff --git a/website/docs/source/v2/synced-folders/index.html.md b/website/docs/source/v2/synced-folders/index.html.md
index aeb3c13b8..acf6acf77 100644
--- a/website/docs/source/v2/synced-folders/index.html.md
+++ b/website/docs/source/v2/synced-folders/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Synced Folders"
 sidebar_current: "syncedfolder"
 ---
 
diff --git a/website/docs/source/v2/synced-folders/nfs.html.md b/website/docs/source/v2/synced-folders/nfs.html.md
index 709f446f4..aa61c680c 100644
--- a/website/docs/source/v2/synced-folders/nfs.html.md
+++ b/website/docs/source/v2/synced-folders/nfs.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "NFS - Synced Folders"
 sidebar_current: "syncedfolder-nfs"
 ---
 
@@ -38,13 +39,13 @@ stop the NFS server daemon.
 
 ## Enabling NFS Synced Folders
 
-To enable NFS, just add the `:nfs => true` flag onto your synced folder:
+To enable NFS, just add the `nfs: true` flag onto your synced folder:
 
 ```ruby
 Vagrant.configure("2") do |config|
   # ...
 
-  config.vm.synced_folder ".", "/vagrant", :nfs => true
+  config.vm.synced_folder ".", "/vagrant", nfs: true
 end
 ```
 
diff --git a/website/docs/source/v2/vagrantfile/index.html.md b/website/docs/source/v2/vagrantfile/index.html.md
index 2415ec314..76b37b0de 100644
--- a/website/docs/source/v2/vagrantfile/index.html.md
+++ b/website/docs/source/v2/vagrantfile/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Vagrantfile"
 sidebar_current: "vagrantfile"
 ---
 
diff --git a/website/docs/source/v2/vagrantfile/machine_settings.html.md b/website/docs/source/v2/vagrantfile/machine_settings.html.md
index cbf004d99..868091e70 100644
--- a/website/docs/source/v2/vagrantfile/machine_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/machine_settings.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "config.vm - Vagrantfile"
 sidebar_current: "vagrantfile-machine"
 ---
 
@@ -11,6 +12,11 @@ machine that Vagrant manages.
 
 ## Available Settings
 
+`config.vm.boot_timeout` - The time in seconds that Vagrant will wait
+for the machine to boot and be accessible. By default this is 300 seconds.
+
+<hr>
+
 `config.vm.box` - This configures what [box](/v2/boxes/index.html) the
 machine will be brought up against. The value here should match one of
 the installed boxes on the system.
@@ -23,14 +29,9 @@ URL when `vagrant up` is run.
 
 <hr>
 
-`config.vm.graceful_halt_retry_count` - The number of times to retry
-gracefully shutting down the system when `vagrant halt` is called. Defaults
-to 3.
-
-<hr>
-
-`config.vm.graceful_halt_retry_interval` - The amount of time in between
-each retry of attempting to shut down, in seconds. Defaults to 1 second.
+`config.vm.graceful_halt_timeout` - The time in seconds that Vagrant will
+wait for the machine to gracefully halt when `vagrant halt` is called.
+Defaults to 300 seconds.
 
 <hr>
 
diff --git a/website/docs/source/v2/vagrantfile/ssh_settings.html.md b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
index 398d535bb..ab9149d38 100644
--- a/website/docs/source/v2/vagrantfile/ssh_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "config.ssh - Vagrantfile"
 sidebar_current: "vagrantfile-ssh"
 ---
 
@@ -36,16 +37,6 @@ to use port 4567 to talk to the guest if there is no other option.
 
 <hr>
 
-`config.ssh.max_tries` - Maximum attempts to SSH while waiting for the
-machine to boot. Default is 100.
-
-<hr>
-
-`config.ssh.timeout` - Maximum time to wait while attempting to make
-a single connection via SSH before timing out. Default is 30 seconds.
-
-<hr>
-
 `config.ssh.private_key_path` - The path to the private key to use to
 SSH into the guest machine. By default this is the insecure private key
 that ships with Vagrant, since that is what public boxes use. If you make
diff --git a/website/docs/source/v2/vagrantfile/vagrant_settings.html.md b/website/docs/source/v2/vagrantfile/vagrant_settings.html.md
index 768bc29eb..3e8a0959f 100644
--- a/website/docs/source/v2/vagrantfile/vagrant_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/vagrant_settings.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "config.vagrant - Vagrantfile"
 sidebar_current: "vagrantfile-vagrant"
 ---
 
diff --git a/website/docs/source/v2/vagrantfile/version.html.md b/website/docs/source/v2/vagrantfile/version.html.md
index 9049fbe99..d43b54446 100644
--- a/website/docs/source/v2/vagrantfile/version.html.md
+++ b/website/docs/source/v2/vagrantfile/version.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Configuration Version - Vagrantfile"
 sidebar_current: "vagrantfile-version"
 ---
 
@@ -13,7 +14,9 @@ If you run `vagrant init` today, the Vagranfile will be in roughly the
 following format:
 
 ```ruby
-Vagrant.configure("2") do |config|
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # ...
 end
 ```
diff --git a/website/docs/source/v2/virtualbox/boxes.html.md b/website/docs/source/v2/virtualbox/boxes.html.md
index 5a09f52ea..cd144cbff 100644
--- a/website/docs/source/v2/virtualbox/boxes.html.md
+++ b/website/docs/source/v2/virtualbox/boxes.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Box Format - VirtualBox Provider"
 sidebar_current: "virtualbox-boxes"
 ---
 
diff --git a/website/docs/source/v2/virtualbox/configuration.html.md b/website/docs/source/v2/virtualbox/configuration.html.md
index 064c80c3a..47878b5aa 100644
--- a/website/docs/source/v2/virtualbox/configuration.html.md
+++ b/website/docs/source/v2/virtualbox/configuration.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Configuration - VirtualBox Provider"
 sidebar_current: "virtualbox-configuration"
 ---
 
diff --git a/website/docs/source/v2/virtualbox/index.html.md b/website/docs/source/v2/virtualbox/index.html.md
index 0134924e0..2acc90081 100644
--- a/website/docs/source/v2/virtualbox/index.html.md
+++ b/website/docs/source/v2/virtualbox/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "VirtualBox Provider"
 sidebar_current: "virtualbox"
 ---
 
diff --git a/website/docs/source/v2/virtualbox/usage.html.md b/website/docs/source/v2/virtualbox/usage.html.md
index 5d312d75c..85c0f047f 100644
--- a/website/docs/source/v2/virtualbox/usage.html.md
+++ b/website/docs/source/v2/virtualbox/usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Usage - VirtualBox Provider"
 sidebar_current: "virtualbox-usage"
 ---
 
diff --git a/website/docs/source/v2/vmware/boxes.html.md b/website/docs/source/v2/vmware/boxes.html.md
index 475c00564..60e5b5481 100644
--- a/website/docs/source/v2/vmware/boxes.html.md
+++ b/website/docs/source/v2/vmware/boxes.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Box Format - VMware Provider"
 sidebar_current: "vmware-boxes"
 ---
 
diff --git a/website/docs/source/v2/vmware/configuration.html.md b/website/docs/source/v2/vmware/configuration.html.md
index b7953d684..412a19741 100644
--- a/website/docs/source/v2/vmware/configuration.html.md
+++ b/website/docs/source/v2/vmware/configuration.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Configuration- VMware Provider"
 sidebar_current: "vmware-configuration"
 ---
 
diff --git a/website/docs/source/v2/vmware/index.html.md b/website/docs/source/v2/vmware/index.html.md
index f404fbc04..686ffa3f5 100644
--- a/website/docs/source/v2/vmware/index.html.md
+++ b/website/docs/source/v2/vmware/index.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "VMware Provider"
 sidebar_current: "vmware"
 ---
 
diff --git a/website/docs/source/v2/vmware/installation.html.md b/website/docs/source/v2/vmware/installation.html.md
index 1794b3379..c9a7ca561 100644
--- a/website/docs/source/v2/vmware/installation.html.md
+++ b/website/docs/source/v2/vmware/installation.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Installation - VMware Provider"
 sidebar_current: "vmware-installation"
 ---
 
diff --git a/website/docs/source/v2/vmware/known-issues.html.md b/website/docs/source/v2/vmware/known-issues.html.md
index 64d75b3c0..acb31a254 100644
--- a/website/docs/source/v2/vmware/known-issues.html.md
+++ b/website/docs/source/v2/vmware/known-issues.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Known Issues - VMware Provider"
 sidebar_current: "vmware-known-issues"
 ---
 
@@ -8,23 +9,6 @@ This page tracks some known issues or limitations of the VMware providers.
 Note that none of these are generally blockers to using the provider, but
 are good to know.
 
-## vmnet Device Cleanup
-
-When creating a private network with VMware, the Vagrant provider will
-create a new `vmnet` device for your IP/subnet if one doesn't already exist.
-Vagrant currently never cleans up unused `vmnet` devices. This must be
-done manually via the VMware network editor.
-
-In practice, this is not an issue because there are really only
-[three IPv4 address spaces](http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces)
-that can be used for these networks, so not many extraneous vmnet devices
-are left lying around.
-
-However, if you use automatically generated IP addresses that use many
-subnets, you may find that there are many extra vmnet devices. Manually
-remove these for now. A future release of the provider will address this
-limitation in some way.
-
 ## Forwarded Ports Failing in Workstation on Windows
 
 VMware Workstation has a bug on Windows where forwarded ports don't work
diff --git a/website/docs/source/v2/vmware/usage.html.md b/website/docs/source/v2/vmware/usage.html.md
index d0ad40b5b..bf1a5e575 100644
--- a/website/docs/source/v2/vmware/usage.html.md
+++ b/website/docs/source/v2/vmware/usage.html.md
@@ -1,4 +1,5 @@
 ---
+page_title: "Usage - VMware Provider"
 sidebar_current: "vmware-usage"
 ---