From c6eeffec3be7f1f469e88f8591fa183f857c4474 Mon Sep 17 00:00:00 2001
From: nverba <distantstate@gmail.com>
Date: Mon, 25 Feb 2013 17:16:53 +0000
Subject: [PATCH 1/2] Update config/routes.rb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Facebook and Twitter controllers are no longer defined. 
---
 config/routes.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index a9c53587ac3..8229cd2e43e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -118,12 +118,6 @@ Discourse::Application.routes.draw do
   match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete"
   match "/auth/failure", to: "users/omniauth_callbacks#failure"
 
-  get 'twitter/frame' => 'twitter#frame'
-  get 'twitter/complete' => 'twitter#complete'
-
-  get 'facebook/frame' => 'facebook#frame'
-  get 'facebook/complete' => 'facebook#complete'
-
   resources :clicks do
     collection do
       get 'track'

From 5016657506febfd4e40d5766b25382cfe9f03d43 Mon Sep 17 00:00:00 2001
From: nverba <distantstate@gmail.com>
Date: Mon, 25 Feb 2013 17:32:19 +0000
Subject: [PATCH 2/2] Fixed broken link to Vagrant Docs

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3e3ffe6bd8b..18f83e6a338 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# See https://github.com/discourse/core/blob/master/DEVELOPMENT.md
+# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
 #
 Vagrant::Config.run do |config|
   config.vm.box = 'discourse-pre'