diff options
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 2 | ||||
| -rw-r--r-- | guides/source/configuring.textile | 2 | ||||
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.textile | 6 |
4 files changed, 4 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 90b45d6502..f5e1450f8a 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -407,7 +407,7 @@ module ActionDispatch # # [:format] # Allows you to specify the default value for optional +format+ - # segment or disable it if you supply +false+. + # segment or disable it by supplying +false+. def match(path, options=nil) end @@ -1192,7 +1192,7 @@ module ActionDispatch # # [:format] # Allows you to specify the default value for optional +format+ - # segment or disable it if you supply +false+. + # segment or disable it by supplying +false+. # # === Examples # diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 56873538fd..016d821fdf 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -182,7 +182,7 @@ module ActiveModel # # To include associations use <tt>:include</tt>. # - # For further documentation, see ActiveRecord::Serialization#to_xml + # For further documentation, see <tt>ActiveRecord::Serialization#to_xml</tt> def to_xml(options = {}, &block) Serializer.new(self, options).serialize(&block) end diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile index 25f69f1ab1..cc5c352df4 100644 --- a/guides/source/configuring.textile +++ b/guides/source/configuring.textile @@ -186,7 +186,7 @@ The full set of methods that can be used in this block are as follows: * +force_plural+ allows pluralized model names. Defaults to +false+. * +helper+ defines whether or not to generate helpers. Defaults to +true+. * +integration_tool+ defines which integration tool to use. Defaults to +nil+. -* +javascripts+ turns on the hook for JavaScripts in generators. Used in Rails for when the +scaffold+ generator is run. Defaults to +true+. +* +javascripts+ turns on the hook for JavaScript files in generators. Used in Rails for when the +scaffold+ generator is run. Defaults to +true+. * +javascript_engine+ configures the engine to be used (for eg. coffee) when generating assets. Defaults to +nil+. * +orm+ defines which orm to use. Defaults to +false+ and will use Active Record by default. * +performance_tool+ defines which performance tool to use. Defaults to +nil+. diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile index 9ae627c237..dd43ef795f 100644 --- a/guides/source/contributing_to_ruby_on_rails.textile +++ b/guides/source/contributing_to_ruby_on_rails.textile @@ -185,10 +185,6 @@ We need first to delete +.bundle/config+ because Bundler remembers in that file In order to be able to run the test suite against MySQL you need to create a user named +rails+ with privileges on the test databases: <shell> -mysql -u root mysql -p -</shell> - -<shell> mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.* to 'rails'@'localhost'; mysql> GRANT ALL PRIVILEGES ON activerecord_unittest2.* @@ -202,8 +198,6 @@ $ cd activerecord $ bundle exec rake mysql:build_databases </shell> -NOTE: If you get an error like "Access denied for user 'rails'@'localhost' (using password: YES)" then you most likely have a rails user in the mysql database, that uses a password, or you have a password specified in the my.cnf file of mysql. - PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account <shell> |