dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the help message and comments to use config.yml

This commit is contained in:
Nick Quaranto 2009-04-23 18:24:52 -04:00
parent dd268fae95
commit 563933f114
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/jekyll
View File

@ -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

4
lib/jekyll.rb
View File

@ -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