diff --git a/website/docs/Gemfile b/website/docs/Gemfile
index 5f8d1e016..4a2399f5d 100644
--- a/website/docs/Gemfile
+++ b/website/docs/Gemfile
@@ -5,7 +5,7 @@ gem "middleman", "~> 3.0.6"
 gem "middleman-minify-html", "~> 3.0.0"
 gem "rack-contrib", "~> 1.1.0"
 gem "redcarpet", "~> 2.2.2"
-gem "rb-inotify", "~> 0.9"
+gem "rb-inotify", "~> 0.9", require: false
 gem "therubyracer", "~> 0.12.0"
 gem "thin", "~> 1.5.0"
 
diff --git a/website/docs/Gemfile.lock b/website/docs/Gemfile.lock
index c88f8653b..7e3a024b4 100644
--- a/website/docs/Gemfile.lock
+++ b/website/docs/Gemfile.lock
@@ -1,42 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
-    Platform (0.4.0)
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    chunky_png (1.2.8)
+    chunky_png (1.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
     commonjs (0.2.7)
-    compass (0.12.2)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
     daemons (1.1.9)
     eventmachine (1.0.3)
-    execjs (1.4.0)
+    execjs (1.4.1)
       multi_json (~> 1.0)
-    ffi (1.9.3)
-    fssm (0.2.10)
-    haml (4.0.3)
+    ffi (1.9.6)
+    haml (4.0.5)
       tilt
-    highline (1.6.19)
+    highline (1.6.21)
     hike (1.2.3)
-    htmlcompressor (0.0.7)
-      yui-compressor (~> 0.9.6)
+    htmlcompressor (0.1.2)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
     i18n (0.6.1)
     less (2.2.2)
       commonjs (~> 0.2.6)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.7)
     listen (0.7.3)
     maruku (0.6.1)
       syntax (>= 1.0.0)
@@ -74,8 +76,7 @@ GEM
       sprockets (~> 2.1)
       sprockets-helpers (~> 1.0.0)
       sprockets-sass (~> 1.0.0)
-    multi_json (1.8.0)
-    open4 (1.3.0)
+    multi_json (1.10.1)
     padrino-core (0.10.7)
       activesupport (~> 3.2.0)
       http_router (~> 0.10.2)
@@ -88,32 +89,32 @@ GEM
     rack (1.4.5)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.3)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (2.2.2)
     ref (1.0.5)
-    sass (3.2.10)
+    sass (3.4.6)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.10.0)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.0.1)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.1)
+    sprockets-sass (1.0.3)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    syntax (1.0.0)
-    therubyracer (0.12.0)
+    syntax (1.2.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thin (1.5.1)
@@ -127,8 +128,6 @@ GEM
       multi_json (~> 1.3)
     url_mount (0.2.1)
       rack
-    yui-compressor (0.9.6)
-      POpen4 (>= 0.1.4)
 
 PLATFORMS
   ruby
diff --git a/website/docs/source/v2/cli/up.html.md b/website/docs/source/v2/cli/up.html.md
index fdbbcccbb..a0408a9a6 100644
--- a/website/docs/source/v2/cli/up.html.md
+++ b/website/docs/source/v2/cli/up.html.md
@@ -21,7 +21,8 @@ on a day-to-day basis.
   By default this is set.
 
 * `--[no-]parallel` - Bring multiple machines up in parallel if the provider
-  supports it.
+  supports it. Please consult the provider documentation to see if this feature
+  is supported.
 
 * `--provider x` - Bring the machine up with the given
   [provider](/v2/providers/index.html). By default this is "virtualbox".
diff --git a/website/docs/source/v2/virtualbox/usage.html.md b/website/docs/source/v2/virtualbox/usage.html.md
index 85c0f047f..282cbc6d3 100644
--- a/website/docs/source/v2/virtualbox/usage.html.md
+++ b/website/docs/source/v2/virtualbox/usage.html.md
@@ -5,8 +5,11 @@ sidebar_current: "virtualbox-usage"
 
 # Usage
 
-The VirtualBox provider is used just like any other provider. Please
+The Vagrant VirtualBox provider is used just like any other provider. Please
 read the general [basic usage](/v2/providers/basic_usage.html) page for
 providers.
 
 The value to use for the `--provider` flag is `virtualbox`.
+
+The Vagrant VirtualBox provider does not support parallel execution at this
+time. Specifying the `--parallel` option will have no effect.
diff --git a/website/docs/source/v2/vmware/usage.html.md b/website/docs/source/v2/vmware/usage.html.md
index bf1a5e575..8771d1276 100644
--- a/website/docs/source/v2/vmware/usage.html.md
+++ b/website/docs/source/v2/vmware/usage.html.md
@@ -5,13 +5,16 @@ sidebar_current: "vmware-usage"
 
 # Usage
 
-The VMware providers are used just like any other provider. Please
+The Vagrant VMware providers are used just like any other provider. Please
 read the general [basic usage](/v2/providers/basic_usage.html) page for
 providers.
 
 The value to use for the `--provider` flag is `vmware_fusion` for VMware
 Fusion, and `vmware_workstation` for VMware Workstation.
 
+The Vagrant VMWare provider does not support parallel execution at this time.
+Specifying the `--parallel` option will have no effect.
+
 <p>
 To get started, a 64-bit Ubuntu 12.04 LTS VMware box is available at:
 <a href="http://files.vagrantup.com/precise64_vmware.box">http://files.vagrantup.com/precise64_vmware.box</a>