From 5e666bfe6b1874c3935d00c56d1e05fdc4cd66ef Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 20 May 2012 16:36:03 -0500
Subject: [PATCH 1/4] Category directory can be set to root directory. Closes
 #331 #369

---
 plugins/category_generator.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb
index 33734e0..60ebd4e 100644
--- a/plugins/category_generator.rb
+++ b/plugins/category_generator.rb
@@ -106,9 +106,14 @@ module Jekyll
     # Loops through the list of category pages and processes each one.
     def write_category_indexes
       if self.layouts.key? 'category_index'
-        dir = self.config['category_dir'] || 'categories'
+        dir = self.config['category_dir']
         self.categories.keys.each do |category|
-          self.write_category_index(File.join(dir, category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase), category)
+          category_slug = category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase
+          if dir.nil? or dir.empty?
+            self.write_category_index(category_slug, category)
+          else
+            self.write_category_index(File.join(dir, category_slug), category)
+          end
         end
 
       # Throw an exception if the layout couldn't be found.
@@ -145,7 +150,11 @@ module Jekyll
     def category_links(categories)
       dir = @context.registers[:site].config['category_dir']
       categories = categories.sort!.map do |item|
-        "<a class='category' href='/#{dir}/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
+        if dir.nil? or dir.empty?
+          "<a class='category' href='/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
+        else
+          "<a class='category' href='/#{dir}/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
+        end
       end
 
       case categories.length

From c06ba5846698e4ff8f3135dfc6266a8db889fc58 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 20 May 2012 16:43:06 -0500
Subject: [PATCH 2/4] removed some duplication from category url generation

---
 plugins/category_generator.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb
index 60ebd4e..d8d9b77 100644
--- a/plugins/category_generator.rb
+++ b/plugins/category_generator.rb
@@ -150,11 +150,9 @@ module Jekyll
     def category_links(categories)
       dir = @context.registers[:site].config['category_dir']
       categories = categories.sort!.map do |item|
-        if dir.nil? or dir.empty?
-          "<a class='category' href='/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
-        else
-          "<a class='category' href='/#{dir}/#{item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{item}</a>"
-        end
+        url = item.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase
+        url = "#{dir}/#{url}" unless dir.nil? or dir.empty?
+        "<a class='category' href='/#{url}/'>#{item}</a>"
       end
 
       case categories.length

From e334e832de4ca8330e67412884099a0ffd878017 Mon Sep 17 00:00:00 2001
From: Nathan Manzi <nathan@nmanzi.com>
Date: Sat, 14 Jan 2012 14:44:39 +0800
Subject: [PATCH 3/4] Added disqus developer mode functionality

Signed-off-by: Brandon Mathis <brandon@imathis.com>
---
 .themes/classic/source/_includes/disqus.html | 1 +
 _config.yml                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html
index eb30877..3321666 100644
--- a/.themes/classic/source/_includes/disqus.html
+++ b/.themes/classic/source/_includes/disqus.html
@@ -2,6 +2,7 @@
 {% if site.disqus_short_name and page.comments != false %}
 <script type="text/javascript">
       var disqus_shortname = '{{ site.disqus_short_name }}';
+			var disqus_developer = '{{ site.disqus_developer }}';
       {% if page.comments == true %}
         {% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
         // var disqus_developer = 1;
diff --git a/_config.yml b/_config.yml
index 3325044..5d3df5e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -99,6 +99,7 @@ delicious_count: 3
 # Disqus Comments
 disqus_short_name:
 disqus_show_comment_count: false
+disqus_developer: 0
 
 # Google Analytics
 google_analytics_tracking_id:

From c7d74c0d82bb4be6884f2f2e379ee928bc61c44e Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 20 May 2012 17:27:18 -0500
Subject: [PATCH 4/4] Added instruction regarding management of _deploy/ for
 GitHub pages users. Removed preview mode check from deploy script

---
 Rakefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index ed8475e..18a0b00 100644
--- a/Rakefile
+++ b/Rakefile
@@ -215,12 +215,6 @@ end
 
 desc "Default deploy task"
 task :deploy do
-  # Check if preview posts exist, which should not be published
-  if File.exists?(".preview-mode")
-    puts "## Found posts in preview mode, regenerating files ..."
-    File.delete(".preview-mode")
-    Rake::Task[:generate].execute
-  end
   Rake::Task[:copydot].invoke(source_dir, public_dir)
   Rake::Task["#{deploy_default}"].execute
 end
@@ -392,6 +386,8 @@ task :setup_github_pages, :repo do |t, args|
     puts "Finally, follow the guide at http://help.github.com/pages/#custom_domains for help pointing your domain to Github Pages"
   end
   puts "Deploy to #{repo_url} with `rake deploy`"
+  puts "Note: generated content is copied into _deploy/ which is not in version control."
+  puts "If starting with a fresh clone of this project you should re-run setup_github_pages."
   puts "========================================================"
 end