diff options
| author | Arun Agrawal <arunagw@gmail.com> | 2014-02-05 10:41:01 +0100 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2014-02-05 10:41:01 +0100 |
| commit | 069a010277585cc1bee55af8e87546e28216497d (patch) | |
| tree | 44d25ac681425aa83cae4c5b296c3c297887224c /guides/source | |
| parent | 132834bc6aeea56efc6e6a8b179029a5fcc33799 (diff) | |
| parent | 128fa3b9a410d2b5b05f24b931d16d7e46865817 (diff) | |
| download | rails-069a010277585cc1bee55af8e87546e28216497d.tar.gz rails-069a010277585cc1bee55af8e87546e28216497d.tar.bz2 rails-069a010277585cc1bee55af8e87546e28216497d.zip | |
Merge pull request #13950 from calvintam/fix_typos
Fixed typos
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/configuring.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 669086edbe..4728bdcb27 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -570,7 +570,7 @@ $ rails runner 'puts ActiveRecord::Base.connections' Since pool is not in the `ENV['DATABASE_URL']` provided connection information its information is merged in. Since `adapter` is duplicate, the `ENV['DATABASE_URL']` connection information wins. -The only way to explicitly not use the connection information in `ENV['DATABASE_URL']` is to specify an explicit URL connectinon using the `"url"` sub key: +The only way to explicitly not use the connection information in `ENV['DATABASE_URL']` is to specify an explicit URL connection using the `"url"` sub key: ``` $ cat config/database.yml @@ -716,7 +716,7 @@ Rails will now prepend "/app1" when generating links. #### Using Passenger -Passenger makes it easiy to run your application in a subdirectory. You can find +Passenger makes it easily to run your application in a subdirectory. You can find the relevant configuration in the [passenger manual](http://www.modrails.com/documentation/Users%20guide%20Apache.html#deploying_rails_to_sub_uri). |