Skip to content

Commit

Permalink
Merge pull request #934 from mojombo/auto-to-watch
Browse files Browse the repository at this point in the history
Backwards-compatibility for 'auto'
  • Loading branch information
parkr committed Apr 7, 2013
2 parents b5d1b4e + ae462af commit 659ad36
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions lib/jekyll.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ def self.configuration(override)
config = {}
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
Jekyll::DEFAULTS.deep_merge(config).deep_merge(override)
end
Expand Down

0 comments on commit 659ad36

Please sign in to comment.