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

Merge pull request #934 from mojombo/auto-to-watch 

Backwards-compatibility for 'auto'
This commit is contained in:
Parker Moore 2013-04-07 13:38:42 -07:00
parent b5d1b4e344 ae462afb76
commit 659ad36329
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll.rb
View File

@ -152,6 +152,13 @@ module Jekyll
config = {} config = {}
end end
# Provide backwards-compatibility
if config['auto']
$stderr.puts "Deprecation: ".rjust(20) + "'auto' has been changed to " +
"'watch'. Please update your configuration to use 'watch'."
config['watch'] = config['auto']
end
# Merge DEFAULTS < _config.yml < override # Merge DEFAULTS < _config.yml < override
Jekyll::DEFAULTS.deep_merge(config).deep_merge(override) Jekyll::DEFAULTS.deep_merge(config).deep_merge(override)
end end