diff --git a/_includes/foot.html b/_includes/foot.html
index 9ca76dbd8..dffffb304 100644
--- a/_includes/foot.html
+++ b/_includes/foot.html
@@ -1,4 +1,5 @@
   <script src="assets/highlight.min.js"></script>
+  <script src="assets/script.js"></script>
   <script>
     hljs.configure({classPrefix: ''});
     hljs.initHighlightingOnLoad();
diff --git a/assets/script.js b/assets/script.js
new file mode 100644
index 000000000..c71878693
--- /dev/null
+++ b/assets/script.js
@@ -0,0 +1,17 @@
+(function () {
+  var tags = document.querySelectorAll('h1,h2,h3,h4,h5,h6,li,p,span');
+
+  for (var i=0, len=tags.length; i<len; i++) {
+    var tag = tags[i];
+    if ((~tag.innerHTML.indexOf('>') ||
+      (!tag.innerHTML.match(/https?:\/\//))))
+      continue;
+    tag.innerHTML = tag.innerHTML.replace(/https?:\/\/[^ ]*/g, function (url) {
+      url = url.replace(/[\.\),!]*$/, '');
+      var label = url;
+      label = label.replace(/^https?:\/\//, '')
+        .replace(/\/$/, '');
+      return "<a href='"+url+"'>"+label+"</a>";
+    });
+  }
+})();
diff --git a/jasmine.md b/jasmine.md
index d1cd966fd..3c42c1464 100644
--- a/jasmine.md
+++ b/jasmine.md
@@ -3,8 +3,6 @@ title: Jasmine
 layout: default
 ---
 
-[Jasmine](http://pivotal.github.com/jasmine/).
-
     describe("A suite", function() {
       it("contains spec with an expectation", function() {
         expect(true).toBe(true);
@@ -133,3 +131,7 @@ Jasmine jQuery
     $('#some_element').click();
     expect('click').toHaveBeenPreventedOn($('#some_element'));
     expect('click').toHaveBeenTriggeredOn($('#some_element'));
+
+### Reference
+
+ * http://pivotal.github.com/jasmine/
diff --git a/mocha.md b/mocha.md
index ea7eef158..3ab240d0d 100644
--- a/mocha.md
+++ b/mocha.md
@@ -1,6 +1,6 @@
 ---
 title: Mocha.js
-layout: Default
+layout: default
 ---
 
 ### BDD
@@ -34,3 +34,8 @@ layout: Default
     foo.should.have.length(3);
     tea.should.have.property('flavors').with.length(3);
 
+### See also
+
+ * [Chai](chai.html)
+ * [Sinon](sinon.html)
+ * [Sinon Chai](sinon-chai.html)
diff --git a/rails-features.md b/rails-features.md
index 8ad1b1761..bdab38233 100644
--- a/rails-features.md
+++ b/rails-features.md
@@ -3,14 +3,12 @@ title: Rails features
 layout: default
 ---
 
-### Caching
-
-https://github.com/rails/actionpack-page_caching
+### [Page caching](https://github.com/rails/actionpack-page_caching)
 
     class WeblogController < ActionController::Base
       caches_page :show, :new
     end
 
-This will generate cache files such as weblog/show/5.html and weblog/new.html, 
-     which match the URLs used that would normally trigger dynamic page 
-     generation
+This will generate cache files such as `weblog/show/5.html` and 
+`weblog/new.html`, which match the URLs used that would normally trigger dynamic 
+page generation