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

Merge pull request #3535 from delftswa2014/deprecation-inconsistency 

Removed deprecation inconsistency
This commit is contained in:
Alfred Xing 2015-03-02 15:04:21 -08:00
parent 48bf711ec7 7a31029c79
commit 27a02e163b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/commands/doctor.rb
View File

@ -39,7 +39,7 @@ module Jekyll
contains_deprecated_pages = false contains_deprecated_pages = false
site.pages.each do |page| site.pages.each do |page|
if page.uses_relative_permalinks if page.uses_relative_permalinks
Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" + Jekyll::Deprecator.deprecation_message "'#{page.path}' uses relative" +
" permalinks which will be deprecated in" + " permalinks which will be deprecated in" +
" Jekyll v2.0.0 and beyond." " Jekyll v2.0.0 and beyond."
contains_deprecated_pages = true contains_deprecated_pages = true

10
lib/jekyll/configuration.rb
View File

@ -206,7 +206,7 @@ module Jekyll
config = clone config = clone
# Provide backwards-compatibility # Provide backwards-compatibility
if config.key?('auto') || config.key?('watch') if config.key?('auto') || config.key?('watch')
Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" + Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" +
" be set from your configuration file(s). Use the"+ " be set from your configuration file(s). Use the"+
" --[no-]watch/-w command-line option instead." " --[no-]watch/-w command-line option instead."
config.delete('auto') config.delete('auto')
@ -214,14 +214,14 @@ module Jekyll
end end
if config.key? 'server' if config.key? 'server'
Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" + Jekyll::Deprecator.deprecation_message "The 'server' configuration option" +
" is no longer accepted. Use the 'jekyll serve'" + " is no longer accepted. Use the 'jekyll serve'" +
" subcommand to serve your site with WEBrick." " subcommand to serve your site with WEBrick."
config.delete('server') config.delete('server')
end end
if config.key? 'server_port' if config.key? 'server_port'
Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" + Jekyll::Deprecator.deprecation_message "The 'server_port' configuration option" +
" has been renamed to 'port'. Please update your config" + " has been renamed to 'port'. Please update your config" +
" file accordingly." " file accordingly."
# copy but don't overwrite: # copy but don't overwrite:
@ -230,7 +230,7 @@ module Jekyll
end end
if config.key? 'pygments' if config.key? 'pygments'
Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" + Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" +
" has been renamed to 'highlighter'. Please update your" + " has been renamed to 'highlighter'. Please update your" +
" config file accordingly. The allowed values are 'rouge', " + " config file accordingly. The allowed values are 'rouge', " +
"'pygments' or null." "'pygments' or null."
@ -241,7 +241,7 @@ module Jekyll
%w[include exclude].each do |option| %w[include exclude].each do |option|
if config.fetch(option, []).is_a?(String) if config.fetch(option, []).is_a?(String)
Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" + Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" +
" must now be specified as an array, but you specified" + " must now be specified as an array, but you specified" +
" a string. For now, we've treated the string you provided" + " a string. For now, we've treated the string you provided" +
" as a list of comma-separated values." " as a list of comma-separated values."

2
lib/jekyll/site.rb
View File

@ -471,7 +471,7 @@ module Jekyll
def relative_permalinks_deprecation_method def relative_permalinks_deprecation_method
if config['relative_permalinks'] && has_relative_page? if config['relative_permalinks'] && has_relative_page?
Jekyll.logger.warn "Deprecation:", "Since v2.0, permalinks for pages" + Jekyll::Deprecator.deprecation_message "Since v2.0, permalinks for pages" +
" in subfolders must be relative to the" + " in subfolders must be relative to the" +
" site source directory, not the parent" + " site source directory, not the parent" +
" directory. Check http://jekyllrb.com/docs/upgrading/"+ " directory. Check http://jekyllrb.com/docs/upgrading/"+