Permalink
Browse files

Update the help message and comments to use config.yml

  • Loading branch information...
qrush committed Apr 23, 2009
1 parent dd268fa commit 563933f114e08697d13b7730d007f6b4567485f9
Showing with 4 additions and 4 deletions.
  1. +2 −2 bin/jekyll
  2. +2 −2 lib/jekyll.rb
View
@@ -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
+end
View
@@ -27,7 +27,7 @@
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 @@ def self.configuration(override)
# 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

0 comments on commit 563933f

Please sign in to comment.