From 563933f114e08697d13b7730d007f6b4567485f9 Mon Sep 17 00:00:00 2001
From: Nick Quaranto <nick@quaran.to>
Date: Thu, 23 Apr 2009 18:24:52 -0400
Subject: [PATCH] Update the help message and comments to use config.yml

---
 bin/jekyll    | 4 ++--
 lib/jekyll.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 1f3cc567..25db1471 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -10,7 +10,7 @@ Basic Command Line Usage:
   jekyll <path to write generated site>                    # . -> <path>
   jekyll <path to source> <path to write generated site>   # <path> -> <path>
 
-  Configuration is read from '<source>/_config.yaml' but can be overriden
+  Configuration is read from '<source>/_config.yml' but can be overriden
   using the following options:
 
 HELP
@@ -137,4 +137,4 @@ if options['server']
 
   trap("INT") { s.shutdown }
   t.join()
-end
\ No newline at end of file
+end
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index e7d4fe53..03366935 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -27,7 +27,7 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  # Default options. Overriden by values in _config.yaml or command-line opts.
+  # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML)
   DEFAULTS = {
     'auto'         => false,
@@ -61,7 +61,7 @@ module Jekyll
     # then, we need to know where to look for _config.yml
     source = override['source'] || Jekyll::DEFAULTS['source']
 
-    # Get configuration from <source>/_config.yaml
+    # Get configuration from <source>/_config.yml
     config = {}
     config_file = File.join(source, '_config.yml')
     begin