diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 4bc41682..d6856bb1 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -3,8 +3,8 @@
 module Jekyll
   class Configuration < Hash
 
-    # Default options. Overriden by values in _config.yml.
-    # Strings rather than symbols are used for compatability with YAML.
+    # Default options. Overridden by values in _config.yml.
+    # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = {
       'source'        => Dir.pwd,
       'destination'   => File.join(Dir.pwd, '_site'),
diff --git a/test/test_post.rb b/test/test_post.rb
index 1d7b8539..b28af071 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -535,7 +535,7 @@ class TestPost < Test::Unit::TestCase
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
     
-    should "process .text as indentity under default configuration" do
+    should "process .text as identity under default configuration" do
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Identity