diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:15:43 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-14 11:15:43 +0200 |
commit | e5524d538c0d0f39d655a78fc45d2122c0ff2f2a (patch) | |
tree | c77f723799f123f43c5731880db82711f1851f72 | |
parent | 47003f8cdf7afbfa1d78939f17d8b49c9c4348f7 (diff) | |
download | rails-e5524d538c0d0f39d655a78fc45d2122c0ff2f2a.tar.gz rails-e5524d538c0d0f39d655a78fc45d2122c0ff2f2a.tar.bz2 rails-e5524d538c0d0f39d655a78fc45d2122c0ff2f2a.zip |
minor edits after going through what's new in docrails
-rw-r--r-- | actionpack/lib/abstract_controller/url_for.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 11 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/actionpack/lib/abstract_controller/url_for.rb b/actionpack/lib/abstract_controller/url_for.rb index d2245d0b0d..e4261068d8 100644 --- a/actionpack/lib/abstract_controller/url_for.rb +++ b/actionpack/lib/abstract_controller/url_for.rb @@ -1,9 +1,9 @@ -# Includes #url_for into the host class (e.g. an abstract controller or mailer). The class -# has to provide a RouteSet by implementing the #_routes methods. Otherwise, an exception -# will be raised. +# Includes +url_for+ into the host class (e.g. an abstract controller or mailer). The class +# has to provide a +RouteSet+ by implementing the <tt>_routes</tt> methods. Otherwise, an +# exception will be raised. # # Note that this module is completely decoupled from HTTP - the only requirement is a valid -# #_routes implementation. +# <tt>_routes</tt> implementation. module AbstractController module UrlFor extend ActiveSupport::Concern diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index a185d799bf..08132b1900 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -1,21 +1,24 @@ -# Includes #url_for into the host class. The class has to provide a RouteSet by implementing -# the #_routes methods. Otherwise, an exception will be raised. +# Includes +url_for+ into the host class. The class has to provide a +RouteSet+ by implementing +# the <tt>_routes</tt> method. Otherwise, an exception will be raised. # -# In addition to AbstractController::UrlFor, this module accesses the HTTP layer to define +# In addition to <tt>AbstractController::UrlFor</tt>, this module accesses the HTTP layer to define # url options like the +host+. In order to do so, this module requires the host class -# to implement #env and #request, which need to be a Rack-compatible. +# to implement +env+ and +request+, which need to be a Rack-compatible. # # Example: # # class RootUrl # include ActionController::UrlFor # include Rails.application.routes.url_helpers +# # delegate :env, :request, :to => :controller # # def initialize(controller) # @controller = controller # @url = root_path # named route from the application. # end +# end +# => module ActionController module UrlFor extend ActiveSupport::Concern diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index ca2e86f615..3ba6094fbb 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -352,7 +352,7 @@ module ActionDispatch # # [:constraints] # Constrains parameters with a hash of regular expressions or an - # object that responds to <tt>#matches?</tt> + # object that responds to <tt>matches?</tt> # # match 'path/:id', :constraints => { :id => /[A-Z]\d{5}/ } # @@ -373,7 +373,7 @@ module ActionDispatch # See <tt>Scoping#defaults</tt> for its scope equivalent. # # [:anchor] - # Boolean to anchor a <tt>#match</tt> pattern. Default is true. When set to + # Boolean to anchor a <tt>match</tt> pattern. Default is true. When set to # false, the pattern matches any request prefixed with the given path. # # # Matches any request starting with 'path' |