mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
A few doc changes
This commit is contained in:
parent
8a04bd0c83
commit
cd2c31a1c4
3 changed files with 6 additions and 13 deletions
|
@ -32,9 +32,9 @@ module ActiveSupport
|
|||
|
||||
%w( fatal error warn info debug unknown ).each do |severity|
|
||||
eval <<-EOM, nil, __FILE__, __LINE__ + 1
|
||||
def #{severity}(progname = nil, &block)
|
||||
add(Logger::#{severity.upcase}, progname, &block)
|
||||
end
|
||||
def #{severity}(progname = nil, &block) # def warn(progname = nil, &block)
|
||||
add(Logger::#{severity.upcase}, progname, &block) # add(Logger::WARN, progname, &block)
|
||||
end # end
|
||||
EOM
|
||||
end
|
||||
|
||||
|
|
|
@ -216,7 +216,7 @@ module RailsGuides
|
|||
anchors = Set.new
|
||||
html.scan(/<h\d\s+id="([^"]+)/).flatten.each do |anchor|
|
||||
if anchors.member?(anchor)
|
||||
puts "*** DUPLICATE ID: #{anchor}, please put and explicit ID, e.g. h4(#explicit-id), or consider rewording"
|
||||
puts "*** DUPLICATE ID: #{anchor}, please use an explicit ID, e.g. h4(#explicit-id), or consider rewording"
|
||||
else
|
||||
anchors << anchor
|
||||
end
|
||||
|
|
|
@ -154,15 +154,8 @@ module Rails
|
|||
self
|
||||
end
|
||||
|
||||
# Rails.application.env_config stores some of the Rails initial environment parameters.
|
||||
# Currently stores:
|
||||
#
|
||||
# * action_dispatch.parameter_filter" => config.filter_parameters,
|
||||
# * action_dispatch.secret_token" => config.secret_token,
|
||||
# * action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
|
||||
#
|
||||
# These parameters will be used by middlewares and engines to configure themselves.
|
||||
#
|
||||
# Stores some of the Rails initial environment parameters which
|
||||
# will be used by middlewares and engines to configure themselves.
|
||||
def env_config
|
||||
@env_config ||= super.merge({
|
||||
"action_dispatch.parameter_filter" => config.filter_parameters,
|
||||
|
|
Loading…
Reference in a new issue