diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-08-04 14:30:21 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-08-04 15:09:33 +0530 |
| commit | b51201242aaf77c6db5a9b2f72e433c521df79c5 (patch) | |
| tree | 74beb6283a594ceaa2da299d695d95dfd94c459a /guides/source | |
| parent | 4ae72a931ea8ef8f5994b3325a4e431cf2cb2f39 (diff) | |
| download | rails-b51201242aaf77c6db5a9b2f72e433c521df79c5.tar.gz rails-b51201242aaf77c6db5a9b2f72e433c521df79c5.tar.bz2 rails-b51201242aaf77c6db5a9b2f72e433c521df79c5.zip | |
copy edits [ci skip]
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/configuring.textile | 2 | ||||
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.textile | 6 |
2 files changed, 1 insertions, 7 deletions
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> |