From 31c65c56f4989435301eee622ee375cee4bf2de2 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 18 Jun 2010 15:47:01 -0700
Subject: [PATCH] Extension -> Plugin

---
 History.txt                            | 2 ++
 lib/jekyll.rb                          | 4 ++--
 lib/jekyll/converter.rb                | 2 +-
 lib/jekyll/generator.rb                | 2 +-
 lib/jekyll/{extension.rb => plugin.rb} | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename lib/jekyll/{extension.rb => plugin.rb} (94%)

diff --git a/History.txt b/History.txt
index 31d9ab59..daef64d3 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,6 @@
 == Edge
+  * Major Enhancements
+    * Proper plugin system (#19, #100)
   * Minor Enhancements
     * Inclusion/exclusion of future dated posts (#59)
     * Generation for a specific time (#59)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index a9b98f04..dfedd4cd 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -35,8 +35,8 @@ require 'jekyll/filters'
 require 'jekyll/albino'
 require 'jekyll/static_file'
 
-#extensions
-require 'jekyll/extension'
+# extensions
+require 'jekyll/plugin'
 require 'jekyll/converter'
 require 'jekyll/generator'
 require_all 'jekyll/converters'
diff --git a/lib/jekyll/converter.rb b/lib/jekyll/converter.rb
index 4f46719a..61398bf1 100644
--- a/lib/jekyll/converter.rb
+++ b/lib/jekyll/converter.rb
@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Converter < Extension
+  class Converter < Plugin
     # Public: Get or set the pygments prefix. When an argument is specified,
     # the prefix will be set. If no argument is specified, the current prefix
     # will be returned.
diff --git a/lib/jekyll/generator.rb b/lib/jekyll/generator.rb
index 318267c5..f1cd1a58 100644
--- a/lib/jekyll/generator.rb
+++ b/lib/jekyll/generator.rb
@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Generator < Extension
+  class Generator < Plugin
 
   end
 
diff --git a/lib/jekyll/extension.rb b/lib/jekyll/plugin.rb
similarity index 94%
rename from lib/jekyll/extension.rb
rename to lib/jekyll/plugin.rb
index e8f4b82d..899a6235 100644
--- a/lib/jekyll/extension.rb
+++ b/lib/jekyll/plugin.rb
@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Extension
+  class Plugin
     PRIORITIES = { :lowest => -100,
                    :low => -10,
                    :normal => 0,
@@ -49,7 +49,7 @@ module Jekyll
       PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
     end
 
-    # Initialize a new extension. This should be overridden by the subclass.
+    # Initialize a new plugin. This should be overridden by the subclass.
     #
     # config - The Hash of configuration options.
     #