From bdda3a8ef691b557b54cdd41e68feb434149a272 Mon Sep 17 00:00:00 2001
From: Pascal Borreli <pascal@borreli.com>
Date: Sat, 4 Jan 2014 14:17:38 +0000
Subject: [PATCH] Fixed typos

---
 lib/jekyll/commands/serve.rb | 2 +-
 lib/jekyll/convertible.rb    | 2 +-
 lib/jekyll/filters.rb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 8e8d00bb..70b30723 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -23,7 +23,7 @@ module Jekyll
         if options['detach'] # detach the server
           pid = Process.fork { s.start }
           Process.detach(pid)
-          Jekyll.logger.info "Server detatched with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
+          Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
         else # create a new server thread, then join it with current terminal
           t = Thread.new { s.start }
           trap("INT") { s.shutdown }
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 397383e5..f838d29b 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -21,7 +21,7 @@ module Jekyll
       self.content || ''
     end
 
-    # Returns merged optin hash for File.read of self.site (if exists)
+    # Returns merged option hash for File.read of self.site (if exists)
     # and a given param
     def merged_file_read_opts(opts)
       (self.site ? self.site.file_read_opts : {}).merge(opts)
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 6ee1b524..18e5935b 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -124,7 +124,7 @@ module Jekyll
       input.split.length
     end
 
-    # Join an array of things into a string by separating with commes and the
+    # Join an array of things into a string by separating with commas and the
     # word "and" for the last one.
     #
     # array - The Array of Strings to join.