From e9a28b02a55ecfd2b9006386ec8ece135f068cfb Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Wed, 8 Oct 2014 22:01:20 +0200
Subject: [PATCH] Remove Vagrant constants

---
 templates/commands/init/Vagrantfile.erb            | 5 +----
 templates/commands/init/Vagrantfile.min.erb        | 5 +----
 website/docs/Vagrantfile                           | 5 +----
 website/docs/source/v2/vagrantfile/version.html.md | 4 +---
 website/www/Vagrantfile                            | 5 +----
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/templates/commands/init/Vagrantfile.erb b/templates/commands/init/Vagrantfile.erb
index 7c8d05709..0a9f8e219 100644
--- a/templates/commands/init/Vagrantfile.erb
+++ b/templates/commands/init/Vagrantfile.erb
@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure(2) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
diff --git a/templates/commands/init/Vagrantfile.min.erb b/templates/commands/init/Vagrantfile.min.erb
index a1f886d47..6120ce0e4 100644
--- a/templates/commands/init/Vagrantfile.min.erb
+++ b/templates/commands/init/Vagrantfile.min.erb
@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure(2) do |config|
   config.vm.box = "<%= box_name %>"
   <% if box_url -%>
   config.vm.box_url = "<%= box_url %>"
diff --git a/website/docs/Vagrantfile b/website/docs/Vagrantfile
index 7e26cbed8..7ce24fe70 100644
--- a/website/docs/Vagrantfile
+++ b/website/docs/Vagrantfile
@@ -1,9 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
 $script = <<SCRIPT
 sudo apt-get -y update
 sudo apt-get -y install curl
@@ -16,7 +13,7 @@ cd /vagrant
 bundle
 SCRIPT
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure(2) do |config|
   config.vm.box = "hashicorp/precise64"
   config.vm.network "private_network", ip: "33.33.33.10"
   config.vm.provision "shell", inline: $script, privileged: false
diff --git a/website/docs/source/v2/vagrantfile/version.html.md b/website/docs/source/v2/vagrantfile/version.html.md
index fc2503c51..326128849 100644
--- a/website/docs/source/v2/vagrantfile/version.html.md
+++ b/website/docs/source/v2/vagrantfile/version.html.md
@@ -14,9 +14,7 @@ If you run `vagrant init` today, the Vagrantfile will be in roughly the
 following format:
 
 ```ruby
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure(2) do |config|
   # ...
 end
 ```
diff --git a/website/www/Vagrantfile b/website/www/Vagrantfile
index 7e26cbed8..7ce24fe70 100644
--- a/website/www/Vagrantfile
+++ b/website/www/Vagrantfile
@@ -1,9 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
 $script = <<SCRIPT
 sudo apt-get -y update
 sudo apt-get -y install curl
@@ -16,7 +13,7 @@ cd /vagrant
 bundle
 SCRIPT
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure(2) do |config|
   config.vm.box = "hashicorp/precise64"
   config.vm.network "private_network", ip: "33.33.33.10"
   config.vm.provision "shell", inline: $script, privileged: false