merge

Gemfile

@@ -14,6 +14,7 @@ gem "susy", "2.0.0.alpha.4"
 gem "breakpoint"
 gem "typogruby"
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+gem 'rack-rewrite'
 platforms :mri_18 do
   gem "ruby18_source_location"
 end

Gemfile.lock

@@ -81,6 +81,7 @@ GEM
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
+    rack-rewrite (1.4.01)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.1.0)
@@ -127,6 +128,7 @@ DEPENDENCIES
   middleman-favicon-maker
   middleman-livereload
   middleman-syntax
+  rack-rewrite
   rake
   redcarpet
   ruby18_source_location

config.rb

@@ -2,6 +2,8 @@ require "builder"
 require 'susy'
 require 'breakpoint'
 require 'middleman-syntax'
+require 'rack/rewrite'
+
 # TODO: Make this work
 # require "kss"
 # require 'typogruby'
@@ -62,6 +64,11 @@ end
 
 page "/documentation/*", :directory_index => false
 
+use Rack::Rewrite do
+  r301 %r{/docs/yardoc/(.*)}, '/documentation/$1'
+  r301 %r{/tutorial\.html}, '/guide'
+  r301 %r{/download\.html}, '/install'
+end
 
 
 configure :build do

source/install.haml

@@ -104,11 +104,10 @@ layout: layout_1_column
               %pre
                 :preserve
                   sass -v
-              %p
-                It should return
-                <code>Sass #{data.version.number}
-                (#{data.version.name})</code>.
-                Congratulations! You've successfully installed Sass.
+              - if data.respond_to?(:version)
+                %p It should return <code>Sass #{data.version.number} (#{data.version.name})</code>. Congratulations! You've successfully installed Sass.
+              - else
+                %p It should return <code>Sass ???</code>. Congratulations! You've successfully installed Sass.
 
             %li
               %p

source/layouts/foot/_javascripts.haml

@@ -12,4 +12,4 @@
   e=o.createElement(i);r=o.getElementsByTagName(i)[0];
   e.src='//www.google-analytics.com/analytics.js';
   r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-  ga('create','UA-XXXXX-X');ga('send','pageview');
+  ga('create','UA-535380-8');ga('send','pageview');

source/layouts/layout.haml

@@ -33,7 +33,7 @@
               %li Current Release: <span class="release-name">#{data.version.name} (#{data.version.number})</span>
             - else
               %li Current Release: <span class="release-name">???</span>
-            %li=link_to "Release Notes", "http://sass-lang.com/docs/yardoc/file.SASS_CHANGELOG.html"
+            %li=link_to "Release Notes", "/documentation/file.SASS_CHANGELOG.html"
             %li=link_to "Fork on Github", "https://github.com/nex3/sass"
 
       - if content_for?(:section_bottom)