Merge remote-tracking branch 'upstream/master'

hkrishna · hkrishna · commit 9803fa79a8dd · 2012-06-23T22:29:58.000-04:00
* upstream/master:
  Use a ts query parameter so google analytics tracks pages correctly
diff --git a/Rakefile b/Rakefile
@@ -26,7 +26,7 @@ task :update_toc do
     end
     temp.puts "<!--- BEGIN TOC -->"
     pages.each_with_index do |page, index|
-      temp.puts "* [#{page.data["title"]}](#{page.destination('')}?#{File.mtime(File.join(FileUtils.pwd, "pages", page.name)).to_i})"
+      temp.puts "* [#{page.data["title"]}](#{page.destination('')}?ts=#{File.mtime(File.join(FileUtils.pwd, "pages", page.name)).to_i})"
     end
     temp.puts "<!--- END TOC -->"
     FileUtils.mv(temp.path, toc_path)
diff --git a/index.md b/index.md
@@ -17,21 +17,21 @@ This project originated as a full-blown rails app backed by a database, and I re
 
 All Tutorials
 -------------
-You can [browse all tutorials here](/pages/table-of-contents.html?1340490172).
+You can [browse all tutorials here](/pages/table-of-contents.html?1340499018).
 
 Newest Tutorials
 ----------------
-* [Controlling EC2 from the Console](/pages/controlling-ec2-from-the-console.html?1340490172)
-* [Creating a Production Storm Cluster](/pages/creating-a-production-storm-cluster.html?1340487894)
-* [Retrieving Storm Cluster Statistics from Nimbus](/pages/retrieving-storm-data-from-nimbus.html?1340398351)
-* [Installing MySQL](/pages/installing-mysql.html?1339980010)
-* [Hello, World!](/pages/hello-world.html?1339978842)
+* [Controlling EC2 from the Console](/pages/controlling-ec2-from-the-console.html?ts=1340499018)
+* [Creating a Production Storm Cluster](/pages/creating-a-production-storm-cluster.html?ts=1340499018)
+* [Retrieving Storm Cluster Statistics from Nimbus](/pages/retrieving-storm-data-from-nimbus.html?ts=1340499018)
+* [Installing MySQL](/pages/installing-mysql.html?ts=1340499018)
+* [Hello, World!](/pages/hello-world.html?ts=1340499018)
 
 Examples
 --------
-* [Installing MySQL](/pages/installing-mysql.html?1339980010)
-* [Hello, World!](/pages/hello-world.html?1339978842)
-* [Syntax explanation](/pages/explanation.html?1340248769)
+* [Installing MySQL](/pages/installing-mysql.html?ts=1340499018)
+* [Hello, World!](/pages/hello-world.html?ts=1340499018)
+* [Syntax explanation](/pages/explanation.html?1340499018)
 
 Contributing
 ------------
diff --git a/pages/table-of-contents.md b/pages/table-of-contents.md
@@ -9,9 +9,9 @@ ignore: true
 <!-- THIS FILE IS GENERATED; PLEASE DO NOT EDIT THIS FILE BY HAND -->
 
 <!--- BEGIN TOC -->
-* [Controlling EC2 from the Console](/pages/controlling-ec2-from-the-console.html?1340492287)
-* [Creating a Production Storm Cluster](/pages/creating-a-production-storm-cluster.html?1340487894)
-* [Retrieving Storm Cluster Statistics from Nimbus](/pages/retrieving-storm-data-from-nimbus.html?1340398351)
-* [Installing MySQL](/pages/installing-mysql.html?1339980010)
-* [Hello, World!](/pages/hello-world.html?1339978842)
+* [Controlling EC2 from the Console](/pages/controlling-ec2-from-the-console.html?ts=1340499018)
+* [Creating a Production Storm Cluster](/pages/creating-a-production-storm-cluster.html?ts=1340499018)
+* [Retrieving Storm Cluster Statistics from Nimbus](/pages/retrieving-storm-data-from-nimbus.html?ts=1340499018)
+* [Installing MySQL](/pages/installing-mysql.html?ts=1340499018)
+* [Hello, World!](/pages/hello-world.html?ts=1340499018)
 <!--- END TOC -->
